Merge pull request #217 from mcorino/develop

complete feature dependency specs
mcorino · Nov 12, 2023 · f49e6a7 · f49e6a7
2 parents edb952e + 9baaf8f
commit f49e6a7
Showing 1 changed file with 47 additions and 47 deletions.
diff --git a/rakelib/lib/specs/interfaces.rb b/rakelib/lib/specs/interfaces.rb
@@ -54,15 +54,15 @@ module WXRuby3
     Director.Spec(pkg, 'wxBitmap')
     Director.Spec(pkg, 'wxIcon')
     Director.Spec(pkg, 'wxCaret')
-    Director.Spec(pkg, 'wxValidator')
-    Director.Spec(pkg, 'wxTextValidator')
-    Director.Spec(pkg, 'wxAccelerator')
-    Director.Spec(pkg, 'wxMenuItem')
-    Director.Spec(pkg, 'wxMenuBar')
-    Director.Spec(pkg, 'wxMenu')
-    Director.Spec(pkg, 'wxAboutDialogInfo')
+    Director.Spec(pkg, 'wxValidator', requirements: %[USE_VALIDATORS])
+    Director.Spec(pkg, 'wxTextValidator', requirements: %[USE_VALIDATORS])
+    Director.Spec(pkg, 'wxAccelerator', requirements: %w[USE_ACCEL])
+    Director.Spec(pkg, 'wxMenuItem', requirements: %w[USE_MENUS])
+    Director.Spec(pkg, 'wxMenuBar', requirements: %w[USE_MENUBAR])
+    Director.Spec(pkg, 'wxMenu', requirements: %w[USE_MENUS])
+    Director.Spec(pkg, 'wxAboutDialogInfo', requirements: %w[USE_ABOUTDLG])
     Director.Spec(pkg, 'wxDialog')
-    Director.Spec(pkg, 'wxMessageDialog', director: Director::Dialog)
+    Director.Spec(pkg, 'wxMessageDialog', director: Director::Dialog, requirements: %w[USE_MSGDLG])
     Director.Spec(pkg, 'wxSizerItem')
     Director.Spec(pkg, 'wxSizer')
     Director.Spec(pkg, 'wxBoxSizer', director: Director::Sizer)
@@ -72,60 +72,60 @@ module WXRuby3
     Director.Spec(pkg, 'wxTextEntry')
     Director.Spec(pkg, 'wxTextAttr')
     Director.Spec(pkg, 'wxTextCtrl')
-    Director.Spec(pkg, 'wxCheckBox', director: Director::Window)
-    Director.Spec(pkg, 'wxAnyButton')
-    Director.Spec(pkg, 'wxButton')
-    Director.Spec(pkg, 'wxToggleButton')
+    Director.Spec(pkg, 'wxCheckBox', director: Director::Window, requirements: %w[USE_CHECKBOX])
+    Director.Spec(pkg, 'wxAnyButton', requirements: Director.AnyOf(*%w[USE_BUTTON USE_TOGGLEBTN]))
+    Director.Spec(pkg, 'wxButton', requirements: %w[USE_BUTTON])
+    Director.Spec(pkg, 'wxToggleButton', requirements: %w[USE_TOGGLEBTN])
     Director.Spec(pkg, 'wxControlWithItems')
-    Director.Spec(pkg, 'wxComboBox')
-    Director.Spec(pkg, 'wxBitmapComboBox')
-    Director.Spec(pkg, 'wxComboCtrl')
-    Director.Spec(pkg, 'wxRadioBox')
+    Director.Spec(pkg, 'wxComboBox', requirements: %w[USE_COMBOBOX])
+    Director.Spec(pkg, 'wxBitmapComboBox', requirements: %w[USE_BITMAPCOMBOBOX])
+    Director.Spec(pkg, 'wxComboCtrl', requirements: %w[USE_COMBOCTRL])
+    Director.Spec(pkg, 'wxRadioBox', requirements: %w[USE_RADIOBOX])
     Director.Spec(pkg, 'wxPanel')
     Director.Spec(pkg, 'wxWithImages')
     Director.Spec(pkg, 'wxBookCtrlEvent', director: Director::Event, requirements: Director.AnyOf(*%w[USE_AUI USE_NOTEBOOK USE_LISTBOOK USE_CHOICEBOOK USE_TOOLBOOK USE_TREEBOOK]))
     Director.Spec(pkg, 'wxBookCtrlBase', director: Director::BookCtrls, requirements: Director.AnyOf(*%w[USE_AUI USE_NOTEBOOK USE_LISTBOOK USE_CHOICEBOOK USE_TOOLBOOK USE_TREEBOOK]))
     Director.Spec(pkg, 'wxNotebook', director: Director::BookCtrls, requirements: Director.AnyOf(*%w[USE_NOTEBOOK]))
-    Director.Spec(pkg, 'wxImageList')
-    Director.Spec(pkg, 'wxListBox')
-    Director.Spec(pkg, 'wxChoice')
-    Director.Spec(pkg, 'wxStaticBox')
-    Director.Spec(pkg, 'wxSearchCtrl')
+    Director.Spec(pkg, 'wxImageList', requirements: %w[USE_IMAGLIST])
+    Director.Spec(pkg, 'wxListBox', requirements: %w[USE_LISTBOX])
+    Director.Spec(pkg, 'wxChoice', requirements: %w[USE_CHOICE])
+    Director.Spec(pkg, 'wxStaticBox', requirements: %w[USE_STATBOX])
+    Director.Spec(pkg, 'wxSearchCtrl', requirements: %w[USE_SEARCHCTRL])
     Director.Spec(pkg, 'wxCollapsiblePane', requirements: %w[USE_COLLPANE])
     Director.Spec(pkg, 'wxCollapsiblePaneEvent', requirements: %w[USE_COLLPANE])
-    Director.Spec(pkg, 'wxStaticLine', director: Director::Window)
-    Director.Spec(pkg, 'wxGauge', director: Director::Window)
-    Director.Spec(pkg, 'wxSlider')
-    Director.Spec(pkg, 'wxScrollBar')
-    Director.Spec(pkg, 'wxStaticText', director: Director::Window)
+    Director.Spec(pkg, 'wxStaticLine', director: Director::Window, requirements: %w[USE_STATLINE ])
+    Director.Spec(pkg, 'wxGauge', director: Director::Window, requirements: %w[USE_GAUGE])
+    Director.Spec(pkg, 'wxSlider', requirements: %w[USE_SLIDER])
+    Director.Spec(pkg, 'wxScrollBar', requirements: %w[USE_SCROLLBAR])
+    Director.Spec(pkg, 'wxStaticText', director: Director::Window, requirements: %w[USE_STATTEXT])
     Director.Spec(pkg, 'wxSpinButton', director: Director::Window, requirements: %w[USE_SPINBTN])
     Director.Spec(pkg, 'wxSpinEvent', director: Director::Event, requirements: Director.AnyOf(*%w[USE_SPINBTN USE_SPINCTRL]))
     Director.Spec(pkg, 'wxSpinCtrl', director: Director::Window, requirements: %w[USE_SPINCTRL])
     Director.Spec(pkg, 'wxSpinCtrlDouble', director: Director::Window, requirements: %w[USE_SPINBTN]).spec.do_not_generate(:enums, :variables, :defines)
     Director.Spec(pkg, 'wxSpinDoubleEvent', director: Director::Event, requirements: %w[USE_SPINBTN]).spec.do_not_generate(:enums, :variables, :defines)
-    Director.Spec(pkg, 'wxStaticBitmap')
-    Director.Spec(pkg, 'wxBitmapButton', director: Director::Button)
-    Director.Spec(pkg, 'wxCommandLinkButton', director: Director::Button)
+    Director.Spec(pkg, 'wxStaticBitmap', requirements: %w[USE_STATBMP])
+    Director.Spec(pkg, 'wxBitmapButton', director: Director::Button, requirements: %w[USE_BMPBUTTON])
+    Director.Spec(pkg, 'wxCommandLinkButton', director: Director::Button, requirements: %w[USE_BUTTON])
     Director.Spec(pkg, 'wxArtProvider')
     Director.Spec(pkg, 'wxStaticBoxSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxStdDialogButtonSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxCursor')
-    Director.Spec(pkg, 'wxRadioButton', director: Director::Window)
-    Director.Spec(pkg, 'wxToolTip')
-    Director.Spec(pkg, 'wxLog')
+    Director.Spec(pkg, 'wxRadioButton', director: Director::Window, requirements: %w[USE_RADIOBTN])
+    Director.Spec(pkg, 'wxToolTip', requirements: %w[USE_TOOLTIPS])
+    Director.Spec(pkg, 'wxLog', requirements: %w[USE_LOG])
     Director.Spec(pkg, 'wxToolBar', requirements: %w[USE_TOOLBAR])
-    Director.Spec(pkg, 'wxImage')
-    Director.Spec(pkg, 'wxDragImage')
+    Director.Spec(pkg, 'wxImage', requirements: %w[USE_IMAGE])
+    Director.Spec(pkg, 'wxDragImage', requirements: %w[USE_DRAGIMAGE])
     Director.Spec(pkg, 'wxFont')
     Director.Spec(pkg, 'wxFontData', requirements: %w[USE_FONTDLG])
     Director.Spec(pkg, 'wxFontDialog', director: Director::Dialog, requirements: %w[USE_FONTDLG])
     Director.Spec(pkg, 'wxPickerBase')
     Director.Spec(pkg, 'wxFontPickerEvent', director: Director::Event, requirements: %w[USE_FONTDLG USE_FONTPICKERCTRL])
     Director.Spec(pkg, 'wxFontPickerCtrl', requirements: %w[USE_FONTDLG USE_FONTPICKERCTRL])
-    Director.Spec(pkg, 'wxLocale')
+    Director.Spec(pkg, 'wxLocale', requirements: %w[USE_INTL])
     Director.Spec(pkg, 'wxSystemSettings')
-    Director.Spec(pkg, 'wxSystemOptions')
-    Director.Spec(pkg, 'wxPropertySheetDialog', director: Director::Dialog)
+    Director.Spec(pkg, 'wxSystemOptions', requirements: %w[USE_SYSTEM_OPTIONS])
+    Director.Spec(pkg, 'wxPropertySheetDialog', director: Director::Dialog, requirements: Director.AnyOf(*%w[USE_AUI USE_NOTEBOOK USE_LISTBOOK USE_CHOICEBOOK USE_TOOLBOOK USE_TREEBOOK]))
     Director.Spec(pkg, 'wxScrolledWindow', director: Director::ScrolledT)
     Director.Spec(pkg, 'wxScrolledCanvas', director: Director::ScrolledT)
     Director.Spec(pkg, 'wxScrolledControl', director: Director::ScrolledT)
@@ -142,11 +142,11 @@ module WXRuby3
     Director.Spec(pkg, 'wxColourDialog', director: Director::Dialog, requirements: %w[USE_COLOURDLG])
     Director.Spec(pkg, 'wxColourPickerEvent', director: Director::Event, requirements: %w[USE_COLOURPICKERCTRL USE_COLOURDLG])
     Director.Spec(pkg, 'wxColourPickerCtrl', requirements: %w[USE_COLOURPICKERCTRL USE_COLOURDLG])
-    Director.Spec(pkg, 'wxTextEntryDialog', director: Director::Dialog)
-    Director.Spec(pkg, 'wxNumberEntryDialog', director: Director::Dialog)
-    Director.Spec(pkg, 'wxSingleChoiceDialog', director: Director::Dialog)
-    Director.Spec(pkg, 'wxMultiChoiceDialog', director: Director::Dialog)
-    Director.Spec(pkg, 'wxTipProvider')
+    Director.Spec(pkg, 'wxTextEntryDialog', director: Director::Dialog, requirements: %w[USE_TEXTDLG])
+    Director.Spec(pkg, 'wxNumberEntryDialog', director: Director::Dialog, requirements: %w[USE_NUMBERDLG])
+    Director.Spec(pkg, 'wxSingleChoiceDialog', director: Director::Dialog, requirements: %w[USE_CHOICEDLG])
+    Director.Spec(pkg, 'wxMultiChoiceDialog', director: Director::Dialog, requirements: %w[USE_CHOICEDLG])
+    Director.Spec(pkg, 'wxTipProvider', requirements: %w[USE_STARTUP_TIPS])
     Director.Spec(pkg, 'wxDirDialog', director: Director::Dialog, requirements: %w[USE_DIRDLG])
     Director.Spec(pkg, 'wxFileDialog', director: Director::Dialog, requirements: %w[USE_FILEDLG])
     Director.Spec(pkg, 'wxFileDialogCustomizeHook', requirements: %w[USE_FILEDLG])
@@ -156,7 +156,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxFilePickerCtrl', requirements: %w[USE_FILEDLG USE_FILEPICKERCTRL])
     Director.Spec(pkg, 'wxFileCtrl', requirements: %w[USE_FILECTRL])
     Director.Spec(pkg, 'wxFileCtrlEvent', requirements: %w[USE_FILECTRL])
-    Director.Spec(pkg, 'wxProgressDialog', director: Director::Dialog)
+    Director.Spec(pkg, 'wxProgressDialog', director: Director::Dialog, requirements: %w[USE_PROGRESSDLG])
     Director.Spec(pkg, 'wxWindowDisabler')
     Director.Spec(pkg, 'wxBusyInfo', requirements: %w[USE_BUSYINFO])
     Director.Spec(pkg, 'wxListCtrl', requirements: %w[USE_LISTCTRL])
@@ -184,7 +184,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxSashLayoutWindow', requirements: %w[USE_SASH])
     Director.Spec(pkg, 'wxQueryLayoutInfoEvent', director: Director::SashLayoutEvent)
     Director.Spec(pkg, 'wxCalculateLayoutEvent', director: Director::SashLayoutEvent)
-    Director.Spec(pkg, 'wxEditableListBox')
+    Director.Spec(pkg, 'wxEditableListBox', requirements: %w[USE_EDITABLELISTBOX])
     Director.Spec(pkg, 'wxWizardEvent', director: Director::Event, requirements: %w[USE_WIZARDDLG])
     Director.Spec(pkg, 'wxWizardPage', requirements: %w[USE_WIZARDDLG])
     Director.Spec(pkg, 'wxWizardPageSimple', director: Director::WizardPage, requirements: %w[USE_WIZARDDLG])
@@ -205,8 +205,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxTaskBarIcon', requirements: %w[USE_TASKBARICON])
     Director.Spec(pkg, 'wxFSFile', requirements: %[USE_FILESYSTEM])
     Director.Spec(pkg, 'wxUtils')
-    Director.Spec(pkg, 'wxDirFilterListCtrl')
-    Director.Spec(pkg, 'wxGenericDirCtrl')
+    Director.Spec(pkg, 'wxDirFilterListCtrl', requirements: Director.AnyOf(*%w[USE_DIRDLG USE_FILEDLG]))
+    Director.Spec(pkg, 'wxGenericDirCtrl', requirements: Director.AnyOf(*%w[USE_DIRDLG USE_FILEDLG]))
     Director.Spec(pkg, 'wxMDIClientWindow', director: Director::Window, requirements: %w[USE_MDI])
     Director.Spec(pkg, 'wxMDIFrame', requirements: %w[USE_MDI])
     Director.Spec(pkg, 'wxAccessible', requirements: %w[USE_ACCESSIBILITY])
@@ -336,7 +336,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxPGMultiButton')
     Director.Spec(pkg, 'wxPGCell')
     Director.Spec(pkg, 'wxPGProperty')
-    Director.Spec(pkg, 'wxNumericPropertyValidator')
+    Director.Spec(pkg, 'wxNumericPropertyValidator', requirements: %[USE_VALIDATORS])
     Director.Spec(pkg, 'wxPGArrayEditorDialog')
     Director.Spec(pkg, 'wxPGProperties')
     Director.Spec(pkg, 'wxPropertyGridEvent')