Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/wxbind/include
Modified Files:
wxbind.h
Log Message:
Add picker.i for all of the wxPicker controls
Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity.
Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** wxbind.h 16 Jun 2007 06:21:43 -0000 1.74
--- wxbind.h 17 Jun 2007 18:36:12 -0000 1.75
***************
*** 137,140 ****
--- 137,148 ----
#endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS
+ #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ #include "wx/clrpicker.h"
+ #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
+ #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ #include "wx/datectrl.h"
+ #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
#if (wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)
#include "wx/valgen.h"
***************
*** 325,332 ****
#endif // wxLUA_USE_wxDataObject && wxUSE_DATAOBJ
- #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL
- #include "wx/datectrl.h"
- #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL
-
#if wxLUA_USE_wxDateSpan && wxUSE_DATETIME
#include "wx/datetime.h"
--- 333,336 ----
***************
*** 679,682 ****
--- 683,690 ----
#endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+ #if wxchkver_2_8 && wxLUA_USE_wxPicker
+ #include "wx/pickerbase.h"
+ #endif // wxchkver_2_8 && wxLUA_USE_wxPicker
+
// ---------------------------------------------------------------------------
***************
*** 696,699 ****
--- 704,716 ----
#endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+ #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ 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 // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
#if (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)
extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWave;
***************
*** 796,799 ****
--- 813,849 ----
#endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS
+ #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ 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 // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
+ #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl;
+ extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount;
+ #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
+ #if (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ 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 // (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
+ #if (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+ 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 // (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
+
#if (wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)
extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGenericValidator;
***************
*** 1407,1416 ****
#endif // wxLUA_USE_wxDataObject && wxUSE_DATAOBJ
- #if 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 // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL
-
#if wxLUA_USE_wxDateSpan && wxUSE_DATETIME
extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateSpan;
--- 1457,1460 ----
***************
*** 2405,2408 ****
--- 2449,2458 ----
#endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+ #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
+
|
