Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i,1.17,1.18 controls.i,1.19,1.20 defsutil.i,1.23,1.24 dialogs.i,1.18,1.19 event.i,1.15,1.16 gdi.i,1.24,1.25 override.hpp,1.46,1.47 wave.i,1.8,1.9 wx_datatypes.lua,1.32,1.33
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/bindings/wxwidgets Modified Files: appframe.i controls.i defsutil.i dialogs.i event.i gdi.i override.hpp wave.i wx_datatypes.lua Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wave.i 17 May 2006 05:02:04 -0000 1.8 --- wave.i 25 May 2006 22:50:05 -0000 1.9 *************** *** 61,64 **** --- 61,66 ---- %endif // %msw&!%wxchkver25 + %endif wxLUA_USE_wxWave + //----------------------------------------------------------------------------- // wxMediaCtrl *************** *** 123,124 **** --- 125,219 ---- %endif //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL + //----------------------------------------------------------------------------- + // wxJoystick + + %if wxLUA_USE_wxJoystick|wxUSE_JOYSTICK + + %include "wx/joystick.h" + + %enum + wxJOYSTICK1 + wxJOYSTICK2 + %endenum + + %enum + wxJOY_BUTTON_ANY + wxJOY_BUTTON1 + wxJOY_BUTTON2 + wxJOY_BUTTON3 + wxJOY_BUTTON4 + %endenum + + %class %delete wxJoystick, wxObject + wxJoystick(int joystick = wxJOYSTICK1) + + int GetButtonState() const + int GetManufacturerId() const + int GetMovementThreshold() const + int GetNumberAxes() const + int GetNumberButtons() const + int GetNumberJoysticks() const + int GetPollingMax() const + int GetPollingMin() const + int GetProductId() const + wxString GetProductName() const + wxPoint GetPosition() const + int GetPOVPosition() const + int GetPOVCTSPosition() const + int GetRudderMax() const + int GetRudderMin() const + int GetRudderPosition() const + int GetUMax() const + int GetUMin() const + int GetUPosition() const + int GetVMax() const + int GetVMin() const + int GetVPosition() const + int GetXMax() const + int GetXMin() const + int GetYMax() const + int GetYMin() const + int GetZMax() const + int GetZMin() const + int GetZPosition() const + bool HasPOV() const + bool HasPOV4Dir() const + bool HasPOVCTS() const + bool HasRudder() const + bool HasU() const + bool HasV() const + bool HasZ() const + bool IsOk() const + bool ReleaseCapture() + bool SetCapture(wxWindow* win, int pollingFreq = 0) + void SetMovementThreshold(int threshold) + %endclass + + //----------------------------------------------------------------------------- + // wxJoystickEvent - FIXME add rest of wxJoystick? + + %include "wx/event.h" + + %class %delete wxJoystickEvent, wxEvent + %define %event wxEVT_JOY_BUTTON_DOWN + %define %event wxEVT_JOY_BUTTON_UP + %define %event wxEVT_JOY_MOVE + %define %event wxEVT_JOY_ZMOVE + + wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) + + bool ButtonDown(int button = wxJOY_BUTTON_ANY) const + bool ButtonIsDown(int button = wxJOY_BUTTON_ANY) const + bool ButtonUp(int button = wxJOY_BUTTON_ANY) const + int GetButtonChange() const + int GetButtonState() const + int GetJoystick() const + wxPoint GetPosition() const + int GetZPosition() const + bool IsButton() const + bool IsMove() const + bool IsZMove() const + %endclass + + %endif wxLUA_USE_wxJoystick|wxUSE_JOYSTICK + Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wx_datatypes.lua 24 May 2006 04:50:00 -0000 1.32 --- wx_datatypes.lua 25 May 2006 22:50:05 -0000 1.33 *************** *** 337,344 **** --- 337,352 ---- }, wxBusyCursor = { + Condition = "wxLUA_USE_wxBusyCursor", DefType = "class", Intrinsic = false, Name = "wxBusyCursor", }, + wxBusyInfo = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO", + DefType = "class", + Intrinsic = false, + Name = "wxBusyInfo", + }, wxButton = { BaseClass = "wxControl", *************** *** 502,505 **** --- 510,519 ---- Name = "wxColourData", }, + wxColourDatabase = { + Condition = "wxLUA_USE_wxColourPenBrush", + DefType = "class", + Intrinsic = false, + Name = "wxColourDatabase", + }, wxColourDialog = { BaseClass = "wxDialog", *************** *** 563,567 **** wxControlWithItems = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox", DefType = "class", Intrinsic = false, --- 577,581 ---- wxControlWithItems = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox", DefType = "class", Intrinsic = false, *************** *** 686,696 **** Name = "wxDateTime::WeekDay", }, - wxDialUpEvent = { - BaseClass = "wxCommandEvent", - Condition = "!defined(__WXMAC__)", - DefType = "class", - Intrinsic = false, - Name = "wxDialUpEvent", - }, wxDialog = { BaseClass = "wxTopLevelWindow", --- 700,703 ---- *************** *** 1111,1114 **** --- 1118,1128 ---- Name = "wxGauge", }, + wxGenericDirCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG", + DefType = "class", + Intrinsic = false, + Name = "wxGenericDirCtrl", + }, wxGenericValidator = { BaseClass = "wxValidator", *************** *** 1590,1595 **** --- 1604,1617 ---- Name = "wxJPEGHandler", }, + wxJoystick = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", + DefType = "class", + Intrinsic = false, + Name = "wxJoystick", + }, wxJoystickEvent = { BaseClass = "wxEvent", + Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", DefType = "class", Intrinsic = false, *************** *** 1614,1617 **** --- 1636,1640 ---- }, wxKillError = { + Condition = "wxLUA_USE_wxProcess", DefType = "enum", Intrinsic = true, *************** *** 1794,1798 **** wxMediaCtrl = { BaseClass = "wxControl", ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "class", Intrinsic = false, --- 1817,1821 ---- wxMediaCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "class", Intrinsic = false, *************** *** 1800,1804 **** }, wxMediaCtrlPlayerControls = { ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "enum", Intrinsic = true, --- 1823,1827 ---- }, wxMediaCtrlPlayerControls = { ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "enum", Intrinsic = true, *************** *** 1807,1811 **** wxMediaEvent = { BaseClass = "wxNotifyEvent", ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "class", Intrinsic = false, --- 1830,1834 ---- wxMediaEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "class", Intrinsic = false, *************** *** 1813,1817 **** }, wxMediaState = { ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "enum", Intrinsic = true, --- 1836,1840 ---- }, wxMediaState = { ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "enum", Intrinsic = true, *************** *** 1926,1929 **** --- 1949,1953 ---- wxMultiChoiceDialog = { BaseClass = "wxDialog", + Condition = "wxLUA_USE_wxMultiChoiceDialog", DefType = "class", Intrinsic = false, *************** *** 2060,2063 **** --- 2084,2094 ---- Name = "wxPaperSize", }, + wxPasswordEntryDialog = { + BaseClass = "wxTextEntryDialog", + Condition = "wxLUA_USE_wxTextEntryDialog", + DefType = "class", + Intrinsic = false, + Name = "wxPasswordEntryDialog", + }, wxPathFormat = { Condition = "wxLUA_USE_wxFileName", *************** *** 2207,2210 **** --- 2238,2242 ---- wxProcess = { BaseClass = "wxEvtHandler", + Condition = "wxLUA_USE_wxProcess", DefType = "class", Intrinsic = false, *************** *** 2387,2390 **** --- 2419,2423 ---- }, wxSignal = { + Condition = "wxLUA_USE_wxProcess", DefType = "enum", Intrinsic = true, *************** *** 2524,2527 **** --- 2557,2574 ---- Name = "wxSpinEvent", }, + wxSplashScreen = { + BaseClass = "wxFrame", + Condition = "wxLUA_USE_wxSplashScreen", + DefType = "class", + Intrinsic = false, + Name = "wxSplashScreen", + }, + wxSplashScreenWindow = { + BaseClass = "wxWindow", + Condition = "wxLUA_USE_wxSplashScreen", + DefType = "class", + Intrinsic = false, + Name = "wxSplashScreenWindow", + }, wxSplitterEvent = { BaseClass = "wxCommandEvent", *************** *** 2645,2649 **** wxSystemOptions = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSystemSettings", DefType = "class", Intrinsic = false, --- 2692,2696 ---- wxSystemOptions = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSystemOptions", DefType = "class", Intrinsic = false, *************** *** 2770,2774 **** wxToggleButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxButton", DefType = "class", Intrinsic = false, --- 2817,2821 ---- wxToggleButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxToggleButton", DefType = "class", Intrinsic = false, *************** *** 3176,3181 **** WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", - wxLUA_USE_CODEDRAGON = "wxLUA_USE_CODEDRAGON", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_MDI = "wxLUA_USE_MDI", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", --- 3223,3228 ---- WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", wxLUA_USE_FL = "wxLUA_USE_FL", + wxLUA_USE_Geometry = "wxLUA_USE_Geometry", wxLUA_USE_MDI = "wxLUA_USE_MDI", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", *************** *** 3183,3189 **** --- 3230,3239 ---- wxLUA_USE_wxArrayInt = "wxLUA_USE_wxArrayInt", wxLUA_USE_wxArrayString = "wxLUA_USE_wxArrayString", + wxLUA_USE_wxArtProvider = "wxLUA_USE_wxArtProvider", wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", + wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", + wxLUA_USE_wxBusyInfo = "wxLUA_USE_wxBusyInfo", wxLUA_USE_wxButton = "wxLUA_USE_wxButton", wxLUA_USE_wxCalendarCtrl = "wxLUA_USE_wxCalendarCtrl", *************** *** 3199,3202 **** --- 3249,3254 ---- wxLUA_USE_wxCommandProcessor = "wxLUA_USE_wxCommandProcessor", wxLUA_USE_wxConfig = "wxLUA_USE_wxConfig", + wxLUA_USE_wxCriticalSection = "wxLUA_USE_wxCriticalSection", + wxLUA_USE_wxCriticalSectionLocker = "wxLUA_USE_wxCriticalSectionLocker", wxLUA_USE_wxCursor = "wxLUA_USE_wxCursor", wxLUA_USE_wxDC = "wxLUA_USE_wxDC", *************** *** 3221,3224 **** --- 3273,3277 ---- wxLUA_USE_wxGLCanvas = "wxLUA_USE_wxGLCanvas", wxLUA_USE_wxGauge = "wxLUA_USE_wxGauge", + wxLUA_USE_wxGenericDirCtrl = "wxLUA_USE_wxGenericDirCtrl", wxLUA_USE_wxGenericValidator = "wxLUA_USE_wxGenericValidator", wxLUA_USE_wxGrid = "wxLUA_USE_wxGrid", *************** *** 3231,3234 **** --- 3284,3288 ---- wxLUA_USE_wxImage = "wxLUA_USE_wxImage", wxLUA_USE_wxImageList = "wxLUA_USE_wxImageList", + wxLUA_USE_wxJoystick = "wxLUA_USE_wxJoystick", wxLUA_USE_wxLayoutConstraints = "wxLUA_USE_wxLayoutConstraints", wxLUA_USE_wxList = "wxLUA_USE_wxList", *************** *** 3243,3246 **** --- 3297,3301 ---- wxLUA_USE_wxMetafile = "wxLUA_USE_wxMetafile", wxLUA_USE_wxMiniFrame = "wxLUA_USE_wxMiniFrame", + wxLUA_USE_wxMultiChoiceDialog = "wxLUA_USE_wxMultiChoiceDialog", wxLUA_USE_wxNotebook = "wxLUA_USE_wxNotebook", wxLUA_USE_wxObject = "wxLUA_USE_wxObject", *************** *** 3249,3252 **** --- 3304,3308 ---- wxLUA_USE_wxPointSizeRect = "wxLUA_USE_wxPointSizeRect", wxLUA_USE_wxPrint = "wxLUA_USE_wxPrint", + wxLUA_USE_wxProcess = "wxLUA_USE_wxProcess", wxLUA_USE_wxProgressDialog = "wxLUA_USE_wxProgressDialog", wxLUA_USE_wxRadioBox = "wxLUA_USE_wxRadioBox", *************** *** 3263,3266 **** --- 3319,3323 ---- wxLUA_USE_wxSpinButton = "wxLUA_USE_wxSpinButton", wxLUA_USE_wxSpinCtrl = "wxLUA_USE_wxSpinCtrl", + wxLUA_USE_wxSplashScreen = "wxLUA_USE_wxSplashScreen", wxLUA_USE_wxSplitterWindow = "wxLUA_USE_wxSplitterWindow", wxLUA_USE_wxStaticBitmap = "wxLUA_USE_wxStaticBitmap", *************** *** 3270,3273 **** --- 3327,3331 ---- wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", + wxLUA_USE_wxSystemOptions = "wxLUA_USE_wxSystemOptions", wxLUA_USE_wxSystemSettings = "wxLUA_USE_wxSystemSettings", wxLUA_USE_wxTabCtrl = "wxLUA_USE_wxTabCtrl", *************** *** 3278,3281 **** --- 3336,3340 ---- wxLUA_USE_wxTimeSpan = "wxLUA_USE_wxTimeSpan", wxLUA_USE_wxTimer = "wxLUA_USE_wxTimer", + wxLUA_USE_wxToggleButton = "wxLUA_USE_wxToggleButton", wxLUA_USE_wxToolbar = "wxLUA_USE_wxToolbar", wxLUA_USE_wxTooltip = "wxLUA_USE_wxTooltip", Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** appframe.i 17 May 2006 22:47:09 -0000 1.17 --- appframe.i 25 May 2006 22:50:04 -0000 1.18 *************** *** 470,475 **** %endclass //----------------------------------------------------------------------------- ! // wxSystemOptions - FIXME add wxLUA_USE_wxSystemOptions %include "wx/sysopt.h" --- 470,479 ---- %endclass + %endif wxLUA_USE_wxSystemSettings + //----------------------------------------------------------------------------- ! // wxSystemOptions ! ! %if wxLUA_USE_wxSystemOptions %include "wx/sysopt.h" *************** *** 486,488 **** %endclass ! %endif wxLUA_USE_wxSystemSettings --- 490,492 ---- %endclass ! %endif wxLUA_USE_wxSystemOptions Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** gdi.i 18 May 2006 05:47:39 -0000 1.24 --- gdi.i 25 May 2006 22:50:04 -0000 1.25 *************** *** 462,465 **** --- 462,476 ---- //----------------------------------------------------------------------------- + // wxColourDatabase + + %class %delete %noclassinfo %encapsulate wxColourDatabase + wxColourDatabase() + + wxColour Find(const wxString& name) const + wxString FindName(const wxColour& colour) const + void AddColour(const wxString& name, const wxColour& colour) + %endclass + + //----------------------------------------------------------------------------- // wxPen Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** override.hpp 25 May 2006 04:44:10 -0000 1.46 --- override.hpp 25 May 2006 22:50:04 -0000 1.47 *************** *** 818,826 **** %override wxLua_wxTreeItemId_GetValue ! // double GetValue() const; static int LUACALL wxLua_wxTreeItemId_GetValue(lua_State *L) { wxLuaState wxlState(L); ! double returns; // get this wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); --- 818,826 ---- %override wxLua_wxTreeItemId_GetValue ! // long GetValue() const; static int LUACALL wxLua_wxTreeItemId_GetValue(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); *************** *** 834,853 **** %end - %override wxLua_wxTreeItemId_SetValue - // void SetValue(double value); - static int LUACALL wxLua_wxTreeItemId_SetValue(lua_State *L) - { - wxLuaState wxlState(L); - // double value - long value = (long)wxlState.GetNumberType(2); - // get this - wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); - // call SetValue - self->m_pItem = (void *) value; - // return the number of parameters - return 0; - } - %end - %override wxLua_wxTreeCtrl_GetFirstChild // wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const --- 834,837 ---- Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** dialogs.i 17 May 2006 05:02:04 -0000 1.18 --- dialogs.i 25 May 2006 22:50:04 -0000 1.19 *************** *** 224,227 **** --- 224,229 ---- // wxMultiChoiceDialog - use wxGetMultipleChoices + %if wxLUA_USE_wxMultiChoiceDialog + %class wxMultiChoiceDialog, wxDialog wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) *************** *** 232,235 **** --- 234,239 ---- %endclass + %endif wxLUA_USE_wxMultiChoiceDialog + //----------------------------------------------------------------------------- // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex *************** *** 253,260 **** //----------------------------------------------------------------------------- ! // wxTextEntryDialog - use wxGetTextFromUser %if wxLUA_USE_wxTextEntryDialog %class wxTextEntryDialog, wxDialog wxTextEntryDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Please enter text", const wxString& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) --- 257,266 ---- //----------------------------------------------------------------------------- ! // wxTextEntryDialog - see also wxGetTextFromUser %if wxLUA_USE_wxTextEntryDialog + %define wxTextEntryDialogStyle + %class wxTextEntryDialog, wxDialog wxTextEntryDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Please enter text", const wxString& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) *************** *** 267,270 **** --- 273,284 ---- %endclass + //----------------------------------------------------------------------------- + // wxPasswordEntryDialog - see also wxGetPasswordFromUser + + %class wxPasswordEntryDialog, wxTextEntryDialog + wxPasswordEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& value = "", long style = wxTextEntryDialogStyle, const wxPoint& pos = wxDefaultPosition) + + %endclass + %endif wxLUA_USE_wxTextEntryDialog *************** *** 428,431 **** --- 442,476 ---- // %endclass + + //----------------------------------------------------------------------------- + // wxSplashScreen + + %if wxLUA_USE_wxSplashScreen + + %include "wx/splash.h" + + %define wxSPLASH_CENTRE_ON_PARENT + %define wxSPLASH_CENTRE_ON_SCREEN + %define wxSPLASH_NO_CENTRE + %define wxSPLASH_TIMEOUT + %define wxSPLASH_NO_TIMEOUT + + %class wxSplashScreen, wxFrame + wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) + + long GetSplashStyle() const + wxSplashScreenWindow* GetSplashWindow() const + int GetTimeout() const + %endclass + + %class wxSplashScreenWindow, wxWindow + // don't need to create this, just get it from wxSplashScreen + + void SetBitmap(const wxBitmap& bitmap) + wxBitmap& GetBitmap() + %endclass + + %endif wxLUA_USE_wxSplashScreen + //----------------------------------------------------------------------------- // wxWizard Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** controls.i 18 May 2006 05:47:39 -0000 1.19 --- controls.i 25 May 2006 22:50:04 -0000 1.20 *************** *** 67,71 **** // wxToggleButton ! %if wxLUA_USE_wxButton %include "wx/tglbtn.h" --- 67,71 ---- // wxToggleButton ! %if wxLUA_USE_wxToggleButton %include "wx/tglbtn.h" *************** *** 82,86 **** %endclass ! %endif wxLUA_USE_wxButton //----------------------------------------------------------------------------- --- 82,86 ---- %endclass ! %endif wxLUA_USE_wxToggleButton //----------------------------------------------------------------------------- *************** *** 121,125 **** // wxControlWithItems ! %if wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox %include "wx/ctrlsub.h" --- 121,125 ---- // wxControlWithItems ! %if wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox %include "wx/ctrlsub.h" *************** *** 158,162 **** %endclass ! %endif wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox //----------------------------------------------------------------------------- --- 158,162 ---- %endclass ! %endif wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox //----------------------------------------------------------------------------- *************** *** 1173,1184 **** %overload %constructor wxTreeItemIdCopy(const wxTreeItemId& id) ! bool IsOk() ! double GetValue() const ! void SetValue(double value) // probably DON'T USE! %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) %operator bool operator==(const wxTreeItemId& otherId) const ! %property=Value, read, write %endclass --- 1173,1183 ---- %overload %constructor wxTreeItemIdCopy(const wxTreeItemId& id) ! bool IsOk() ! long GetValue() const // get a pointer to the internal data to use as a reference %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) %operator bool operator==(const wxTreeItemId& otherId) const ! %property=Value, read %endclass *************** *** 1219,1222 **** --- 1218,1222 ---- wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0) + int GetKeyCode() const wxTreeItemId GetItem() const *************** *** 1236,1237 **** --- 1236,1281 ---- %endif wxLUA_USE_wxTreeCtrl + + //----------------------------------------------------------------------------- + // wxGenericDirCtrl + + %if wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG + + %include "wx/dirctrl.h" + + %enum + wxDIRCTRL_DIR_ONLY + wxDIRCTRL_SELECT_FIRST + wxDIRCTRL_SHOW_FILTERS + wxDIRCTRL_3D_INTERNAL + wxDIRCTRL_EDIT_LABELS + %endenum + + %class wxGenericDirCtrl, wxControl + %constructor wxGenericDirCtrlDefault() + wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = wxID_ANY, const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const wxString& filter = "", int defaultFilter = 0, const wxString& name = "wxGenericDirCtrl") + + bool Create(wxWindow *parent, const wxWindowID id = wxID_ANY, const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const wxString& filter = "", int defaultFilter = 0, const wxString& name = "wxGenericDirCtrl") + void CollapseTree() + bool ExpandPath(const wxString& path) + wxString GetDefaultPath() const + wxString GetPath() const + wxString GetFilePath() const + wxString GetFilter() const + int GetFilterIndex() const + //wxDirFilterListCtrl* GetFilterListCtrl() const + wxTreeItemId GetRootId() + wxTreeCtrl* GetTreeCtrl() const + void ReCreateTree() + void SetDefaultPath(const wxString& path) + void SetFilter(const wxString& filter) + void SetFilterIndex(int n) + void SetPath(const wxString& path) + void ShowHidden( bool show ) + bool GetShowHidden() + + //wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done) + + %endclass + + %endif wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** defsutil.i 17 May 2006 05:02:04 -0000 1.23 --- defsutil.i 25 May 2006 22:50:04 -0000 1.24 *************** *** 25,28 **** --- 25,30 ---- // wxProcess + %if wxLUA_USE_wxProcess + %enum wxEXEC_ASYNC *************** *** 90,93 **** --- 92,97 ---- %endclass + %endif wxLUA_USE_wxProcess + //----------------------------------------------------------------------------- // Process control functions *************** *** 573,576 **** --- 577,582 ---- // wxBusyCursor + %if wxLUA_USE_wxBusyCursor + %include "wx/utils.h" *************** *** 579,580 **** --- 585,602 ---- wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) %endclass + + %endif wxLUA_USE_wxBusyCursor + + //----------------------------------------------------------------------------- + // wxBusyInfo + + %if wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO + + %include "wx/busyinfo.h" + + %class %delete %noclassinfo wxBusyInfo, wxObject + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough + wxBusyInfo(const wxString& message, wxWindow *parent = NULL) + %endclass + + %endif wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** event.i 25 May 2006 03:55:22 -0000 1.15 --- event.i 25 May 2006 22:50:04 -0000 1.16 *************** *** 190,205 **** // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care? ! %if !%mac ! %include "wx/dialup.h" ! %class %noclassinfo wxDialUpEvent, wxCommandEvent ! %define %event wxEVT_DIALUP_CONNECTED ! %define %event wxEVT_DIALUP_DISCONNECTED ! wxDialUpEvent(bool isConnected, bool isOwnEvent) ! bool IsConnectedEvent() const ! bool IsOwnEvent() const ! %endclass ! %endif //----------------------------------------------------------------------------- --- 190,205 ---- // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care? ! //%if !%mac ! //%include "wx/dialup.h" ! //%class %noclassinfo wxDialUpEvent, wxCommandEvent ! // %define %event wxEVT_DIALUP_CONNECTED ! // %define %event wxEVT_DIALUP_DISCONNECTED ! // wxDialUpEvent(bool isConnected, bool isOwnEvent) ! // bool IsConnectedEvent() const ! // bool IsOwnEvent() const ! //%endclass ! //%endif //----------------------------------------------------------------------------- *************** *** 400,429 **** //----------------------------------------------------------------------------- - // wxJoystickEvent - FIXME add rest of wxJoystick? - - %include "wx/event.h" - - %class %delete wxJoystickEvent, wxEvent - %define %event wxEVT_JOY_BUTTON_DOWN - %define %event wxEVT_JOY_BUTTON_UP - %define %event wxEVT_JOY_MOVE - %define %event wxEVT_JOY_ZMOVE - - wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) - - bool ButtonDown(int button = wxJOY_BUTTON_ANY) const - bool ButtonIsDown(int button = wxJOY_BUTTON_ANY) const - bool ButtonUp(int button = wxJOY_BUTTON_ANY) const - int GetButtonChange() const - int GetButtonState() const - int GetJoystick() const - wxPoint GetPosition() const - int GetZPosition() const - bool IsButton() const - bool IsMove() const - bool IsZMove() const - %endclass - - //----------------------------------------------------------------------------- // wxMouseEvent --- 400,403 ---- |
