瀏覽代碼

Fix/cleanup TControl.Cursor.

Martijn Laan 1 年之前
父節點
當前提交
6cd19448e7

+ 0 - 2
ISHelp/isxclasses.header2

@@ -8,8 +8,6 @@
 <li><tt><a name="MainForm">MainForm</a></tt> of type <anchorlink name="TMainForm">TMainForm</anchorlink> (only visible if <link topic="setup_windowvisible">WindowVisible</link> is set to <tt>yes</tt>.)</li>
 </ul>
 
-<p>One special constant is available: <tt>crHand</tt> of type <tt>TControl.Cursor</tt>.</p>
-
 <p>Parameter type <tt>AnyString</tt> means both <tt>String</tt> and <tt>AnsiString</tt> can be used.</p>
 
 <p>The <i>CodeClasses.iss</i> example script in the "Examples" subdirectory in your Inno Setup directory shows how to use these classes.</p>

+ 5 - 1
ISHelp/isxclasses.pas

@@ -176,6 +176,10 @@ TAnchorKind = (akLeft, akTop, akRight, akBottom);
 
 TAnchors = set of TAnchorKind;
 
+TCursor = Integer;
+
+{ TCursor values: crDefault, crNone, crArrow, crCross, crIBeam, crSizeNESW, crSizeNS, crSizeNWSE, crSizeWE, crUpArrow, crHourGlass, crDrag, crNoDrop, crHSplit, crVSplit, crMultiDrag, crSQLWait, crNo, crAppStart, crHelp, crHandPoint, crSizeAll, crHand }
+
 TControl = class(TComponent)
   constructor Create(AOwner: TComponent);
   procedure BringToFront;
@@ -198,7 +202,7 @@ TControl = class(TComponent)
   property ShowHint: Boolean; read write;
   property Visible: Boolean; read write;
   property Enabled: Boolean; read write;
-  property Cursor: Integer; read write;
+  property Cursor: TCursor; read write;
 end;
 
 TWinControl = class(TControl)

+ 21 - 20
ISHelp/isxclasses_wordlists_generated.pas

@@ -7,7 +7,8 @@ interface
 var
   PascalConstants_IsxClasses: array of AnsiString = [
     'soFromBeginning', 'soFromCurrent', 'soFromEnd',
-    'clBlack', 'clMaroon', 'clGreen', 'clOlive', 'clNavy', 'clPurple', 'clTeal', 'clGray', 'clSilver', 'clRed', 'clLime', 'clYellow', 'clBlue', 'clFuchsia', 'clAqua', 'clLtGray', 'clDkGray', 'clWhite', 'clNone', 'clDefault', 'clScrollBar', 'clBackground', 'clActiveCaption', 'clInactiveCaption', 'clMenu', 'clWindow', 'clWindowFrame', 'clMenuText', 'clWindowText', 'clCaptionText', 'clActiveBorder', 'clInactiveBorder', 'clAppWorkSpace', 'clHighlight', 'clHighlightText', 'clBtnFace', 'clBtnShadow', 'clGrayText', 'clBtnText', 'clInactiveCaptionText', 'clBtnHighlight', 'cl3DDkShadow', 'cl3DLight', 'clInfoText', 'clInfoBk', 'clHotLight'
+    'clBlack', 'clMaroon', 'clGreen', 'clOlive', 'clNavy', 'clPurple', 'clTeal', 'clGray', 'clSilver', 'clRed', 'clLime', 'clYellow', 'clBlue', 'clFuchsia', 'clAqua', 'clLtGray', 'clDkGray', 'clWhite', 'clNone', 'clDefault', 'clScrollBar', 'clBackground', 'clActiveCaption', 'clInactiveCaption', 'clMenu', 'clWindow', 'clWindowFrame', 'clMenuText', 'clWindowText', 'clCaptionText', 'clActiveBorder', 'clInactiveBorder', 'clAppWorkSpace', 'clHighlight', 'clHighlightText', 'clBtnFace', 'clBtnShadow', 'clGrayText', 'clBtnText', 'clInactiveCaptionText', 'clBtnHighlight', 'cl3DDkShadow', 'cl3DLight', 'clInfoText', 'clInfoBk', 'clHotLight',
+    'crDefault', 'crNone', 'crArrow', 'crCross', 'crIBeam', 'crSizeNESW', 'crSizeNS', 'crSizeNWSE', 'crSizeWE', 'crUpArrow', 'crHourGlass', 'crDrag', 'crNoDrop', 'crHSplit', 'crVSplit', 'crMultiDrag', 'crSQLWait', 'crNo', 'crAppStart', 'crHelp', 'crHandPoint', 'crSizeAll', 'crHand'
   ];
 
   PascalTypes_IsxClasses: array of AnsiString = [
@@ -15,25 +16,25 @@ var
     'TStringList', 'TStream', 'THandleStream', 'TFileStream', 'TStringStream', 'TGraphicsObject',
     'TBrushStyle', 'TBrush', 'TFontStyle', 'TFontStyles', 'TColor', 'TFont', 'TPenMode',
     'TPenStyle', 'TPen', 'TCanvas', 'TGraphic', 'TAlphaFormat', 'HBITMAP', 'TBitmap', 'TAlign',
-    'TAnchorKind', 'TAnchors', 'TControl', 'TWinControl', 'TGraphicControl', 'TCustomControl',
-    'TScrollingWinControl', 'TFormBorderStyle', 'TBorderIcon', 'TBorderIcons', 'TConstraintSize',
-    'TSizeConstraints', 'TFormStyle', 'TPosition', 'TCloseAction', 'TCloseEvent', 'TCloseQueryEvent',
-    'TEShiftState', 'TShiftState', 'TKeyEvent', 'TKeyPressEvent', 'TForm', 'TCustomLabel',
-    'TAlignment', 'TLabel', 'TCustomEdit', 'TBorderStyle', 'TEditCharCase', 'TEdit', 'TNewEdit',
-    'TCustomMemo', 'TScrollStyle', 'TMemo', 'TNewMemo', 'TCustomComboBox', 'TComboBoxStyle',
-    'TComboBox', 'TNewComboBox', 'TButtonControl', 'TButton', 'TNewButton', 'TCustomCheckBox',
-    'TCheckBoxState', 'TCheckBox', 'TNewCheckBox', 'TRadioButton', 'TNewRadioButton', 'TSysLinkType',
-    'TSysLinkEvent', 'TCustomLinkLabel', 'TLinkLabel', 'TNewLinkLabel', 'TCustomListBox',
-    'TListBoxStyle', 'TListBox', 'TNewListBox', 'TBevelKind', 'TBevelShape', 'TBevelStyle',
-    'TBevel', 'TCustomPanel', 'TPanelBevel', 'TBevelWidth', 'TBorderWidth', 'TPanel', 'TNewStaticText',
-    'TCheckItemOperation', 'TNewCheckListBox', 'TNewProgressBarState', 'TNewProgressBarStyle',
-    'TNewProgressBar', 'TRichEditViewer', 'TPasswordEdit', 'TCustomFolderTreeView', 'TFolderRenameEvent',
-    'TFolderTreeView', 'TStartMenuFolderTreeView', 'TBitmapImage', 'TNewNotebook', 'TNewNotebookPage',
-    'TWizardPageNotifyEvent', 'TWizardPageButtonEvent', 'TWizardPageCancelEvent', 'TWizardPageShouldSkipEvent',
-    'TWizardPage', 'TInputQueryWizardPage', 'TInputOptionWizardPage', 'TInputDirWizardPage',
-    'TInputFileWizardPage', 'TOutputMsgWizardPage', 'TOutputMsgMemoWizardPage', 'TOutputProgressWizardPage',
-    'TOutputMarqueeProgressWizardPage', 'TDownloadWizardPage', 'TUIStateForm', 'TSetupForm',
-    'TMainForm', 'TWizardForm', 'TUninstallProgressForm'
+    'TAnchorKind', 'TAnchors', 'TCursor', 'TControl', 'TWinControl', 'TGraphicControl',
+    'TCustomControl', 'TScrollingWinControl', 'TFormBorderStyle', 'TBorderIcon', 'TBorderIcons',
+    'TConstraintSize', 'TSizeConstraints', 'TFormStyle', 'TPosition', 'TCloseAction', 'TCloseEvent',
+    'TCloseQueryEvent', 'TEShiftState', 'TShiftState', 'TKeyEvent', 'TKeyPressEvent', 'TForm',
+    'TCustomLabel', 'TAlignment', 'TLabel', 'TCustomEdit', 'TBorderStyle', 'TEditCharCase',
+    'TEdit', 'TNewEdit', 'TCustomMemo', 'TScrollStyle', 'TMemo', 'TNewMemo', 'TCustomComboBox',
+    'TComboBoxStyle', 'TComboBox', 'TNewComboBox', 'TButtonControl', 'TButton', 'TNewButton',
+    'TCustomCheckBox', 'TCheckBoxState', 'TCheckBox', 'TNewCheckBox', 'TRadioButton', 'TNewRadioButton',
+    'TSysLinkType', 'TSysLinkEvent', 'TCustomLinkLabel', 'TLinkLabel', 'TNewLinkLabel',
+    'TCustomListBox', 'TListBoxStyle', 'TListBox', 'TNewListBox', 'TBevelKind', 'TBevelShape',
+    'TBevelStyle', 'TBevel', 'TCustomPanel', 'TPanelBevel', 'TBevelWidth', 'TBorderWidth',
+    'TPanel', 'TNewStaticText', 'TCheckItemOperation', 'TNewCheckListBox', 'TNewProgressBarState',
+    'TNewProgressBarStyle', 'TNewProgressBar', 'TRichEditViewer', 'TPasswordEdit', 'TCustomFolderTreeView',
+    'TFolderRenameEvent', 'TFolderTreeView', 'TStartMenuFolderTreeView', 'TBitmapImage',
+    'TNewNotebook', 'TNewNotebookPage', 'TWizardPageNotifyEvent', 'TWizardPageButtonEvent',
+    'TWizardPageCancelEvent', 'TWizardPageShouldSkipEvent', 'TWizardPage', 'TInputQueryWizardPage',
+    'TInputOptionWizardPage', 'TInputDirWizardPage', 'TInputFileWizardPage', 'TOutputMsgWizardPage',
+    'TOutputMsgMemoWizardPage', 'TOutputProgressWizardPage', 'TOutputMarqueeProgressWizardPage',
+    'TDownloadWizardPage', 'TUIStateForm', 'TSetupForm', 'TMainForm', 'TWizardForm', 'TUninstallProgressForm'
   ];
 
   PascalEnumValues_IsxClasses: array of AnsiString = [

+ 2 - 4
Projects/Src/Compil32/ScintStylerInnoSetup.pas

@@ -415,11 +415,9 @@ const
     'VER_SUITE_COMMUNICATIONS', 'VER_SUITE_TERMINAL', 'VER_SUITE_SMALLBUSINESS_RESTRICTED',
     'VER_SUITE_EMBEDDEDNT', 'VER_SUITE_DATACENTER', 'VER_SUITE_SINGLEUSERTS',
     'VER_SUITE_PERSONAL', 'VER_SUITE_BLADE', 'VER_SUITE_EMBEDDED_RESTRICTED',
-    'VER_SUITE_SECURITY_APPLIANCE',
+    'VER_SUITE_SECURITY_APPLIANCE'
     //undocumented: irInstall
-    { ScriptClasses_C }
-    'crHand'
-    { ScriptClasses_C others: see PascalConstants_IsxClasses in isxclasses_wordlists_generated }
+    { ScriptClasses_C: see PascalConstants_IsxClasses in isxclasses_wordlists_generated }
   ];
 
   PascalInterfaces: array of AnsiString = [