Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8e87f0f

Browse files
Revision 38 Version 13
Update some user controls
1 parent4508981 commit8e87f0f

17 files changed

+1311
-1435
lines changed

‎GuiM2000.frm‎

Lines changed: 298 additions & 298 deletions
Large diffs are not rendered by default.

‎M2000.TLB‎

0 Bytes
Binary file not shown.

‎M2000.VBR‎

Lines changed: 531 additions & 531 deletions
Large diffs are not rendered by default.

‎M2000.exp‎

0 Bytes
Binary file not shown.

‎M2000.lib‎

0 Bytes
Binary file not shown.

‎M2000.vbp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ HelpContextID="0"
152152
CompatibleMode="0"
153153
CompatibleEXE32="m2000.exe"
154154
MajorVer=13
155-
MinorVer=37
155+
MinorVer=38
156156
RevisionVer=0
157157
AutoIncrementVer=0
158158
ServerSupportFiles=1

‎M2000.vbw‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AVI = 0, 0, 0, 0, C, 52, 52, 729, 545, C
33
Form4 = 0, 0, 0, 0, C, 78, 78, 755, 571, C
44
Form3 = 0, 0, 0, 0, C, 104, 104, 781, 597, C
55
TweakForm = 0, 0, 0, 0, C, 130, 130, 807, 623, C
6-
globalvars = 0, 0,0, 0, C
6+
globalvars = 0, 0,1287, 578,
77
helpmod = 0, 0, 0, 0, C
88
Form2 = 0, 0, 0, 0, C, 156, 156, 833, 649, C
99
Module6 = 0, 0, 0, 0, C
@@ -12,7 +12,7 @@ Module3 = 0, 0, 0, 0, C
1212
gpp1 = 0, 0, 0, 0, C
1313
AnyPrinter = 0, 0, 0, 0, C
1414
Module5 = 0, 0, 0, 0, C
15-
Module2 = 234, 234, 827, 807,
15+
Module2 = 234, 234, 827, 807,Z
1616
PicHandler = 26, 26, 585, 519,
1717
Module4 = 0, 0, 0, 0, C
1818
cDIBSection = 0, 0, 0, 0, C
@@ -49,11 +49,11 @@ ExifRead = 0, 0, 0, 0, C
4949
Fcall = 0, 0, 0, 0, C
5050
Group = 0, 0, 0, 0, C
5151
stdCallFunction = 0, 0, 0, 0, C
52-
mdlIDispatch =0, 0, 0, 0, C
53-
PropReference =0, 0, 0, 0, C
52+
mdlIDispatch =234, 234, 1521, 812,
53+
PropReference =208, 208, 859, 654,
5454
Module1 = 26, 26, 585, 519,
5555
MyPopUp = 0, 0, 0, 0, C, 52, 52, 729, 545, C
56-
Module7 = 182, 182, 741, 675,C
56+
Module7 = 182, 182, 741, 675,
5757
cJpeg = 0, 0, 0, 0, C
5858
Hash = 182, 182, 1512, 761,
5959
sbHash = 0, 0, 0, 0, C
@@ -100,7 +100,7 @@ SPBuffer = 0, 0, 0, 0, C
100100
SerialPort = 0, 0, 0, 0, C
101101
MetaDc = 0, 0, 0, 0, C
102102
Module11 = 0, 0, 0, 0, C
103-
cZipArchive =0, 0, 0, 0, C
103+
cZipArchive =26, 26, 677, 472,
104104
ZipTool = 0, 0, 0, 0, C
105105
XmlMonoInternal = 0, 0, 0, 0, C
106106
XmlMono = 130, 130, 1308, 702,
@@ -115,24 +115,24 @@ clsHttpsRequest = 0, 0, 0, 0, C
115115
cAsyncSocket = 0, 0, 0, 0, C
116116
GuiImage = 26, 26, 1007, 599,
117117
mdQRCodegen = 0, 0, 0, 0, C
118-
ucPieChart =0, 0, 0, 0, C, 156, 156, 833, 649, C
118+
ucPieChart =182, 182, 1140, 760, C, 156, 156, 833, 649, C
119119
ExtControl = 234, 234, 1215, 807,
120-
ucChartArea = 26, 26, 996, 604, , 182, 182, 859, 675, C
121-
ctxNineButton =0, 0, 0, 0, C, 208, 208, 885, 701, C
120+
ucChartArea = 26, 26, 996, 604,C, 182, 182, 859, 675, C
121+
ctxNineButton =130, 130, 1405, 708,, 208, 208, 885, 701, C
122122
cNinePatch = 0, 0, 0, 0, C
123-
ShapeEx =0, 0, 0, 0, C, 0, 0, 677, 493, C
124-
ucRadialProgress =0, 0, 0, 0, C, 26, 26, 703, 519, C
123+
ShapeEx =26, 26, 984, 604,, 0, 0, 677, 493, C
124+
ucRadialProgress =52, 52, 1022, 630,, 26, 26, 703, 519, C
125125
RefArray = 0, 0, 0, 0, C
126126
HashList = 0, 0, 0, 0, C
127127
iBoxArray = 286, 286, 1578, 859, C
128128
ppppLight = 0, 0, 926, 573,
129129
LibMemory = 0, 0, 0, 0, C
130130
cRateLimiter = 0, 0, 0, 0, C
131-
ctxWinsock =0, 0, 0, 0, C, 52, 52, 729, 545, C
131+
ctxWinsock =52, 52, 1327, 630,, 52, 52, 729, 545, C
132132
mdTlsThunks = 0, 0, 0, 0, C
133133
IControlIndex = 0, 0, 0, 0, C
134134
MATH2 = 0, 0, 0, 0, C
135135
BigInteger = 0, 0, 0, 0, C
136136
Module13 = 0, 0, 0, 0, C
137137
tuple = 130, 130, 1082, 665,
138-
ucChartBar = 52, 52, 562, 498,Z, 0, 0, 752, 578, C
138+
ucChartBar = 52, 52, 562, 498, , 0, 0, 752, 578, C

‎Mod_Text.bas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Public TestShowBypass As Boolean, TestShowSubLast As String
9696
Public feedback$, FeedbackExec$, feednow$ ' for about$
9797
Global Const VerMajor = 13
9898
Global Const VerMinor = 0
99-
Global Const Revision =37
99+
Global Const Revision =38
100100
Private Const doc = "Document"
101101
Public UserCodePage As Long, DefCodePage As Long
102102
Public cLine As String ' it was public in form1
@@ -48601,7 +48601,7 @@ If w1 = 1 Or w1 = 3 Then
4860148601

4860248602
If bstack.tpointer > 0 Then
4860348603
w1 = bstack.tpointer
48604-
Debug.Print var(w1).GroupName
48604+
'Debug.Print var(w1).GroupName
4860548605
GoTo contGe
4860648606
End If
4860748607
ElseIf s$ = "����" Then

‎ShapeEx.ctl‎

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ Private Type XFORM
7878
eDyAsSingle
7979
End Type
8080

81-
PrivateDeclareFunctionSetGraphicsModeLib "gdi32" (ByValhdcAsLong,ByVal iModeAsLong)AsLong
82-
PrivateDeclareFunctionSetWorldTransformLib "gdi32" (ByValhdcAsLong, lpXformAsXFORM)AsLong
83-
PrivateDeclareFunctionModifyWorldTransformLib "gdi32" (ByValhdcAsLong, lpXformAsXFORM,ByVal iModeAsLong)AsLong
81+
PrivateDeclareFunctionSetGraphicsModeLib "gdi32" (ByValhDCAsLong,ByVal iModeAsLong)AsLong
82+
PrivateDeclareFunctionSetWorldTransformLib "gdi32" (ByValhDCAsLong, lpXformAsXFORM)AsLong
83+
PrivateDeclareFunctionModifyWorldTransformLib "gdi32" (ByValhDCAsLong, lpXformAsXFORM,ByVal iModeAsLong)AsLong
8484
PrivateConst MWT_IDENTITY =1
8585
PrivateConst MWT_LEFTMULTIPLY =2
8686
'Private Const MWT_RIGHTMULTIPLY = 3
@@ -93,10 +93,10 @@ Private Const Pi = 3.14159265358979
9393
PrivateConst WM_USERAsLong =&H400
9494
PrivateConst WM_INVALIDATEAsLong = WM_USER +11' custom message
9595

96-
PrivateDeclareFunctionGetClipRgnLib "gdi32" (ByValhdcAsLong,ByVal hRgnAsLong)AsLong
96+
PrivateDeclareFunctionGetClipRgnLib "gdi32" (ByValhDCAsLong,ByVal hRgnAsLong)AsLong
9797
PrivateDeclareFunctionGetRgnBoxLib "gdi32" (ByVal hRgnAsLong, lpRectAsRECT)AsLong
9898
PrivateDeclareFunctionCreateRectRgnLib "gdi32" (ByVal x1AsLong,ByVal y1AsLong,ByVal x2AsLong,ByVal y2AsLong)AsLong
99-
PrivateDeclareFunctionSelectClipRgnLib "gdi32" (ByValhdcAsLong,ByVal hRgnAsLong)AsLong
99+
PrivateDeclareFunctionSelectClipRgnLib "gdi32" (ByValhDCAsLong,ByVal hRgnAsLong)AsLong
100100
PrivateDeclareFunctionDeleteObjectLib "gdi32" (ByVal hObjectAsLong)AsLong
101101
PrivateDeclareFunctionInvalidateRectAsNullLib "user32"Alias "InvalidateRect" (ByVal hWndAsLong,ByVal lpRectAsLong,ByVal bEraseAsLong)AsLong
102102
'Private Declare Function GetUpdateRect Lib "user32" (ByVal hWnd As Long, lpRect As RECT, ByVal bErase As Long) As Long
@@ -111,21 +111,15 @@ Private Type RECT
111111
BottomAsLong
112112
End Type
113113

114-
PrivateType GDIPlusStartupInput
115-
GdiPlusVersionAsLong
116-
DebugEventCallbackAsLong
117-
SuppressBackgroundThreadAsLong
118-
SuppressExternalCodecsAsLong
119-
End Type
120114

121115
PrivateType POINTL
122116
XAsLong
123117
YAsLong
124118
End Type
125119

126-
PrivateDeclareFunctionGdipCreateFromHDCLib "gdiplus" (ByValhdcAsLong,ByRef graphicsAsLong)AsLong
120+
PrivateDeclareFunctionGdipCreateFromHDCLib "gdiplus" (ByValhDCAsLong,ByRef graphicsAsLong)AsLong
127121
PrivateDeclareFunctionGdipDeleteGraphicsLib "gdiplus" (ByVal graphicsAsLong)AsLong
128-
PrivateDeclareFunctionGdiplusStartupLib "gdiplus" (ByRef tokenAsLong,ByRef lpInputAsGDIPlusStartupInput,OptionalByRef lpOutputAsAny)AsLong
122+
PrivateDeclareFunctionGdiplusStartupLib "gdiplus" (hTokenAsLong,pInputBufAsAny,OptionalByVal pOutputBufAsLong =0)AsLong
129123
PrivateDeclareFunctionGdiplusShutdownLib "gdiplus" (ByVal tokenAsLong)AsLong
130124
PrivateDeclareFunctionGdipSetSmoothingModeLib "GdiPlus.dll" (ByVal mGraphicsAsLong,ByVal mSmoothingModeAsLong)AsLong
131125
PrivateDeclareFunctionGdipDeleteBrushLib "GdiPlus.dll" (ByVal mBrushAsLong)AsLong
@@ -301,15 +295,21 @@ Private mStyle3D As SEStyle3DConstants
301295
Private mStyle3DEffectAsSEStyle3DEffectConstants
302296
Private mUseSubclassingAsSESubclassingConstants
303297

304-
Private mGdipTokenAsLong
305-
Private mContainerHwndAsLong
306298
Private mAttachedAsBoolean
307299
Private mShiftPutAutomaticallyAsSingle
308300
Private mCurvingFactor2AsSingle
309301
Private mUserModeAsBoolean
310302
Private mSubclassedAsBoolean
311303
Private mDrawingOutsideUCAsBoolean
312-
304+
PropertyGet enabled()AsBoolean
305+
enabled = UserControl.enabled
306+
End Property
307+
PropertyLet enabled(ByVal bValueAsBoolean)
308+
If UserControl.enabled <> bValueThen
309+
UserControl.enabled = bValue
310+
End If
311+
PropertyChanged
312+
End Property
313313
PrivateSubtmrPainting_Timer()
314314
tmrPainting.enabled =False
315315
End Sub
@@ -360,7 +360,6 @@ Private Sub UserControl_InitProperties()
360360
mUseSubclassing = mdef_UseSubclassing
361361

362362
On ErrorResume Next
363-
mContainerHwnd = UserControl.ContainerHwnd
364363
mUserMode = Ambient.UserMode
365364
On ErrorGoTo0
366365
SetCurvingFactor2
@@ -404,8 +403,8 @@ Private Sub UserControl_Paint()
404403
Dim iAuxExpandAsLong
405404

406405
If (mRotationDegrees >0)Or (mFlipped <> seFlippedNo)Then
407-
iGMPrev = SetGraphicsMode(UserControl.hdc, GM_ADVANCED)
408-
ModifyWorldTransform UserControl.hdc, mtx1, MWT_IDENTITY
406+
iGMPrev = SetGraphicsMode(UserControl.hDC, GM_ADVANCED)
407+
ModifyWorldTransform UserControl.hDC, mtx1, MWT_IDENTITY
409408
If mRotationDegrees =0Then
410409
c =1
411410
s =0
@@ -486,7 +485,7 @@ Private Sub UserControl_Paint()
486485

487486
mDrawingOutsideUC =False
488487
hRgn = CreateRectRgn(0,0,0,0)
489-
If GetClipRgn(UserControl.hdc, hRgn) =0&Then' hDc is one passed to Paint
488+
If GetClipRgn(UserControl.hDC, hRgn) =0&Then' hDc is one passed to Paint
490489
DeleteObject hRgn: hRgn =0
491490
Else
492491
GetRgnBox hRgn, rgnRect' get its bounds & adjust our region accordingly (i.e.,expand 1 pixel)
@@ -495,11 +494,11 @@ Private Sub UserControl_Paint()
495494
If (iExpandForPen <>0)Or (iExpandOutsideForAngle <>0)Or (iExpandOutsideForFigure <>0)Or sTheLastTimeWasExpandedThen
496495
hRgnExpand = CreateRectRgn(rgnRect.Left - iExpandForPen - iExpandOutsideForAngle - iExpandOutsideForFigure, rgnRect.top - iExpandForPen - iExpandOutsideForAngle - iExpandOutsideForFigure, rgnRect.Right + iExpandForPen + iExpandOutsideForAngle + iExpandOutsideForFigure, rgnRect.Bottom + iExpandForPen + iExpandOutsideForAngle + iExpandOutsideForFigure)
497496

498-
SelectClipRgn UserControl.hdc, hRgnExpand
497+
SelectClipRgn UserControl.hDC, hRgnExpand
499498
DeleteObject hRgnExpand
500499
IfNot tmrPainting.enabledThen
501-
If (mContainerHwnd <>0)And mSubclassedThen
502-
PostMessagemContainerHwnd, WM_INVALIDATE,0&,0&
500+
If (UserControl.ContainerHwnd <>0)And mSubclassedThen
501+
PostMessageUserControl.ContainerHwnd, WM_INVALIDATE,0&,0&
503502
End If
504503
End If
505504
mDrawingOutsideUC =True
@@ -510,17 +509,17 @@ Private Sub UserControl_Paint()
510509
tmrPainting.enabled =True
511510

512511
If (mRotationDegrees >0)Or (mFlipped <> seFlippedNo)Then
513-
SetWorldTransform UserControl.hdc, mtx1
514-
ModifyWorldTransform UserControl.hdc, mtx2, MWT_LEFTMULTIPLY
512+
SetWorldTransform UserControl.hDC, mtx1
513+
ModifyWorldTransform UserControl.hDC, mtx2, MWT_LEFTMULTIPLY
515514
End If
516515

517516
Draw
518517

519-
If hRgnExpand <>0Then SelectClipRgn UserControl.hdc, hRgn' restore original clip region
518+
If hRgnExpand <>0Then SelectClipRgn UserControl.hDC, hRgn' restore original clip region
520519
If hRgn <>0Then DeleteObject hRgn
521520

522521
If (mRotationDegrees >0)Or (mFlipped <> seFlippedNo)Then
523-
SetGraphicsMode UserControl.hdc, iGMPrev
522+
SetGraphicsMode UserControl.hDC, iGMPrev
524523
End If
525524
End Sub
526525

@@ -552,7 +551,6 @@ Private Sub UserControl_ReadProperties(PropBag As PropertyBag)
552551
Set UserControl.MouseIcon = mMouseIcon
553552

554553
On ErrorResume Next
555-
mContainerHwnd = UserControl.ContainerHwnd
556554
mUserMode = Ambient.UserMode
557555
On ErrorGoTo0
558556
SetCurvingFactor2
@@ -561,11 +559,8 @@ End Sub
561559

562560
PrivateSubUserControl_Terminate()
563561
pvUnsubclass
564-
If mGdipToken <>0Then
565-
TerminateGDI
566-
End If
567-
568-
If (mBorderWidth >1)Or (mRotationDegrees >0)Then InvalidateRectAsNull mContainerHwnd,0&,1&' paint the container when the control is deleted if the BorderWidth is greater than 1 or the control is rotated (if it painted outside its bounds)
562+
On ErrorResume Next
563+
If (mBorderWidth >1)Or (mRotationDegrees >0)Then InvalidateRectAsNull UserControl.ContainerHwnd,0&,1&' paint the container when the control is deleted if the BorderWidth is greater than 1 or the control is rotated (if it painted outside its bounds)
569564
End Sub
570565

571566
PrivateSubUserControl_WriteProperties(PropBagAsPropertyBag)
@@ -793,8 +788,8 @@ Public Property Let RotationDegrees(ByVal nValue As Single)
793788
mRotationDegrees = nValue
794789
Me.Refresh
795790
If mDrawingOutsideUCThen
796-
If (mContainerHwnd <>0)And mSubclassedThen
797-
PostMessagemContainerHwnd, WM_INVALIDATE,0&,0&
791+
If (UserControl.ContainerHwnd <>0)And mSubclassedThen
792+
PostMessageUserControl.ContainerHwnd, WM_INVALIDATE,0&,0&
798793
End If
799794
End If
800795
PropertyChanged"RotationDegrees"
@@ -818,8 +813,8 @@ Public Property Let Opacity(ByVal nValue As Single)
818813
mOpacity = nValue
819814
Me.Refresh
820815
If mDrawingOutsideUCThen
821-
If (mContainerHwnd <>0)And mSubclassedThen
822-
PostMessagemContainerHwnd, WM_INVALIDATE,0&,0&
816+
If (UserControl.ContainerHwnd <>0)And mSubclassedThen
817+
PostMessageUserControl.ContainerHwnd, WM_INVALIDATE,0&,0&
823818
End If
824819
End If
825820
PropertyChanged"Opacity"
@@ -868,8 +863,8 @@ Public Property Let CurvingFactor(ByVal nValue As Integer)
868863
SetCurvingFactor2
869864
Me.Refresh
870865
If mDrawingOutsideUCThen
871-
If (mContainerHwnd <>0)And mSubclassedThen
872-
PostMessagemContainerHwnd, WM_INVALIDATE,0&,0&
866+
If (UserControl.ContainerHwnd <>0)And mSubclassedThen
867+
PostMessageUserControl.ContainerHwnd, WM_INVALIDATE,0&,0&
873868
End If
874869
End If
875870
PropertyChanged"CurvingFactor"
@@ -967,19 +962,19 @@ Public Property Let UseSubclassing(ByVal nValue As SESubclassingConstants)
967962
pvSubclass
968963
If mSubclassedThen
969964
If mDrawingOutsideUCThen
970-
If (mContainerHwnd <>0)And mSubclassedThen
971-
PostMessagemContainerHwnd, WM_INVALIDATE,0&,0&
965+
If (UserControl.ContainerHwnd <>0)And mSubclassedThen
966+
PostMessageUserControl.ContainerHwnd, WM_INVALIDATE,0&,0&
972967
End If
973968
End If
974969
Else
975-
IfmContainerHwnd <>0Then
976-
PeekMessage iMessage,mContainerHwnd, WM_INVALIDATE, WM_INVALIDATE, PM_REMOVE' remove posted message, if any
970+
IfUserControl.ContainerHwnd <>0Then
971+
PeekMessage iMessage,UserControl.ContainerHwnd, WM_INVALIDATE, WM_INVALIDATE, PM_REMOVE' remove posted message, if any
977972
End If
978973
End If
979974
Else
980975
If mSubclassedThen pvUnsubclass
981-
IfmContainerHwnd <>0Then
982-
PeekMessage iMessage,mContainerHwnd, WM_INVALIDATE, WM_INVALIDATE, PM_REMOVE' remove posted message, if any
976+
IfUserControl.ContainerHwnd <>0Then
977+
PeekMessage iMessage,UserControl.ContainerHwnd, WM_INVALIDATE, WM_INVALIDATE, PM_REMOVE' remove posted message, if any
983978
End If
984979
End If
985980
PropertyChanged"UseSubclassing"
@@ -1015,8 +1010,7 @@ Private Sub Draw()
10151010
Dim iShiftAsLong
10161011
Dim iHalfBorderWidthAsLong
10171012

1018-
If mGdipToken =0Then InitGDI
1019-
If GdipCreateFromHDC(UserControl.hdc, iGraphics) =0Then
1013+
If GdipCreateFromHDC(UserControl.hDC, iGraphics) =0Then
10201014

10211015
If mFillStyle = seFSSolidThen
10221016
iFilled =True
@@ -2646,15 +2640,13 @@ Private Function ConvertColor(nColor As Long, nOpacity As Single) As Long
26462640
End Function
26472641

26482642
PrivateSubInitGDI()
2649-
Dim GdipStartupInputAsGDIPlusStartupInput
2650-
GdipStartupInput.GdiPlusVersion =1&
2651-
CallGdiplusStartup(mGdipToken, GdipStartupInput,ByVal0)
2643+
Dim aInput(0To3)AsLong
2644+
If GetModuleHandle("gdiplus") =0Then
2645+
aInput(0) =1
2646+
CallGdiplusStartup(0, aInput(0))
2647+
End If
26522648
End Sub
26532649

2654-
PrivateSubTerminateGDI()
2655-
CallGdiplusShutdown(mGdipToken)
2656-
mGdipToken =0
2657-
End Sub
26582650

26592651
PrivatePropertyGet SmoothingMode()AsLong
26602652
If mQuality = seQualityHighThen
@@ -2673,7 +2665,7 @@ End Property
26732665
PrivateSubpvSubclass()
26742666
Dim iDoAsBoolean
26752667

2676-
IfmContainerHwnd <>0Then
2668+
IfUserControl.ContainerHwnd <>0Then
26772669
If mUseSubclassing = seSCYesThen
26782670
iDo =True
26792671
ElseIf mUseSubclassing = seSCNotInIDEThen
@@ -2686,7 +2678,7 @@ Private Sub pvSubclass()
26862678
End If
26872679
End If
26882680
If iDoThen
2689-
Set m_pSubclass = InitSubclassingThunk(mContainerHwnd, InitAddressOfMethod().SubclassProc(0,0,0,0,0))
2681+
Set m_pSubclass = InitSubclassingThunk(UserControl.ContainerHwnd, InitAddressOfMethod().SubclassProc(0,0,0,0,0))
26902682
mSubclassed =True
26912683
End If
26922684
End If

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp