wxruby3 0.9.1 → 0.9.2

data/rakelib/lib/specs/interfaces.rb

@@ -31,8 +31,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxMemoryDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxMirrorDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxScreenDC', director: Director::DerivedDC)
-    Director.Spec(pkg, 'wxSVGFileDC', director: Director::DerivedDC, requirements: %w[wxUSE_SVG])
-    Director.Spec(pkg, 'wxGCDC', director: Director::DerivedDC, requirements: %w[wxUSE_GRAPHICS_CONTEXT])
+    Director.Spec(pkg, 'wxSVGFileDC', director: Director::DerivedDC, requirements: %w[USE_SVG])
+    Director.Spec(pkg, 'wxGCDC', director: Director::DerivedDC, requirements: %w[USE_GRAPHICS_CONTEXT])
     Director.Spec(pkg, 'wxScaledDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxWindow')
     Director.Spec(pkg, 'wxEventBlocker')
@@ -40,10 +40,11 @@ module WXRuby3
     Director.Spec(pkg, 'wxPopupWindow')
     Director.Spec(pkg, 'wxTopLevelWindow')
     Director.Spec(pkg, 'wxFrame')
+    Director.Spec(pkg, 'wxTaskBarButton', requirements: %w[WXMSW USE_TASKBARBUTTON])
     Director.Spec(pkg, 'wxMiniFrame', director: Director::Frame)
     Director.Spec(pkg, 'wxGDIObject')
-    Director.Spec(pkg, 'wxGraphicsObject', requirements: %w[wxUSE_GRAPHICS_CONTEXT])
-    Director.Spec(pkg, 'wxGraphicsContext', requirements: %w[wxUSE_GRAPHICS_CONTEXT])
+    Director.Spec(pkg, 'wxGraphicsObject', requirements: %w[USE_GRAPHICS_CONTEXT])
+    Director.Spec(pkg, 'wxGraphicsContext', requirements: %w[USE_GRAPHICS_CONTEXT])
     Director.Spec(pkg, 'wxBrush')
     Director.Spec(pkg, 'wxPen')
     Director.Spec(pkg, 'wxPalette')
@@ -53,184 +54,184 @@ 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)
     Director.Spec(pkg, 'wxWrapSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxControl')
-    Director.Spec(pkg, 'wxStatusBar', requirements: %w[wxUSE_STATUSBAR])
+    Director.Spec(pkg, 'wxStatusBar', requirements: %w[USE_STATUSBAR])
     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[wxUSE_AUI wxUSE_NOTEBOOK wxUSE_LISTBOOK wxUSE_CHOICEBOOK wxUSE_TOOLBOOK wxUSE_TREEBOOK]))
-    Director.Spec(pkg, 'wxBookCtrlBase', director: Director::BookCtrls, requirements: Director.AnyOf(*%w[wxUSE_AUI wxUSE_NOTEBOOK wxUSE_LISTBOOK wxUSE_CHOICEBOOK wxUSE_TOOLBOOK wxUSE_TREEBOOK]))
-    Director.Spec(pkg, 'wxNotebook', director: Director::BookCtrls, requirements: Director.AnyOf(*%w[wxUSE_NOTEBOOK]))
-    Director.Spec(pkg, 'wxImageList')
-    Director.Spec(pkg, 'wxListBox')
-    Director.Spec(pkg, 'wxChoice')
-    Director.Spec(pkg, 'wxStaticBox')
-    Director.Spec(pkg, 'wxSearchCtrl')
-    Director.Spec(pkg, 'wxCollapsiblePane', requirements: %w[wxUSE_COLLPANE])
-    Director.Spec(pkg, 'wxCollapsiblePaneEvent', requirements: %w[wxUSE_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, 'wxSpinButton', director: Director::Window, requirements: %w[wxUSE_SPINBTN])
-    Director.Spec(pkg, 'wxSpinEvent', director: Director::Event, requirements: Director.AnyOf(*%w[wxUSE_SPINBTN wxUSE_SPINCTRL]))
-    Director.Spec(pkg, 'wxSpinCtrl', director: Director::Window, requirements: %w[wxUSE_SPINCTRL])
-    Director.Spec(pkg, 'wxSpinCtrlDouble', director: Director::Window, requirements: %w[wxUSE_SPINBTN]).spec.do_not_generate(:enums, :variables, :defines)
-    Director.Spec(pkg, 'wxSpinDoubleEvent', director: Director::Event, requirements: %w[wxUSE_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, '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', 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, 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', 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, 'wxToolBar', requirements: %w[wxUSE_TOOLBAR])
-    Director.Spec(pkg, 'wxImage')
-    Director.Spec(pkg, 'wxDragImage')
+    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', requirements: %w[USE_IMAGE])
+    Director.Spec(pkg, 'wxDragImage', requirements: %w[USE_DRAGIMAGE])
     Director.Spec(pkg, 'wxFont')
-    Director.Spec(pkg, 'wxFontData', requirements: %w[wxUSE_FONTDLG])
-    Director.Spec(pkg, 'wxFontDialog', director: Director::Dialog, requirements: %w[wxUSE_FONTDLG])
+    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[wxUSE_FONTDLG wxUSE_FONTPICKERCTRL])
-    Director.Spec(pkg, 'wxFontPickerCtrl', requirements: %w[wxUSE_FONTDLG wxUSE_FONTPICKERCTRL])
-    Director.Spec(pkg, 'wxLocale')
+    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', 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)
     Director.Spec(pkg, 'wxVScrolledWindow')
     Director.Spec(pkg, 'wxVListBox')
-    Director.Spec(pkg, 'wxFindReplaceData', requirements: %w[wxUSE_FINDREPLDLG])
-    Director.Spec(pkg, 'wxFindReplaceDialog', director: Director::Dialog, requirements: %w[wxUSE_FINDREPLDLG])
-    Director.Spec(pkg, 'wxFindDialogEvent', requirements: %w[wxUSE_FINDREPLDLG])
-    Director.Spec(pkg, 'wxToolbook', director: Director::BookCtrls, requirements: Director.AnyOf(%w[wxUSE_TOOLBOOK]))
-    Director.Spec(pkg, 'wxChoicebook', director: Director::BookCtrls, requirements: Director.AnyOf(%w[wxUSE_CHOICEBOOK]))
-    Director.Spec(pkg, 'wxListbook', director: Director::BookCtrls, requirements: Director.AnyOf(%w[wxUSE_LISTBOOK]))
-    Director.Spec(pkg, 'wxTreebook', director: Director::BookCtrls, requirements: Director.AnyOf(%w[wxUSE_TREEBOOK]))
-    Director.Spec(pkg, 'wxSimplebook', director: Director::BookCtrls, requirements: Director.AnyOf(%w[wxUSE_AUI wxUSE_NOTEBOOK wxUSE_LISTBOOK wxUSE_CHOICEBOOK wxUSE_TOOLBOOK wxUSE_TREEBOOK]))
-    Director.Spec(pkg, 'wxColourDialog', director: Director::Dialog, requirements: %w[wxUSE_COLOURDLG])
-    Director.Spec(pkg, 'wxColourPickerEvent', director: Director::Event, requirements: %w[wxUSE_COLOURPICKERCTRL wxUSE_COLOURDLG])
-    Director.Spec(pkg, 'wxColourPickerCtrl', requirements: %w[wxUSE_COLOURPICKERCTRL wxUSE_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, 'wxDirDialog', director: Director::Dialog, requirements: %w[wxUSE_DIRDLG])
-    Director.Spec(pkg, 'wxFileDialog', director: Director::Dialog, requirements: %w[wxUSE_FILEDLG])
-    Director.Spec(pkg, 'wxFileDialogCustomizeHook', requirements: %w[wxUSE_FILEDLG])
-    Director.Spec(pkg, 'wxFileDialogCustomControl', requirements: %w[wxUSE_FILEDLG])
-    Director.Spec(pkg, 'wxFileDirPickerEvent', director: Director::Event, requirements: Director.AnyOf(%w[wxUSE_DIRDLG wxUSE_DIRPICKERCTRL], %w[wxUSE_FILEDLG wxUSE_FILEPICKERCTRL]))
-    Director.Spec(pkg, 'wxDirPickerCtrl', requirements: %w[wxUSE_DIRDLG wxUSE_DIRPICKERCTRL])
-    Director.Spec(pkg, 'wxFilePickerCtrl', requirements: %w[wxUSE_FILEDLG wxUSE_FILEPICKERCTRL])
-    Director.Spec(pkg, 'wxFileCtrl', requirements: %w[wxUSE_FILECTRL])
-    Director.Spec(pkg, 'wxFileCtrlEvent', requirements: %w[wxUSE_FILECTRL])
-    Director.Spec(pkg, 'wxProgressDialog', director: Director::Dialog)
+    Director.Spec(pkg, 'wxFindReplaceData', requirements: %w[USE_FINDREPLDLG])
+    Director.Spec(pkg, 'wxFindReplaceDialog', director: Director::Dialog, requirements: %w[USE_FINDREPLDLG])
+    Director.Spec(pkg, 'wxFindDialogEvent', requirements: %w[USE_FINDREPLDLG])
+    Director.Spec(pkg, 'wxToolbook', director: Director::BookCtrls, requirements: %w[USE_TOOLBOOK])
+    Director.Spec(pkg, 'wxChoicebook', director: Director::BookCtrls, requirements: %w[USE_CHOICEBOOK])
+    Director.Spec(pkg, 'wxListbook', director: Director::BookCtrls, requirements: %w[USE_LISTBOOK])
+    Director.Spec(pkg, 'wxTreebook', director: Director::BookCtrls, requirements: %w[USE_TREEBOOK])
+    Director.Spec(pkg, 'wxSimplebook', director: Director::BookCtrls, requirements: Director.AnyOf(*%w[USE_AUI USE_NOTEBOOK USE_LISTBOOK USE_CHOICEBOOK USE_TOOLBOOK USE_TREEBOOK]))
+    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, 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])
+    Director.Spec(pkg, 'wxFileDialogCustomControl', requirements: %w[USE_FILEDLG])
+    Director.Spec(pkg, 'wxFileDirPickerEvent', director: Director::Event, requirements: Director.AnyOf(%w[USE_DIRDLG USE_DIRPICKERCTRL], %w[USE_FILEDLG USE_FILEPICKERCTRL]))
+    Director.Spec(pkg, 'wxDirPickerCtrl', requirements: %w[USE_DIRDLG USE_DIRPICKERCTRL])
+    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, requirements: %w[USE_PROGRESSDLG])
     Director.Spec(pkg, 'wxWindowDisabler')
-    Director.Spec(pkg, 'wxBusyInfo', requirements: %w[wxUSE_BUSYINFO])
-    Director.Spec(pkg, 'wxListCtrl', requirements: %w[wxUSE_LISTCTRL])
-    Director.Spec(pkg, 'wxListEvent', director: Director::Event, requirements: %w[wxUSE_LISTCTRL])
+    Director.Spec(pkg, 'wxBusyInfo', requirements: %w[USE_BUSYINFO])
+    Director.Spec(pkg, 'wxListCtrl', requirements: %w[USE_LISTCTRL])
+    Director.Spec(pkg, 'wxListEvent', director: Director::Event, requirements: %w[USE_LISTCTRL])
     Director.Spec(pkg, 'wxHeaderCtrl')
     Director.Spec(pkg, 'wxHeaderCtrlEvent', director: Director::Event)
     Director.Spec(pkg, 'wxGridSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxFlexGridSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxGBSizerItem', director: Director::SizerItem)
     Director.Spec(pkg, 'wxGridBagSizer', director: Director::Sizer)
-    Director.Spec(pkg, 'wxSplitterEvent', requirements: %w[wxUSE_SPLITTER])
-    Director.Spec(pkg, 'wxSplitterWindow', requirements: %w[wxUSE_SPLITTER])
-    Director.Spec(pkg, 'wxTreeEvent', requirements: %w[wxUSE_TREECTRL])
-    Director.Spec(pkg, 'wxTreeCtrl', requirements: %w[wxUSE_TREECTRL])
-    Director.Spec(pkg, 'wxDateEvent', requirements: %w[wxUSE_DATETIME])
-    Director.Spec(pkg, 'wxCalendarEvent', director: Director::DateEvent, requirements: %w[wxUSE_CALENDARCTRL])
-    Director.Spec(pkg, 'wxCalendarDateAttr', requirements: %w[wxUSE_CALENDARCTRL])
-    Director.Spec(pkg, 'wxCalendarCtrl', requirements: %w[wxUSE_CALENDARCTRL])
-    Director.Spec(pkg, 'wxDatePickerCtrl', requirements: %w[wxUSE_DATEPICKCTRL])
-    Director.Spec(pkg, 'wxTimePickerCtrl', requirements: %w[wxUSE_TIMEPICKCTRL])
-    Director.Spec(pkg, 'wxTimerEvent', director: Director::Event, requirements: %w[wxUSE_TIMER])
-    Director.Spec(pkg, 'wxTimer', requirements: %w[wxUSE_TIMER])
-    Director.Spec(pkg, 'wxSashEvent', requirements: %w[wxUSE_SASH])
-    Director.Spec(pkg, 'wxSashWindow', requirements: %w[wxUSE_SASH])
-    Director.Spec(pkg, 'wxSashLayoutWindow', requirements: %w[wxUSE_SASH])
+    Director.Spec(pkg, 'wxSplitterEvent', requirements: %w[USE_SPLITTER])
+    Director.Spec(pkg, 'wxSplitterWindow', requirements: %w[USE_SPLITTER])
+    Director.Spec(pkg, 'wxTreeEvent', requirements: %w[USE_TREECTRL])
+    Director.Spec(pkg, 'wxTreeCtrl', requirements: %w[USE_TREECTRL])
+    Director.Spec(pkg, 'wxDateEvent', requirements: %w[USE_DATETIME])
+    Director.Spec(pkg, 'wxCalendarEvent', director: Director::DateEvent, requirements: %w[USE_CALENDARCTRL])
+    Director.Spec(pkg, 'wxCalendarDateAttr', requirements: %w[USE_CALENDARCTRL])
+    Director.Spec(pkg, 'wxCalendarCtrl', requirements: %w[USE_CALENDARCTRL])
+    Director.Spec(pkg, 'wxDatePickerCtrl', requirements: %w[USE_DATEPICKCTRL])
+    Director.Spec(pkg, 'wxTimePickerCtrl', requirements: %w[USE_TIMEPICKCTRL])
+    Director.Spec(pkg, 'wxTimerEvent', director: Director::Event, requirements: %w[USE_TIMER])
+    Director.Spec(pkg, 'wxTimer', requirements: %w[USE_TIMER])
+    Director.Spec(pkg, 'wxSashEvent', requirements: %w[USE_SASH])
+    Director.Spec(pkg, 'wxSashWindow', requirements: %w[USE_SASH])
+    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, 'wxWizardEvent', director: Director::Event, requirements: %w[wxUSE_WIZARDDLG])
-    Director.Spec(pkg, 'wxWizardPage', requirements: %w[wxUSE_WIZARDDLG])
-    Director.Spec(pkg, 'wxWizardPageSimple', director: Director::WizardPage, requirements: %w[wxUSE_WIZARDDLG])
-    Director.Spec(pkg, 'wxWizard', director: Director::Dialog, requirements: %w[wxUSE_WIZARDDLG])
-    Director.Spec(pkg, 'wxCheckListBox', requirements: %w[wxUSE_CHECKLISTBOX])
-    Director.Spec(pkg, 'wxRearrangeList', requirements: %w[wxUSE_CHECKLISTBOX])
-    Director.Spec(pkg, 'wxRearrangeCtrl', director: Director::Window, requirements: %w[wxUSE_CHECKLISTBOX])
-    Director.Spec(pkg, 'wxDataFormat', requirements: %w[wxUSE_CLIPBOARD])
-    Director.Spec(pkg, 'wxDataObject', requirements: %w[wxUSE_CLIPBOARD])
-    Director.Spec(pkg, 'wxDataObjectSimpleBase', requirements: %w[wxUSE_CLIPBOARD])
-    Director.Spec(pkg, 'wxClipboard', requirements: %w[wxUSE_CLIPBOARD])
-    Director.Spec(pkg, 'wxDragDrop', requirements: %w[wxUSE_DRAG_AND_DROP])
-    Director.Spec(pkg, 'wxContextHelpButton', requirements: %w[wxUSE_HELP])
-    Director.Spec(pkg, 'wxHelpProvider', requirements: %w[wxUSE_HELP])
-    Director.Spec(pkg, 'wxHelpController', requirements: %w[wxUSE_HELP])
-    Director.Spec(pkg, 'wxExtHelpController', director: Director::HelpController, requirements: %w[wxUSE_HELP])
-    Director.Spec(pkg, 'wxTaskBarIconEvent', director: Director::Event, requirements: %w[wxUSE_TASKBARICON])
-    Director.Spec(pkg, 'wxTaskBarIcon', requirements: %w[wxUSE_TASKBARICON])
-    Director.Spec(pkg, 'wxFSFile', requirements: %[wxUSE_FILESYSTEM])
+    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])
+    Director.Spec(pkg, 'wxWizard', director: Director::Dialog, requirements: %w[USE_WIZARDDLG])
+    Director.Spec(pkg, 'wxCheckListBox', requirements: %w[USE_CHECKLISTBOX])
+    Director.Spec(pkg, 'wxRearrangeList', requirements: %w[USE_CHECKLISTBOX])
+    Director.Spec(pkg, 'wxRearrangeCtrl', director: Director::Window, requirements: %w[USE_CHECKLISTBOX])
+    Director.Spec(pkg, 'wxDataFormat', requirements: %w[USE_CLIPBOARD])
+    Director.Spec(pkg, 'wxDataObject', requirements: %w[USE_CLIPBOARD])
+    Director.Spec(pkg, 'wxDataObjectSimpleBase', requirements: %w[USE_CLIPBOARD])
+    Director.Spec(pkg, 'wxClipboard', requirements: %w[USE_CLIPBOARD])
+    Director.Spec(pkg, 'wxDragDrop', requirements: %w[USE_DRAG_AND_DROP])
+    Director.Spec(pkg, 'wxContextHelpButton', requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxHelpProvider', requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxHelpController', requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxExtHelpController', director: Director::HelpController, requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxTaskBarIconEvent', director: Director::Event, requirements: %w[USE_TASKBARICON])
+    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, 'wxMDIClientWindow', director: Director::Window, requirements: %w[wxUSE_MDI])
-    Director.Spec(pkg, 'wxMDIFrame', requirements: %w[wxUSE_MDI])
-    Director.Spec(pkg, 'wxAccessible', requirements: %w[wxUSE_ACCESSIBILITY])
-    Director.Spec(pkg, 'wxAnimation', requirements: %w[wxUSE_ANIMATIONCTRL])
-    Director.Spec(pkg, 'wxAnimationCtrl', requirements: %w[wxUSE_ANIMATIONCTRL])
-    Director.Spec(pkg, 'wxMediaEvent', director: Director::Event, requirements: %w[wxUSE_MEDIACTRL])
-    Director.Spec(pkg, 'wxMediaCtrl', requirements: %w[wxUSE_MEDIACTRL])
-    Director.Spec(pkg, 'wxXmlNode', requirements: %w[wxUSE_XML])
-    Director.Spec(pkg, 'wxXmlResource', requirements: %w[wxUSE_XRC])
-    Director.Spec(pkg, 'wxVariant', requirements: %w[wxUSE_VARIANT])
+    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])
+    Director.Spec(pkg, 'wxAnimation', requirements: %w[USE_ANIMATIONCTRL])
+    Director.Spec(pkg, 'wxAnimationCtrl', requirements: %w[USE_ANIMATIONCTRL])
+    Director.Spec(pkg, 'wxMediaEvent', director: Director::Event, requirements: %w[USE_MEDIACTRL])
+    Director.Spec(pkg, 'wxMediaCtrl', requirements: %w[USE_MEDIACTRL])
+    Director.Spec(pkg, 'wxXmlNode', requirements: %w[USE_XML])
+    Director.Spec(pkg, 'wxXmlResource', requirements: %w[USE_XRC])
+    Director.Spec(pkg, 'wxVariant', requirements: %w[USE_VARIANT])
     Director.Spec(pkg, 'wxPlatformInfo')
-    Director.Spec(pkg, 'wxSplashScreen', requirements: %w[wxUSE_SPLASH])
-    Director.Spec(pkg, 'wxUIActionSimulator', requirements: %w[wxUSE_UIACTIONSIMULATOR])
-    Director.Spec(pkg, 'wxActivityIndicator', director: Director::Window, requirements: %w[wxUSE_ACTIVITYINDICATOR])
-    Director.Spec(pkg, 'wxHyperlinkCtrl', requirements: %w[wxUSE_HYPERLINKCTRL])
-    Director.Spec(pkg, 'wxHyperlinkEvent', requirements: %w[wxUSE_HYPERLINKCTRL])
-    Director.Spec(pkg, 'wxBannerWindow', requirements: %w[wxUSE_BANNERWINDOW])
-    Director.Spec(pkg, 'wxInfoBar', requirements: %w[wxUSE_INFOBAR])
-    Director.Spec(pkg, 'wxFileSystem', requirements: %w[wxUSE_FILESYSTEM])
-    Director.Spec(pkg, 'wxDialUpManager', requirements: %w[wxUSE_DIALUP_MANAGER])
-    Director.Spec(pkg, 'wxDialUpEvent', requirements: %w[wxUSE_DIALUP_MANAGER])
+    Director.Spec(pkg, 'wxSplashScreen', requirements: %w[USE_SPLASH])
+    Director.Spec(pkg, 'wxUIActionSimulator', requirements: %w[USE_UIACTIONSIMULATOR])
+    Director.Spec(pkg, 'wxActivityIndicator', director: Director::Window, requirements: %w[USE_ACTIVITYINDICATOR])
+    Director.Spec(pkg, 'wxHyperlinkCtrl', requirements: %w[USE_HYPERLINKCTRL])
+    Director.Spec(pkg, 'wxHyperlinkEvent', requirements: %w[USE_HYPERLINKCTRL])
+    Director.Spec(pkg, 'wxBannerWindow', requirements: %w[USE_BANNERWINDOW])
+    Director.Spec(pkg, 'wxInfoBar', requirements: %w[USE_INFOBAR])
+    Director.Spec(pkg, 'wxFileSystem', requirements: %w[USE_FILESYSTEM])
+    Director.Spec(pkg, 'wxDialUpManager', requirements: %w[USE_DIALUP_MANAGER])
+    Director.Spec(pkg, 'wxDialUpEvent', requirements: %w[USE_DIALUP_MANAGER])
   }
 
-  Director.Package('Wx::PRT', 'wxUSE_PRINTING_ARCHITECTURE') do |pkg|
-    Director.Spec(pkg, 'wxPrinterDC', director: Director::DerivedDC)
+  Director.Package('Wx::PRT', 'USE_PRINTING_ARCHITECTURE') do |pkg|
+    Director.Spec(pkg, 'wxPrinterDC', director: Director::DerivedDC, requirements: Director.AnyOf(*%w[WXMSW WXOSX USE_GTKPRINT]))
     Director.Spec(pkg, 'wxPostScriptDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxPrintData')
     Director.Spec(pkg, 'wxPrintDialog')
@@ -240,21 +241,21 @@ module WXRuby3
     Director.Spec(pkg, 'wxPrinter')
   end
 
-  Director.Package('Wx::HTML', 'wxUSE_HTML') { |pkg|
+  Director.Package('Wx::HTML', 'USE_HTML') { |pkg|
     Director.Spec(pkg, 'wxHtmlWindow')
-    Director.Spec(pkg, 'wxHtmlHelpData', requirements: %w[wxUSE_HELP])
-    Director.Spec(pkg, 'wxHtmlHelpWindow', requirements: %w[wxUSE_HELP])
+    Director.Spec(pkg, 'wxHtmlHelpData', requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxHtmlHelpWindow', requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxHtmlCellEvent', director: Director::HtmlEvent)
     Director.Spec(pkg, 'wxHtmlLinkEvent', director: Director::HtmlEvent)
-    Director.Spec(pkg, 'wxHtmlHelpController', director: Director::HelpController, requirements: %w[wxUSE_HELP])
+    Director.Spec(pkg, 'wxHtmlHelpController', director: Director::HelpController, requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxHtmlCell')
-    Director.Spec(pkg, 'wxHtmlEasyPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
-    Director.Spec(pkg, 'wxHtmlPrintout', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
+    Director.Spec(pkg, 'wxHtmlEasyPrinting', requirements: %w[USE_PRINTING_ARCHITECTURE])
+    Director.Spec(pkg, 'wxHtmlPrintout', requirements: %w[USE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxHtmlListBox')
     Director.Spec(pkg, 'wxHTMLDataObject') if Config.instance.wx_version >= '3.3'
   }
 
-  Director.Package('Wx::RTC', 'wxUSE_RICHTEXT', depends_on: ['Wx::HTML']) { |pkg|
+  Director.Package('Wx::RTC', 'USE_RICHTEXT', depends_on: ['Wx::HTML']) { |pkg|
     Director.Spec(pkg, 'wxRichTextObject')
     Director.Spec(pkg, 'wxRichTextImage')
     Director.Spec(pkg, 'wxRichTextCompositeObject')
@@ -266,8 +267,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxRichTextFileHandler')
     Director.Spec(pkg, 'wxRichTextXMLHandler', director: Director::RichTextFileHandler)
     Director.Spec(pkg, 'wxRichTextHTMLHandler', director: Director::RichTextFileHandler)
-    Director.Spec(pkg, 'wxRichTextHeaderFooterData', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
-    Director.Spec(pkg, 'wxRichTextPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
+    Director.Spec(pkg, 'wxRichTextHeaderFooterData', requirements: %w[USE_PRINTING_ARCHITECTURE])
+    Director.Spec(pkg, 'wxRichTextPrinting', requirements: %w[USE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxSymbolPickerDialog', director: Director::Dialog)
     Director.Spec(pkg, 'wxRichTextFormattingDialog')
     Director.Spec(pkg, 'wxRichTextStyleOrganiserDialog')
@@ -275,12 +276,12 @@ module WXRuby3
     Director.Spec(pkg, 'wxRichTextBufferDataObject')
   }
 
-  Director.Package('Wx::STC', 'wxUSE_STC') { |pkg|
+  Director.Package('Wx::STC', 'USE_STC') { |pkg|
     Director.Spec(pkg, 'wxStyledTextEvent')
     Director.Spec(pkg, 'wxStyledTextCtrl')
   }
 
-  Director.Package('Wx::GRID', 'wxUSE_GRID') { |pkg|
+  Director.Package('Wx::GRID', 'USE_GRID') { |pkg|
     Director.Spec(pkg, 'wxGridEvent', director: Director::Event)
     Director.Spec(pkg, 'wxGridSizeEvent', director: Director::Event)
     Director.Spec(pkg, 'wxGridEditorCreatedEvent', director: Director::Event)
@@ -311,7 +312,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxGridCtrl')
   }
 
-  Director.Package('Wx::AUI', 'wxUSE_AUI') { |pkg|
+  Director.Package('Wx::AUI', 'USE_AUI') { |pkg|
     Director.Spec(pkg, 'wxAuiPaneInfo')
     Director.Spec(pkg, 'wxAuiManagerEvent')
     Director.Spec(pkg, 'wxAuiDockArt')
@@ -330,12 +331,12 @@ module WXRuby3
     Director.Spec(pkg, 'wxAuiMDIChildFrame')
   }
 
-  Director.Package('Wx::PG', 'wxUSE_PROPGRID') { |pkg|
+  Director.Package('Wx::PG', 'USE_PROPGRID') { |pkg|
     Director.Spec(pkg, 'wxPGEditor')
     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')
@@ -347,7 +348,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxPropertyGridManager')
   }
 
-  Director.Package('Wx::RBN', 'wxUSE_RIBBON') { |pkg|
+  Director.Package('Wx::RBN', 'USE_RIBBON') { |pkg|
     Director.Spec(pkg, 'wxRibbonBarEvent')
     Director.Spec(pkg, 'wxRibbonButtonBarEvent')
     Director.Spec(pkg, 'wxRibbonGalleryEvent')

data/rakelib/lib/typemap/common.rb

@@ -436,6 +436,35 @@ module WXRuby3
           # do not seem to be virtual methods returning that
         end
 
+        # const wxVector<int>&
+
+        map 'const wxVector<int>&' => 'Array<Integer>' do
+          map_in temp: 'wxVector<int> tmp', code: <<~__CODE
+            if (($input == Qnil) || (TYPE($input) != T_ARRAY))
+            {
+              VALUE dump = rb_inspect($input);
+              rb_raise(rb_eArgError, "expected Array of Integer for %d but got %s", 
+                                     $argnum-1, StringValuePtr(dump));
+            }
+            else
+            {
+              for (int i = 0; i < RARRAY_LEN($input); i++)
+              {
+                tmp.push_back(NUM2INT(rb_ary_entry($input,i)));
+              }
+              $1 = &tmp;
+            }
+            __CODE
+          map_directorin code: <<~__CODE
+            $input = rb_ary_new();
+            for (size_t i = 0; i < $1.size(); i++)
+            {
+              rb_ary_push($input,INT2NUM( $1[i] ) );
+            }
+          __CODE
+          map_typecheck precedence: 'INT32_ARRAY', code: '$1 = (TYPE($input) == T_ARRAY);'
+        end
+
         # various enumerator type mappings
 
         map *%w[wxEdge wxRelationship wxKeyCode], as: 'Integer' do
@@ -655,7 +684,7 @@ module WXRuby3
 
         # add type mapping for wxVariant input args
         intypes = 'nil,String,Integer,Float,Time,Wx::Font,Wx::Colour,Wx::Variant,Array<WxVariant>,Array<String>,Object'
-        if Config.instance.features_set?('wxUSE_PROPGRID')
+        if Config.instance.features_set?('USE_PROPGRID')
           intypes << 'Wx::PG::ColourPropertyValue'
         end
         map 'const wxVariant&' => intypes do

data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -1,7 +1,79 @@
 
-blockquote {
+div.wxrb-note {
     background: #f7f7f9;
-    border-left: .25em solid #e1e1e8;
+    border-left: .6em solid #f3ba6f;
+    border-radius: 3px;
     margin: 14px;
     padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-remark {
+    background: #f7f7f9;
+    border-left: .6em solid #f6f4ab;
+    border-radius: 3px;
+    margin: 14px;
+    padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-note p,
+div.wxrb-remark p {
+    margin: 0;
+}
+
+div.wxrb-logo {
+    float: right;
+    padding-top: 12px;
+}
+
+div.wxrb-logo img {
+    vertical-align: middle;
+}
+
+div.wxrb-logo span.wxrb-name {
+    font-size: large;
+    font-weight: bold;
+    margin-left: 10px;
+}
+
+div.wxrb-logo span.wxrb-name a {
+    color: black;
+}
+
+div.wxrb-logo span.wxrb-version {
+    font-size: medium;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo span.wxrb-wxver {
+    font-size: 0.9em;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo table {
+    display: inline;
+}
+
+div.wxrb-logo table td {
+    margin: 0;
+}
+
+.discussion div.note {
+    background: #f7f7f9;
+    border-left: .6em solid #f3ba6f;
+    margin: 14px;
+}
+
+.tags span.wxrb-require {
+    border-radius: 5px;
+    border: 1px solid #E1E1E8;
+    padding: 0px 3px 0px 3px;
+    background: #f3ba6f;
+    font-weight: bold;
+    font-size: 0.9em;
 }

data/rakelib/yard/templates/default/fulldoc/html/full_list.erb

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="<%= charset %>" />
+    <% stylesheets_full_list.each do |stylesheet| %>
+      <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" media="screen" />
+    <% end %>
+
+    <% javascripts_full_list.each do |javascript| %>
+      <script type="text/javascript" charset="utf-8" src="<%= mtime_url(javascript) %>"></script>
+    <% end %>
+
+    <title><%= @list_title %></title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <%= logo_and_version %>
+        <h1 id="full_list_header"><%= @list_title %></h1>
+        <div id="full_list_nav">
+          <% menu_lists.each do |list| %>
+            <span><a target="_self" href="<%= url_for_list list[:type] %>">
+              <%= list[:title] %>
+            </a></span>
+          <% end %>
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="<%= @list_class || @list_type %>">
+        <%= erb "full_list_#{@list_type}" %>
+      </ul>
+    </div>
+  </body>
+</html>