Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.79,1.80
|
From: John L. <jr...@us...> - 2007-06-19 22:27:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** wxbind.h 18 Jun 2007 21:40:35 -0000 1.79 --- wxbind.h 19 Jun 2007 22:26:46 -0000 1.80 *************** *** 84,87 **** --- 84,103 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_NUMBERDLG) + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + #include "wx/filepicker.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + #include "wx/clrpicker.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + #include "wx/datectrl.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + #include "wx/fontpicker.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + #if (wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) #include "wx/bmpbuttn.h" *************** *** 176,195 **** #endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - #include "wx/filepicker.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - #include "wx/clrpicker.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - #include "wx/datectrl.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - #include "wx/fontpicker.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - #include "sys/stat.h" #include "wx/control.h" --- 192,195 ---- *************** *** 219,222 **** --- 219,234 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + #include "wx/animate.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + #include "wx/collpane.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + #include "wx/pickerbase.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #include "wx/stdpaths.h" *************** *** 239,246 **** #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook - #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - #include "wx/animate.h" - #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - #if wxLUA_USE_Geometry && wxUSE_GEOMETRY #include "wx/geometry.h" --- 251,254 ---- *************** *** 722,733 **** #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard - #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - #include "wx/collpane.h" - #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - - #if wxchkver_2_8 && wxLUA_USE_wxPicker - #include "wx/pickerbase.h" - #endif // wxchkver_2_8 && wxLUA_USE_wxPicker - // --------------------------------------------------------------------------- --- 730,733 ---- *************** *** 735,738 **** --- 735,780 ---- // --------------------------------------------------------------------------- + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerCtrlBase; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerCtrlBase_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerCtrlBase_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDirPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDirPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDirPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFilePickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFilePickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFilePickerCtrl_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + #if (wxCHECK_VERSION(2,8,0)) && (defined(wxHAS_POWER_EVENTS)) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPowerEvent; *************** *** 1011,1056 **** #endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerCtrlBase; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerCtrlBase_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerCtrlBase_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerEvent_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerCtrl_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerEvent_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDirPickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDirPickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxDirPickerCtrl_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFilePickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFilePickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFilePickerCtrl_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerCtrl_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerEvent_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxActivateEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxActivateEvent_methods[]; --- 1053,1056 ---- *************** *** 1238,1241 **** --- 1238,1265 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimation_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimationCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePane; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePane_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePane_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePaneEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePaneEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePaneEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPickerBase; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPickerBase_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPickerBase_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStandardPaths; *************** *** 1279,1291 **** #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook - #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimation_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimationCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; - #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - #if wxLUA_USE_Geometry && wxUSE_GEOMETRY extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPoint2DDouble; --- 1303,1306 ---- *************** *** 2584,2602 **** #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard - #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePane; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePane_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePane_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePaneEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePaneEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePaneEvent_methodCount; - #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - - #if wxchkver_2_8 && wxLUA_USE_wxPicker - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPickerBase; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPickerBase_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxPickerBase_methodCount; - #endif // wxchkver_2_8 && wxLUA_USE_wxPicker - --- 2599,2602 ---- |
