Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-06-05 21:07:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30959/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Fix a number of bugs with the new bindings fix override wxConfig::Get fix looking up overloaded static and non static class member functions fix looking up class member functions overloaded from a base class Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluasocket_bind.h 31 May 2007 17:18:55 -0000 1.15 --- wxluasocket_bind.h 5 Jun 2007 21:07:25 -0000 1.16 *************** *** 27,33 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 7 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 7 // --------------------------------------------------------------------------- --- 27,33 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 8 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 8 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-06-05 21:07:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30959/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h wxlstate.h Log Message: Fix a number of bugs with the new bindings fix override wxConfig::Get fix looking up overloaded static and non static class member functions fix looking up class member functions overloaded from a base class Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxldefs.h 31 May 2007 17:18:54 -0000 1.17 --- wxldefs.h 5 Jun 2007 21:07:25 -0000 1.18 *************** *** 57,61 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 7 // ---------------------------------------------------------------------------- --- 57,61 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 8 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxlbind.h 31 May 2007 17:18:54 -0000 1.40 --- wxlbind.h 5 Jun 2007 21:07:25 -0000 1.41 *************** *** 52,56 **** WXLUAMETHOD_SETPROP = 0x0010, // Set %property funcName, write ! WXLUAMETHOD_STATIC = 0x0020 // Class member function is static }; --- 52,64 ---- WXLUAMETHOD_SETPROP = 0x0010, // Set %property funcName, write ! WXLUAMETHOD_STATIC = 0x1000, // Class member function is static ! WXLUAMETHOD_OVERLOAD = 0x2000, // This is an overload function that will call others ! // and the min/maxargs for it are not valid, ! // but are the min and max of all functions ! ! WXLUAMETHOD_OVERLOAD_BASE = 0x4000, // Class method has been checked to see if it is ! // overloaded from the base class. ! // Check WXLUAMETHOD::basemethod and if !NULL ! // this method is an overload from the base class }; *************** *** 61,64 **** --- 69,73 ---- { lua_CFunction func; // function that implements the method or property + int type; // wxLuaMethod_Type flags for this function int minargs; // min number of required args int maxargs; // total number of args allowed *************** *** 68,75 **** struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property { ! int type; // type (one of the above enumeration values) ! const char* name; // name of the method or property ! WXLUAMETHOD_CFUNC* funcs; // array of functions for this method int funcs_n; // number of functions (overloaded > 1) for this method }; --- 77,86 ---- struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property { ! int type; // wxLuaMethod_Type flags for this method ! // note each func has own type, this is ored values of them ! const char *name; // name of the method or property ! WXLUAMETHOD_CFUNC *funcs; // array of functions for this method int funcs_n; // number of functions (overloaded > 1) for this method + WXLUAMETHOD *basemethod; // overloaded methods from base class, else NULL }; *************** *** 342,346 **** // in the WXLUAEVENT* struct list of this binding. wxString GetEventTypeName(wxEventType eventType) const; ! // Get all the bindings that were initialized using the generated binding // function wxLuaBinding_[binding name]_init(). --- 353,360 ---- // in the WXLUAEVENT* struct list of this binding. wxString GetEventTypeName(wxEventType eventType) const; ! // Get the first WXLUACLASS that has this WXLUAMETHOD ! const WXLUACLASS* GetLuaClass(const WXLUAMETHOD* wxlMethod) const; ! // Get the first WXLUACLASS that has this WXLAMETHOD_CFUNC ! const WXLUACLASS* GetLuaClass(const WXLUAMETHOD_CFUNC* wxlMethod_cfunc) const; // Get all the bindings that were initialized using the generated binding // function wxLuaBinding_[binding name]_init(). Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** wxlstate.h 31 May 2007 17:18:54 -0000 1.68 --- wxlstate.h 5 Jun 2007 21:07:25 -0000 1.69 *************** *** 485,488 **** --- 485,492 ---- // returns NULL on failure. const WXLUACLASS* GetLuaClass(const char* className) const; + // Get the first WXLUACLASS that has this particular WXLUAMETHOD + const WXLUACLASS* GetLuaClass(const WXLUAMETHOD* method) const; + // Get the first WXLUACLASS that has this particular WXLUAMETHOD_CFUNC in it's methods + const WXLUACLASS* GetLuaClass(const WXLUAMETHOD_CFUNC* method_cfunc) const; // Get base WXLUACLASS for given Tag using WXLUACLASS::class_tag and // WXLUACLASS::baseclass_tag. returns NULL on failure. *************** *** 670,674 **** // else return NULL; // Set isProperty to true if a property is found else it is a method. ! WXLUAMETHOD* GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex); // Lookup a lua property function named cpIndex in the WXLUACLASS pClass // Ensure that the lookup is of the required type. If the lua property --- 674,678 ---- // else return NULL; // Set isProperty to true if a property is found else it is a method. ! WXLUAMETHOD* GetLuaMethod(const WXLUACLASS *wxlClass, const char *methodName); // Lookup a lua property function named cpIndex in the WXLUACLASS pClass // Ensure that the lookup is of the required type. If the lua property *************** *** 677,681 **** // else return NULL; // Find 'Set' properties if isLuaSetProp else return 'WXLUAMETHOD_GETPROP' property ! WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isLuaSetProp); // Is there a derived method given an object and and a method name. --- 681,685 ---- // else return NULL; // Find 'Set' properties if isLuaSetProp else return 'WXLUAMETHOD_GETPROP' property ! WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *wxlClass, const char *propName, bool isLuaSetProp); // Is there a derived method given an object and and a method name. |
|
From: John L. <jr...@us...> - 2007-06-05 21:07:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30959/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: Fix a number of bugs with the new bindings fix override wxConfig::Get fix looking up overloaded static and non static class member functions fix looking up class member functions overloaded from a base class Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** stc.cpp 31 May 2007 21:38:47 -0000 1.32 --- stc.cpp 5 Jun 2007 21:07:24 -0000 1.33 *************** *** 27,33 **** int s_wxluatag_wxStyledTextCtrl = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument[] = { &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; // void AddRefDocument(void* docPointer); --- 27,33 ---- int s_wxluatag_wxStyledTextCtrl = -1; [...9287 lines suppressed...] ! { WXLUAMETHOD_METHOD, "SetFoldLevelNow", s_wxluafunc_wxLua_wxStyledTextEvent_SetFoldLevelNow, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetFoldLevelPrev", s_wxluafunc_wxLua_wxStyledTextEvent_SetFoldLevelPrev, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetKey", s_wxluafunc_wxLua_wxStyledTextEvent_SetKey, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetLParam", s_wxluafunc_wxLua_wxStyledTextEvent_SetLParam, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetLength", s_wxluafunc_wxLua_wxStyledTextEvent_SetLength, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetLine", s_wxluafunc_wxLua_wxStyledTextEvent_SetLine, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetLinesAdded", s_wxluafunc_wxLua_wxStyledTextEvent_SetLinesAdded, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetListType", s_wxluafunc_wxLua_wxStyledTextEvent_SetListType, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetMargin", s_wxluafunc_wxLua_wxStyledTextEvent_SetMargin, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetMessage", s_wxluafunc_wxLua_wxStyledTextEvent_SetMessage, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetModificationType", s_wxluafunc_wxLua_wxStyledTextEvent_SetModificationType, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetModifiers", s_wxluafunc_wxLua_wxStyledTextEvent_SetModifiers, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetPosition", s_wxluafunc_wxLua_wxStyledTextEvent_SetPosition, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetText", s_wxluafunc_wxLua_wxStyledTextEvent_SetText, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetWParam", s_wxluafunc_wxLua_wxStyledTextEvent_SetWParam, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxStyledTextEvent_SetX, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxStyledTextEvent_SetY, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxStyledTextEvent", s_wxluafunc_wxLua_wxStyledTextEvent_constructor, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; |
|
From: John L. <jr...@us...> - 2007-06-05 21:07:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30959/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: Fix a number of bugs with the new bindings fix override wxConfig::Get fix looking up overloaded static and non static class member functions fix looking up class member functions overloaded from a base class Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxbind.h 31 May 2007 17:18:53 -0000 1.21 --- wxbind.h 5 Jun 2007 21:07:24 -0000 1.22 *************** *** 26,32 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 7 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 7 // --------------------------------------------------------------------------- --- 26,32 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 8 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 8 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i datetime.i dialogs.i event.i file.i gdi.i grid.i help.i html.i image.i mdi.i menutool.i print.i regex.i socket.i windows.i xml.i Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: config.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** config.i 31 May 2007 21:38:38 -0000 1.20 --- config.i 1 Jun 2007 18:19:46 -0000 1.21 *************** *** 59,75 **** // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! // bool GetFirstGroup(wxString& str, long& index) const bool GetFirstGroup() const // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! // bool GetFirstEntry(wxString& str, long& index) const bool GetFirstEntry() const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! // bool GetNextGroup(wxString& str, long& index) const bool GetNextGroup() const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! // bool GetNextEntry(wxString& str, long& index) const bool GetNextEntry(long index) const --- 59,75 ---- // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! // C++ Func: bool GetFirstGroup(wxString& str, long& index) const bool GetFirstGroup() const // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! // C++ Func: bool GetFirstEntry(wxString& str, long& index) const bool GetFirstEntry() const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! // C++ Func: bool GetNextGroup(wxString& str, long& index) const bool GetNextGroup() const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! // C++ Func: bool GetNextEntry(wxString& str, long& index) const bool GetNextEntry(long index) const *************** *** 84,88 **** // %override [bool, string] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! // bool Read(const wxString& key, wxString* str, const wxString& defaultVal) const bool Read(const wxString& key, const wxString& defaultVal = "") const --- 84,88 ---- // %override [bool, string] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! // C++ Func: bool Read(const wxString& key, wxString* str, const wxString& defaultVal) const bool Read(const wxString& key, const wxString& defaultVal = "") const *************** *** 90,101 **** // %override [bool, double] wxConfigBase::Read(const wxString& key, double defaultVal = 0) ! // bool Read(const wxString& key, double* d, double defaultVal = 0) const %override_name wxLua_wxConfigBase_ReadFloat bool Read(const wxString& key, double defaultVal) const // // %override [bool, int] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! // // bool Read(const wxString& key, long* l, long defaultVal = 0) const // %rename ReadInt bool Read(const wxString& key, long defaultVal = 0) const // // %override [bool, double] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! // // bool Read(const wxString& key, double* d, double defaultVal = 0) const // %rename ReadFloat bool Read(const wxString& key, double defaultVal = 0) const --- 90,101 ---- // %override [bool, double] wxConfigBase::Read(const wxString& key, double defaultVal = 0) ! // C++ Func: bool Read(const wxString& key, double* d, double defaultVal = 0) const %override_name wxLua_wxConfigBase_ReadFloat bool Read(const wxString& key, double defaultVal) const // // %override [bool, int] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! // // C++ Func: bool Read(const wxString& key, long* l, long defaultVal = 0) const // %rename ReadInt bool Read(const wxString& key, long defaultVal = 0) const // // %override [bool, double] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! // // C++ Func: bool Read(const wxString& key, double* d, double defaultVal = 0) const // %rename ReadFloat bool Read(const wxString& key, double defaultVal = 0) const Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** appframe.i 31 May 2007 21:38:38 -0000 1.33 --- appframe.i 1 Jun 2007 18:19:46 -0000 1.34 *************** *** 290,294 **** // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! // virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) --- 290,294 ---- // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! // C++ Func: virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) *************** *** 340,344 **** // %override void wxStatusBar::SetFieldsCount(either a single number or a lua table with number indexes and values) ! // virtual void SetFieldsCount(int number = 1, int* widths = NULL) virtual void SetFieldsCount(LuaTable intTable) --- 340,344 ---- // %override void wxStatusBar::SetFieldsCount(either a single number or a lua table with number indexes and values) ! // C++ Func: virtual void SetFieldsCount(int number = 1, int* widths = NULL) virtual void SetFieldsCount(LuaTable intTable) *************** *** 347,355 **** // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) ! // virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) ! // virtual void SetStatusStyles(int n, int *styles) virtual void SetStatusStyles(LuaTable intTable) --- 347,355 ---- // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) ! // C++ Func: virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) ! // C++ Func: virtual void SetStatusStyles(int n, int *styles) virtual void SetStatusStyles(LuaTable intTable) *************** *** 390,394 **** // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, // { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 } } ! //wxAcceleratorTable(int n, wxAcceleratorEntry* entries) wxAcceleratorTable(LuaTable accelTable) --- 390,394 ---- // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, // { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 } } ! // C++ Func: wxAcceleratorTable(int n, wxAcceleratorEntry* entries) wxAcceleratorTable(LuaTable accelTable) Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** print.i 31 May 2007 21:38:40 -0000 1.16 --- print.i 1 Jun 2007 18:19:46 -0000 1.17 *************** *** 24,44 **** // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! // void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) void GetPageInfo() // %override [int w, int h] wxPrintout::GetPageSizeMM() ! // void GetPageSizeMM(int *w, int *h) void GetPageSizeMM() // %override [int w, int h] wxPrintout::GetPageSizePixels() ! // void GetPageSizePixels(int *w, int *h) void GetPageSizePixels() // %override [int w, int h] wxPrintout::GetPPIPrinter() ! // void GetPPIPrinter(int *w, int *h) void GetPPIPrinter() // %override [int w, int h] wxPrintout::GetPPIScreen() ! // void GetPPIScreen(int *w, int *h) void GetPPIScreen() --- 24,44 ---- // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! // C++ Func: void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) void GetPageInfo() // %override [int w, int h] wxPrintout::GetPageSizeMM() ! // C++ Func: void GetPageSizeMM(int *w, int *h) void GetPageSizeMM() // %override [int w, int h] wxPrintout::GetPageSizePixels() ! // C++ Func: void GetPageSizePixels(int *w, int *h) void GetPageSizePixels() // %override [int w, int h] wxPrintout::GetPPIPrinter() ! // C++ Func: void GetPPIPrinter(int *w, int *h) void GetPPIPrinter() // %override [int w, int h] wxPrintout::GetPPIScreen() ! // C++ Func: void GetPPIScreen(int *w, int *h) void GetPPIScreen() Index: mdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/mdi.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mdi.i 31 May 2007 21:38:39 -0000 1.13 --- mdi.i 1 Jun 2007 18:19:46 -0000 1.14 *************** *** 106,110 **** // %override [bool, string buf] wxDocManager::MakeDefaultName(wxString& buf) ! // bool MakeDefaultName(wxString& buf) bool MakeDefaultName(wxString& buf) --- 106,110 ---- // %override [bool, string buf] wxDocManager::MakeDefaultName(wxString& buf) ! // C++ Func: bool MakeDefaultName(wxString& buf) bool MakeDefaultName(wxString& buf) *************** *** 210,214 **** // %override [string name] wxDocument::GetPrintableName(wxString& name) const ! // virtual void GetPrintableName(wxString& name) const virtual void GetPrintableName(wxString& name) const --- 210,214 ---- // %override [string name] wxDocument::GetPrintableName(wxString& name) const ! // C++ Func: virtual void GetPrintableName(wxString& name) const virtual void GetPrintableName(wxString& name) const Index: image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** image.i 31 May 2007 21:38:39 -0000 1.25 --- image.i 1 Jun 2007 18:19:46 -0000 1.26 *************** *** 90,94 **** // %override wxImage(int width, int height, unsigned char* data, bool static_data = false) ! // wxImage(int width, int height, unsigned char* data, bool static_data = false) %override_name wxLua_wxImageFromData_constructor wxImage(int width, int height, unsigned char* data, bool static_data = false) --- 90,94 ---- // %override wxImage(int width, int height, unsigned char* data, bool static_data = false) ! // C++ Func: wxImage(int width, int height, unsigned char* data, bool static_data = false) %override_name wxLua_wxImageFromData_constructor wxImage(int width, int height, unsigned char* data, bool static_data = false) *************** *** 110,114 **** // %override [bool, uchar r, uchar g, char b] FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) ! // bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) bool FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) --- 110,114 ---- // %override [bool, uchar r, uchar g, char b] FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) ! // C++ Func: bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) bool FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) *************** *** 131,135 **** // %override [bool, uchar r, uchar g, uchar b] GetOrFindMaskColour() const ! // bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const bool GetOrFindMaskColour() const --- 131,135 ---- // %override [bool, uchar r, uchar g, uchar b] GetOrFindMaskColour() const ! // C++ Func: bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const bool GetOrFindMaskColour() const *************** *** 141,149 **** // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int // %override [r, g, b] HSVtoRGB(double h, double s, double v) ! // static RGBValue HSVtoRGB(const HSVValue& hsv) static int HSVtoRGB(double h, double s, double v) // %override [h, s, v] RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) ! // static HSVValue RGBtoHSV(const RGBValue& rgb) static int RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) --- 141,149 ---- // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int // %override [r, g, b] HSVtoRGB(double h, double s, double v) ! // C++ Func: static RGBValue HSVtoRGB(const HSVValue& hsv) static int HSVtoRGB(double h, double s, double v) // %override [h, s, v] RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) ! // C++ Func: static HSVValue RGBtoHSV(const RGBValue& rgb) static int RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) *************** *** 181,189 **** // %override void wxImage::SetAlpha(lua string) - copy contents of string to image ! // void SetAlpha(unsigned char *alpha = NULL,bool static_data = false) %override_name wxLua_wxImage_SetAlphaData void SetAlpha(const wxString& dataStr) // %override void SetData(lua string) - copy contents of string to image ! // void SetData(unsigned char *data) void SetData(const wxString& data) --- 181,189 ---- // %override void wxImage::SetAlpha(lua string) - copy contents of string to image ! // C++ Func: void SetAlpha(unsigned char *alpha = NULL,bool static_data = false) %override_name wxLua_wxImage_SetAlphaData void SetAlpha(const wxString& dataStr) // %override void SetData(lua string) - copy contents of string to image ! // C++ Func: void SetData(unsigned char *data) void SetData(const wxString& data) Index: help.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** help.i 31 May 2007 21:38:39 -0000 1.14 --- help.i 1 Jun 2007 18:19:46 -0000 1.15 *************** *** 111,115 **** // %override [wxFrame*, wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL] wxHelpController::GetFrameParameters() ! // virtual wxFrame* GetFrameParameters(wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL) virtual wxFrame* GetFrameParameters() --- 111,115 ---- // %override [wxFrame*, wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL] wxHelpController::GetFrameParameters() ! // C++ Func: virtual wxFrame* GetFrameParameters(wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL) virtual wxFrame* GetFrameParameters() Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** windows.i 31 May 2007 21:38:40 -0000 1.35 --- windows.i 1 Jun 2007 18:19:46 -0000 1.36 *************** *** 89,93 **** // %override [int x, int y] ClientToScreen(int x, int y) const ! // virtual void ClientToScreen(int* x, int* y) const %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const --- 89,93 ---- // %override [int x, int y] ClientToScreen(int x, int y) const ! // C++ Func: virtual void ClientToScreen(int* x, int* y) const %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const *************** *** 129,133 **** // %override [int width, int height] wxWindow::GetClientSizeWH() const ! // virtual void GetClientSize(int* width, int* height) const %rename GetClientSizeWH virtual void GetClientSize() const --- 129,133 ---- // %override [int width, int height] wxWindow::GetClientSizeWH() const ! // C++ Func: virtual void GetClientSize(int* width, int* height) const %rename GetClientSizeWH virtual void GetClientSize() const *************** *** 154,158 **** // %override [int x, int y] GetPosition(int x, int y) const ! // virtual void GetPosition(int* x, int* y) const %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const --- 154,158 ---- // %override [int x, int y] GetPosition(int x, int y) const ! // C++ Func: virtual void GetPosition(int* x, int* y) const %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const *************** *** 165,169 **** // %override [int width, int height] wxWindow::GetSizeWH() const ! // virtual void GetSize(int* width, int* height) const %rename GetSizeWH virtual void GetSize() const --- 165,169 ---- // %override [int width, int height] wxWindow::GetSizeWH() const ! // C++ Func: virtual void GetSize(int* width, int* height) const %rename GetSizeWH virtual void GetSize() const *************** *** 172,176 **** // %override [int x, int y, int descent, int externalLeading] int wxWindow::GetTextExtent(const wxString& string, const wxFont* font = NULL ) const // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const ! // virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const --- 172,176 ---- // %override [int x, int y, int descent, int externalLeading] int wxWindow::GetTextExtent(const wxString& string, const wxFont* font = NULL ) const // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const ! // C++ Func: virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const *************** *** 181,185 **** // %override [int width, int height] wxWindow::GetVirtualSizeWH() const ! // void GetVirtualSize(int* width, int* height) const %override_name wxLua_wxWindow_GetVirtualSizeWH %rename GetVirtualSizeWH void GetVirtualSize() const --- 181,185 ---- // %override [int width, int height] wxWindow::GetVirtualSizeWH() const ! // C++ Func: void GetVirtualSize(int* width, int* height) const %override_name wxLua_wxWindow_GetVirtualSizeWH %rename GetVirtualSizeWH void GetVirtualSize() const *************** *** 225,229 **** // %override [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! // virtual void ScreenToClient(int* x, int* y) const %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const --- 225,229 ---- // %override [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! // C++ Func: virtual void ScreenToClient(int* x, int* y) const %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const *************** *** 480,484 **** // %override [int page, int flags] HitTest(const wxPoint& pt) ! // int HitTest(const wxPoint& pt, long *flags = NULL) int HitTest(const wxPoint& pt) --- 480,484 ---- // %override [int page, int flags] HitTest(const wxPoint& pt) ! // C++ Func: int HitTest(const wxPoint& pt, long *flags = NULL) int HitTest(const wxPoint& pt) *************** *** 809,817 **** // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! // void CalcScrolledPosition( int x, int y, int *xx, int *yy) const void CalcScrolledPosition( int x, int y) const // %override [int xx, int yy] void CalcUnscrolledPosition(int x, int y) const ! // void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const void CalcUnscrolledPosition( int x, int y) const --- 809,817 ---- // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! // C++ Func: void CalcScrolledPosition( int x, int y, int *xx, int *yy) const void CalcScrolledPosition( int x, int y) const // %override [int xx, int yy] void CalcUnscrolledPosition(int x, int y) const ! // C++ Func: void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const void CalcUnscrolledPosition( int x, int y) const *************** *** 819,831 **** void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! // void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const void GetScrollPixelsPerUnit() const // %override [int x, int y] GetViewStart() const ! // void GetViewStart(int* x, int* y) const void GetViewStart() const // %override [int x, int y] GetVirtualSize() const ! // void GetVirtualSize(int* x, int* y) const void GetVirtualSize() const --- 819,831 ---- void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! // C++ Func: void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const void GetScrollPixelsPerUnit() const // %override [int x, int y] GetViewStart() const ! // C++ Func: void GetViewStart(int* x, int* y) const void GetViewStart() const // %override [int x, int y] GetVirtualSize() const ! // C++ Func: void GetVirtualSize(int* x, int* y) const void GetVirtualSize() const Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** file.i 31 May 2007 21:38:39 -0000 1.22 --- file.i 1 Jun 2007 18:19:46 -0000 1.23 *************** *** 179,183 **** // %override [lua string table] wxFileName::GetDirs() ! // const wxArrayString& GetDirs() const const wxArrayString& GetDirs() const --- 179,183 ---- // %override [lua string table] wxFileName::GetDirs() ! // C++ Func: const wxArrayString& GetDirs() const const wxArrayString& GetDirs() const *************** *** 203,207 **** // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! // bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const bool GetTimes() const --- 203,207 ---- // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! // C++ Func: bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const bool GetTimes() const *************** *** 250,262 **** // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) --- 250,262 ---- // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // C++ Func: static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // C++ Func: static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // C++ Func: static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) *************** *** 335,339 **** // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! // size_t Read(void* buffer, unsigned int count) size_t Read(unsigned int count) --- 335,339 ---- // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! // C++ Func: size_t Read(void* buffer, unsigned int count) size_t Read(unsigned int count) *************** *** 343,347 **** // %override size_t wxFile::Write(lua string, unsigned int count) ! // size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) --- 343,347 ---- // %override size_t wxFile::Write(lua string, unsigned int count) ! // C++ Func: size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) *************** *** 404,412 **** // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) static unsigned int GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const bool GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) const --- 404,412 ---- // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // C++ Func: static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) static unsigned int GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // C++ Func: bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const bool GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) const *************** *** 414,418 **** // %override [bool, string filename] wxDir::GetNext() ! // bool GetNext(wxString * filename) const bool GetNext() const --- 414,418 ---- // %override [bool, string filename] wxDir::GetNext() ! // C++ Func: bool GetNext(wxString * filename) const bool GetNext() const *************** *** 480,484 **** // %override [lua string] wxInputStream::Read(size_t size) ! // wxInputStream& Read(void *buffer, size_t size) wxString Read(size_t size) --- 480,484 ---- // %override [lua string] wxInputStream::Read(size_t size) ! // C++ Func: wxInputStream& Read(void *buffer, size_t size) wxString Read(size_t size) *************** *** 488,492 **** // %override size_t wxInputStream::Ungetch(lua string, size_t size) ! // size_t Ungetch(const char* buffer, size_t size) %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size) --- 488,492 ---- // %override size_t wxInputStream::Ungetch(lua string, size_t size) ! // C++ Func: size_t Ungetch(const char* buffer, size_t size) %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size) *************** *** 507,511 **** // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! // wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) --- 507,511 ---- // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! // C++ Func: wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** gdi.i 31 May 2007 21:38:39 -0000 1.47 --- gdi.i 1 Jun 2007 18:19:46 -0000 1.48 *************** *** 172,176 **** // %override [int x, int y, int width, int height] wxRegion::GetBoxXYWH() ! // void GetBox(int &x, int &y, int &width, int &height) %rename GetBoxXYWH void GetBox() --- 172,176 ---- // %override [int x, int y, int width, int height] wxRegion::GetBoxXYWH() ! // C++ Func: void GetBox(int &x, int &y, int &width, int &height) %rename GetBoxXYWH void GetBox() *************** *** 209,212 **** --- 209,213 ---- // %override wxRegionIterator::Next() is ++ operator + // This is a wxLua added function. void Next() // operator++ *************** *** 548,552 **** // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! // bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) --- 549,553 ---- // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! // C++ Func: bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) *************** *** 947,955 **** // %override wxBitmap(LuaTable stringTable where each index is a row in the image) ! // wxBitmap(const char **data) Load from XPM %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable) // %override wxBitmap(lua string of data, int type, int width, int height, int depth = -1) ! // wxBitmap(const void* data, int type, int width, int height, int depth = -1) %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(const wxString& data, int type, int width, int height, int depth = -1) --- 948,956 ---- // %override wxBitmap(LuaTable stringTable where each index is a row in the image) ! // C++ Func: wxBitmap(const char **data) Load from XPM %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable) // %override wxBitmap(lua string of data, int type, int width, int height, int depth = -1) ! // C++ Func: wxBitmap(const void* data, int type, int width, int height, int depth = -1) %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(const wxString& data, int type, int width, int height, int depth = -1) *************** *** 1111,1115 **** // %override [int width, int height] wxImageList::GetSize(int index) ! // void GetSize(int index, int& width, int& height) void GetSize(int index) --- 1112,1116 ---- // %override [int width, int height] wxImageList::GetSize(int index) ! // C++ Func: void GetSize(int index, int& width, int& height) void GetSize(int index) *************** *** 1283,1287 **** // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) ! // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) void GetTextExtent(const wxString& string, wxFont *font = NULL) --- 1284,1288 ---- // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) ! // C++ Func: void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) void GetTextExtent(const wxString& string, wxFont *font = NULL) *************** *** 1289,1293 **** // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) ! // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxFont *font = NULL) const --- 1290,1294 ---- // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) ! // C++ Func: void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxFont *font = NULL) const *************** *** 1458,1462 **** // %override [int x, int y] wxCaret::GetPositionXY() ! // void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() --- 1459,1463 ---- // %override [int x, int y] wxCaret::GetPositionXY() ! // C++ Func: void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() *************** *** 1464,1468 **** // %override [int x, int y] wxCaret::GetSizeWH() ! // void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() --- 1465,1469 ---- // %override [int x, int y] wxCaret::GetSizeWH() ! // C++ Func: void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() *************** *** 1523,1527 **** // %override wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) // Note: attribList[] parameter is a lua table with integer indexes ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) --- 1524,1528 ---- // %override wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) // Note: attribList[] parameter is a lua table with integer indexes ! // C++ Func: wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** regex.i 31 May 2007 21:38:40 -0000 1.8 --- regex.i 1 Jun 2007 18:19:46 -0000 1.9 *************** *** 38,42 **** // %override [bool, size_t start, size_t len] wxRegEx::GetMatch(size_t index = 0) const ! // bool GetMatch(size_t* start, size_t* len, size_t index = 0) const %override_name wxLua_wxRegEx_GetMatchIndexes bool GetMatch(size_t index = 0) const --- 38,42 ---- // %override [bool, size_t start, size_t len] wxRegEx::GetMatch(size_t index = 0) const ! // C++ Func: bool GetMatch(size_t* start, size_t* len, size_t index = 0) const %override_name wxLua_wxRegEx_GetMatchIndexes bool GetMatch(size_t index = 0) const *************** *** 46,58 **** // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // int Replace(wxString* text, const wxString& replacement, size_t maxMatches = 0) const int Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const // %override [int, string text] ReplaceAll(const wxString& text, const wxString& replacement) const ! // int ReplaceAll(wxString* text, const wxString& replacement) const int ReplaceAll(const wxString& text, const wxString& replacement) const // %override [int, string text] ReplaceFirst(const wxString& text, const wxString& replacement) const ! // int ReplaceFirst(wxString* text, const wxString& replacement) const int ReplaceFirst(const wxString& text, const wxString& replacement) const --- 46,58 ---- // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // C++ Func: int Replace(wxString* text, const wxString& replacement, size_t maxMatches = 0) const int Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const // %override [int, string text] ReplaceAll(const wxString& text, const wxString& replacement) const ! // C++ Func: int ReplaceAll(wxString* text, const wxString& replacement) const int ReplaceAll(const wxString& text, const wxString& replacement) const // %override [int, string text] ReplaceFirst(const wxString& text, const wxString& replacement) const ! // C++ Func: int ReplaceFirst(wxString* text, const wxString& replacement) const int ReplaceFirst(const wxString& text, const wxString& replacement) const Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** menutool.i 31 May 2007 21:38:39 -0000 1.16 --- menutool.i 1 Jun 2007 18:19:46 -0000 1.17 *************** *** 30,33 **** --- 30,34 ---- // %override wxMenu* wxMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators + // wxLua provides this function %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) *************** *** 48,52 **** // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItem(int id) ! // wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const %override_name wxLua_wxMenu_FindItemById wxMenuItem* FindItem(int id) const --- 49,53 ---- // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItem(int id) ! // C++ Func: wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const %override_name wxLua_wxMenu_FindItemById wxMenuItem* FindItem(int id) const Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** clipdrag.i 31 May 2007 21:38:38 -0000 1.25 --- clipdrag.i 1 Jun 2007 18:19:46 -0000 1.26 *************** *** 116,124 **** // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! // virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const virtual void GetAllFormats(wxDataObject::Direction dir = wxDataObject::Get) const // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! // virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual bool GetDataHere(const wxDataFormat& format) const --- 116,124 ---- // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! // C++ Func: virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const virtual void GetAllFormats(wxDataObject::Direction dir = wxDataObject::Get) const // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! // C++ Func: virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual bool GetDataHere(const wxDataFormat& format) const *************** *** 128,132 **** // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! // virtual bool SetData(const wxDataFormat& format, int len, const void *buf) virtual bool SetData(const wxDataFormat& format, const wxString& str) --- 128,132 ---- // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! // C++ Func: virtual bool SetData(const wxDataFormat& format, int len, const void *buf) virtual bool SetData(const wxDataFormat& format, const wxString& str) *************** *** 144,152 **** // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! // virtual bool GetDataHere(void *buf) const virtual bool GetDataHere() const // %override bool wxDataObjectSimple::SetData(lua string) ! // virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) --- 144,152 ---- // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! // C++ Func: virtual bool GetDataHere(void *buf) const virtual bool GetDataHere() const // %override bool wxDataObjectSimple::SetData(lua string) ! // C++ Func: virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) *************** *** 308,312 **** // %override [lua table of strings] wxDropFilesEvent::GetFiles() ! // wxString* GetFiles() const wxString* GetFiles() const --- 308,312 ---- // %override [lua table of strings] wxDropFilesEvent::GetFiles() ! // C++ Func: wxString* GetFiles() const wxString* GetFiles() const Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** datetime.i 31 May 2007 21:38:39 -0000 1.26 --- datetime.i 1 Jun 2007 18:19:46 -0000 1.27 *************** *** 428,432 **** // %override [wxCalendarHitTestResult, wxDateTime date, wxDateTime::WeekDay wd] wxCalendarCtrl::HitTest(const wxPoint& pos) ! // wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime* date = NULL, wxDateTime::WeekDay* wd = NULL) wxCalendarHitTestResult HitTest(const wxPoint& pos) --- 428,432 ---- // %override [wxCalendarHitTestResult, wxDateTime date, wxDateTime::WeekDay wd] wxCalendarCtrl::HitTest(const wxPoint& pos) ! // C++ Func: wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime* date = NULL, wxDateTime::WeekDay* wd = NULL) wxCalendarHitTestResult HitTest(const wxPoint& pos) *************** *** 515,519 **** // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const ! // bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const --- 515,519 ---- // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const ! // C++ Func: bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const Index: socket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/socket.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** socket.i 31 May 2007 21:38:40 -0000 1.12 --- socket.i 1 Jun 2007 18:19:46 -0000 1.13 *************** *** 86,102 **** // %override [lua string] wxSocketBase::Peek(unsigned long nbytes) ! // void Peek(void * buffer, unsigned long nbytes) void Peek(unsigned long nbytes) // %override [lua string] wxSocketBase::Read(unsigned long nbytes) ! // void Read(unsigned long nbytes) void Read(void * buffer, unsigned long nbytes) // %override [lua string] wxSocketBase::ReadMsg(unsigned long nbytes) ! // void ReadMsg(void * buffer, unsigned long nbytes) void ReadMsg(unsigned long nbytes) // %override void wxSocketBase::Unread(lua string, [optional unsigned long nbytes]) ! // void Unread(const void * buffer, unsigned long nbytes) void Unread(const char* buffer, unsigned long nbytes) --- 86,102 ---- // %override [lua string] wxSocketBase::Peek(unsigned long nbytes) ! // C++ Func: void Peek(void * buffer, unsigned long nbytes) void Peek(unsigned long nbytes) // %override [lua string] wxSocketBase::Read(unsigned long nbytes) ! // C++ Func: void Read(unsigned long nbytes) void Read(void * buffer, unsigned long nbytes) // %override [lua string] wxSocketBase::ReadMsg(unsigned long nbytes) ! // C++ Func: void ReadMsg(void * buffer, unsigned long nbytes) void ReadMsg(unsigned long nbytes) // %override void wxSocketBase::Unread(lua string, [optional unsigned long nbytes]) ! // C++ Func: void Unread(const void * buffer, unsigned long nbytes) void Unread(const char* buffer, unsigned long nbytes) *************** *** 107,115 **** // %override void wxSocketBase::Write(lua string, [optional unsigned long nbytes]) ! // void Write(const void * buffer, unsigned long nbytes) void Write(const char* buffer, unsigned long nbytes) // %override void wxSocketBase::WriteMsg(lua string, [optional unsigned long nbytes]) ! // void WriteMsg(const void * buffer, wxUint32 nbytes) void WriteMsg(const char* buffer, wxUint32 nbytes) --- 107,115 ---- // %override void wxSocketBase::Write(lua string, [optional unsigned long nbytes]) ! // C++ Func: void Write(const void * buffer, unsigned long nbytes) void Write(const char* buffer, unsigned long nbytes) // %override void wxSocketBase::WriteMsg(lua string, [optional unsigned long nbytes]) ! // C++ Func: void WriteMsg(const void * buffer, wxUint32 nbytes) void WriteMsg(const char* buffer, wxUint32 nbytes) Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** html.i 31 May 2007 21:38:39 -0000 1.18 --- html.i 1 Jun 2007 18:19:46 -0000 1.19 *************** *** 25,33 **** // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) ! // bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) %not_overload !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) ! // bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) --- 25,33 ---- // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) ! // C++ Func: bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) %not_overload !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) ! // C++ Func: bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) *************** *** 36,40 **** // %override wxHtmlCell* Find(int condition, [none, string, or int]) ! // virtual const wxHtmlCell* Find(int condition, void *param = 0) virtual const wxHtmlCell* Find(int condition, void *param = 0) --- 36,40 ---- // %override wxHtmlCell* Find(int condition, [none, string, or int]) ! // C++ Func: virtual const wxHtmlCell* Find(int condition, void *param = 0) virtual const wxHtmlCell* Find(int condition, void *param = 0) *************** *** 95,103 **** // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! // bool GetParamAsColour(const wxString& par, wxColour *clr) const bool GetParamAsColour(const wxString& par) const // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! // bool GetParamAsInt(const wxString& par, int *value) const bool GetParamAsInt(const wxString& par) const --- 95,103 ---- // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! // C++ Func: bool GetParamAsColour(const wxString& par, wxColour *clr) const bool GetParamAsColour(const wxString& par) const // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! // C++ Func: bool GetParamAsInt(const wxString& par, int *value) const bool GetParamAsInt(const wxString& par) const *************** *** 185,189 **** // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) --- 185,189 ---- // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) *************** *** 264,268 **** // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) --- 264,268 ---- // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** controls.i 31 May 2007 21:38:38 -0000 1.35 --- controls.i 1 Jun 2007 18:19:46 -0000 1.36 *************** *** 136,140 **** //void* GetClientData(unsigned int n) const wxClientData* GetClientObject(unsigned int n) const ! %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const int GetCount() const int GetSelection() const --- 136,140 ---- //void* GetClientData(unsigned int n) const wxClientData* GetClientObject(unsigned int n) const ! %rename GetStringClientObject wxStringClientData* GetClientObject(unsigned int n) const int GetCount() const int GetSelection() const *************** *** 271,275 **** // %override [lua table of int selections] wxListBox::GetSelections() ! // int GetSelections(wxArrayInt& selections) const int GetSelections() const --- 271,275 ---- // %override [lua table of int selections] wxListBox::GetSelections() ! // C++ Func: int GetSelections(wxArrayInt& selections) const int GetSelections() const *************** *** 415,419 **** // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! // long HitTest(const wxPoint& point, int& flags) long HitTest(const wxPoint& point) --- 415,419 ---- // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! // C++ Func: long HitTest(const wxPoint& point, int& flags) long HitTest(const wxPoint& point) *************** *** 848,852 **** // %override [long from, long to] wxTextCtrl::GetSelection() ! // virtual void GetSelection(long* from, long* to) const virtual void GetSelection() const --- 848,852 ---- // %override [long from, long to] wxTextCtrl::GetSelection() ! // C++ Func: virtual void GetSelection(long* from, long* to) const virtual void GetSelection() const *************** *** 856,864 **** // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! // wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const // %override [wxTextCtrlHitTestResult, int pos] wxTextCtrl::HitTestPos(const wxPoint& pt) ! // wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const %rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const --- 856,864 ---- // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! // C++ Func: wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const // %override [wxTextCtrlHitTestResult, int pos] wxTextCtrl::HitTestPos(const wxPoint& pt) ! // C++ Func: wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const %rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const *************** *** 873,877 **** // %override [bool, int x, int y] wxTextCtrl::PositionToXY(pos) ! // bool PositionToXY(long pos, long *x, long *y) const bool PositionToXY(long pos) const --- 873,877 ---- // %override [bool, int x, int y] wxTextCtrl::PositionToXY(pos) ! // C++ Func: bool PositionToXY(long pos, long *x, long *y) const bool PositionToXY(long pos) const *************** *** 1024,1028 **** // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetFirstChild(const wxTreeItemId& item) ! // wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetFirstChild(const wxTreeItemId& item) const --- 1024,1028 ---- // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetFirstChild(const wxTreeItemId& item) ! // C++ Func: wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetFirstChild(const wxTreeItemId& item) const *************** *** 1039,1043 **** // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long cookie) ! // wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetNextChild(const wxTreeItemId& item, long cookie) const --- 1039,1043 ---- // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long cookie) ! // C++ Func: wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetNextChild(const wxTreeItemId& item, long cookie) const *************** *** 1052,1056 **** // %override [size_t, lua table of wxTreeItemIds] wxTreeCtrl::GetSelections() ! // size_t GetSelections(wxArrayTreeItemIds& selection) const size_t GetSelections() const --- 1052,1056 ---- // %override [size_t, lua table of wxTreeItemIds] wxTreeCtrl::GetSelections() ! // C++ Func: size_t GetSelections(wxArrayTreeItemIds& selection) const size_t GetSelections() const *************** *** 1058,1062 **** // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) ! // wxTreeItemId HitTest(const wxPoint& point, int& flags) wxTreeItemId HitTest(const wxPoint& point) --- 1058,1062 ---- // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) ! // C++ Func: wxTreeItemId HitTest(const wxPoint& point, int& flags) wxTreeItemId HitTest(const wxPoint& point) Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** xml.i 31 May 2007 21:38:40 -0000 1.10 --- xml.i 1 Jun 2007 18:19:46 -0000 1.11 *************** *** 51,55 **** // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) const ! // bool GetPropVal(const wxString& propName, wxString *value) const %override_name wxLua_wxXmlNode_GetPropValPtr bool GetPropVal(const wxString& propName) const --- 51,55 ---- // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) co... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/modules/wxbind/src Modified Files: controls.cpp Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** controls.cpp 31 May 2007 21:38:41 -0000 1.53 --- controls.cpp 1 Jun 2007 18:19:47 -0000 1.54 *************** *** 1330,1340 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxControlWithItems_GetStringClientObject[1] = {{ wxLua_wxControlWithItems_GetStringClientObject, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_GetStringClientObject }}; ! // %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L) { wxLuaState wxlState(L); wxStringClientData *returns; ! // int n ! int n = (int)wxlua_getnumbertype(L, 2); // get this wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems); --- 1330,1340 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxControlWithItems_GetStringClientObject[1] = {{ wxLua_wxControlWithItems_GetStringClientObject, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_GetStringClientObject }}; ! // %rename GetStringClientObject wxStringClientData* GetClientObject(unsigned int n) const static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L) { wxLuaState wxlState(L); wxStringClientData *returns; ! // unsigned int n ! unsigned int n = (int)wxlua_getnumbertype(L, 2); // get this wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems); |
|
From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/docs Modified Files: dirs.txt wxluaref.html Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxluaref.html 31 May 2007 21:38:40 -0000 1.19 --- wxluaref.html 1 Jun 2007 18:19:46 -0000 1.20 *************** *** 970,974 **** <br> <font color=#CC3300> // <i>%override</i> void wxFrame::SetStatusWidths(lua table with number indexes and values)</font><br> ! // virtual void SetStatusWidths(int n, int *widths)<br> virtual void SetStatusWidths(LuaTable intTable)<br> <br> --- 970,974 ---- <br> <font color=#CC3300> // <i>%override</i> void wxFrame::SetStatusWidths(lua table with number indexes and values)</font><br> ! // C++ Func: virtual void SetStatusWidths(int n, int *widths)<br> virtual void SetStatusWidths(LuaTable intTable)<br> [...1370 lines suppressed...] <br> --- 16610,16614 ---- <br> <font color=#CC3300> // <i>%override</i> [lua string styleBytes] SetStyleBytes(int length, lua string styleBytes)</font><br> ! // C++ Func: void SetStyleBytes(int length, char* styleBytes);<br> void SetStyleBytes(int length, char* styleBytes);<br> <br> *************** *** 17751,17755 **** //#else<br> <font color=#CC3300> // <i>%override</i> [int startPos, int endPos] GetSelection()</font><br> ! // void GetSelection(int* startPos, int* endPos);<br> void GetSelection();<br> //#endif<br> --- 17755,17759 ---- //#else<br> <font color=#CC3300> // <i>%override</i> [int startPos, int endPos] GetSelection()</font><br> ! // C++ Func: void GetSelection(int* startPos, int* endPos);<br> void GetSelection();<br> //#endif<br> Index: dirs.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/dirs.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dirs.txt 11 Dec 2006 00:09:15 -0000 1.4 --- dirs.txt 1 Jun 2007 18:19:46 -0000 1.5 *************** *** 1,3 **** ! 11/20/2005 This is a description of the directory structure of wxLua. --- 1,3 ---- ! 5/31/2007 This is a description of the directory structure of wxLua. *************** *** 7,70 **** ------------------------------------------------------------------------------- - wxLua/ - /art/ - images and icons are here, preferably in XPM format - /apps/ - c/c++ application code is here - /build/ - build for all applications - /wxlua/ - wxLua the main IDE for wxLua (the "Standalone" program) - /embedded/ - TODO - an embedded sample - /runtime/ - TODO - a stripped down runtime for wxLua - /bin/ - output binaries are built here, lua for example ! /bindings/ - input *.i files to make the "wrappers" ! genwxluabind.lua - the main wrapper file, converts *.i to *.cpp ! /wxwidgets/ - wrapper files for wxWidgets ! /bit/ - TODO - the bitwise lib for lua ! /build/ - cmake, bakefile stuff here, may call sub build dirs ! /docs/ - any generic docs go here ! /lib/ - output libs are built here, wxlualib for example ! /modules/ - c/c++ code for wxlua ! /build/ - build files for all of this ! /lua/ - lua itself ! /include/ ! /src/ ! /the rest of lua.../ ! /wxlua/ - the wxlua library itself ! /include/ - internal.h, interp.h, library.h, callback.h ! /src/ - internal.cpp, interp.cpp, library.cpp ! /wxluasocket/ - lua to cpp sockets (the original lua sockets) ! /include/ - debugio.h, dserver.h, socket.h ! /src/ - debugio.cpp, dserver.cpp, socket.cpp ! /wxluadebug/ - mechanism for getting/showing info from lua ! /include/ - debug.h, stacktree, splittree ! /src/ - debug.cpp, stacktree, splittree ! /wxxmlrpc/ - TODO - ? ! /include/ - ! /src/ - ! /wxdebuggernub/ - TODO - this is a generic lib for xmlrpc? don"t prepend wxlua to it ! /include/ - ! /src/ - ! /wxluadebugger/ - TODO - ? this depends on wxlua so prepend wxlua to it ! /include/ - ! /src/ - ! /samples/ - sample wxlua programs ! /name/ - TODO - any multifile sample gets its own dir ! /utils/ - generic utils ! /bin2c/ - a program to convert a text file to an unsigned char array ! ------------------------------------------------------------------------------ ! DEAD UNUSED DIRECTORIES (to be removed by Sourceforge) ! ------------------------------------------------------------------------------ ! wxLua/ ! /import/ - see /bindings/... ! /include/ - see /modules/[module name]/include ! /src/ - see /modules/[module name]/src ! /lua/ - see /modules/lua/* ! /wrappers/ - see /modules/wxbind ! /wxlua/ - see /modules/wxlua ------------------------------------------------------------------------------ --- 7,77 ---- ------------------------------------------------------------------------------- ! /apps/ - C/C++ application code is here ! /build/ - Build files for all libraries and applications ! /wxlua/ - wxLua the main IDE for wxLua (the "Standalone" program) ! /wxluaedit/ - wxLuaEdit IDE ! /wxluafreeze/ - A program to execute wxLua code ! /wxluacan/ - A sample of how to write your own bindings ! /art/ - Images and icons are here, preferably in XPM format ! /bin/ - Output executables are built here ! /bindings/ - Input *.i files to make the "wrappers" ! genwxluabind.lua - Binding generator, converts *.i to *.cpp ! /wxwidgets/ - Wrapper files for wxWidgets ! /wxstc/ - Wrapper files for the wxStyledTextCtrl ! /wxluasocket/ - Wrapper files for bindings for wxluasocket ! /build/ - Build files to compile wxLua ! /autoconf/ - Files for generating the configure script ! /bakefiles/ - Bakefile files to generate the build files ! /kdevelop/ - KDevelop project files ! /msvc6/ - MS Visual Studio 6 build files ! /msw/ - Makefiles for Bcc, Gcc, Vc, Watcom ! /distrib/ - Files to make a wxLua distribution with ! /autopackage/ ! /innosetup/ ! /macbundle/ ! /docs/ - Docs for wxLua ! /doxygen/ - Output dir for doxygen using doxygen.cfg file. ! ! /lib/ - Output libs are built here ! ! /modules/ - C/C++ code for wxlua libraries ! /build/ - build files for modules ! /lua/ - lua itself ! /include/ - headers from src copied here for install routine ! /src/ ! /the rest of lua.../ ! /luamodule/ - A lua module, shared library, to load using require. ! /include/ ! /src/ ! /wxbind/ - Output from /bindings/wxwidgets ! /include/ ! /src/ ! /wxbindstc/ - Output from /bindings/wxstc ! /include/ ! /src/ ! /wxlua/ - the main wxlua library itself ! /include/ - ! /src/ - ! /wxluadebug/ - Debug code, to show stack, and variables ! /include/ - ! /src/ - ! /wxluasocket/ - Remote debugging over TCP code ! /include/ - ! /src/ - ! ! /samples/ - Sample wxlua programs ! ! /util/ - Utilility programs ! /bin2c/ - A lua program to convert files to an unsigned char array ! /wrapmodule/ - A lua script to "wrap" the sample to allow them to run ! using the /modules/luamodule by properly initializing ! wxWidgets after running the lua code. ------------------------------------------------------------------------------ *************** *** 73,77 **** wxLua/ ! Embedded/ - moved to apps/xxx FIXME Examples/ - moved to samples Import/ - moved to bindings/wxwidgets --- 80,84 ---- wxLua/ ! Embedded/ - moved to apps/wxluaedit Examples/ - moved to samples Import/ - moved to bindings/wxwidgets *************** *** 87,103 **** wxLua/modules/wxlua ! internal.h wxLuaInternals.h wxlcallb.h wxLuaCallback.h ! wxlintrp.h wxLuaInterpreter.h wxlua.h wxLua.h wxLua/modules/wxluadebug ! debug.h wxLuaDebug.h ! splttree.h wxLuaSplitTree.h ! staktree.h wxLuaStackTree.h wxLua/modules/wxluasocket ! dservice.h wxLuaDebuggerService.h ! wxldbgio.h wxLuaDebugIO.h wxldserv.h wxLuaDebugServer.h removed wxLuaLibrary.h - debugger is a wxEvtHandler now --- 94,110 ---- wxLua/modules/wxlua ! wxlstate.h wxLuaInternals.h wxlcallb.h wxLuaCallback.h ! wxlstate.h wxLuaInterpreter.h wxlua.h wxLua.h wxLua/modules/wxluadebug ! wxldebug.h wxLuaDebug.h ! removed wxLuaSplitTree.h ! wxlstack.h wxLuaStackTree.h wxLua/modules/wxluasocket ! removed wxLuaDebuggerService.h ! wxlsock.h wxLuaDebugIO.h wxldserv.h wxLuaDebugServer.h removed wxLuaLibrary.h - debugger is a wxEvtHandler now *************** *** 113,128 **** wxLua/modules/wxlua ! internal.cpp wxLuaInternals.cpp ! wxlintrp.cpp wxLuaInterpreter.cpp wxlcallb.cpp taken out of wxLuaInternals.cpp wxLua/modules/wxluadebug ! debug.cpp wxLuaDebug.cpp ! splttree.cpp wxLuaSplitTree.cpp ! staktree.cpp wxLuaStackTree.cpp wxLua/modules/wxluasocket ! dservice.cpp wxLuaDebuggerService.cpp ! wxldbgio.cpp wxLuaDebugIO.cpp wxldserv.cpp wxLuaDebugServer.cpp removed wxLuaLibrary.cpp --- 120,135 ---- wxLua/modules/wxlua ! wxlstate.cpp wxLuaInternals.cpp ! wxlstate.cpp wxLuaInterpreter.cpp wxlcallb.cpp taken out of wxLuaInternals.cpp wxLua/modules/wxluadebug ! wxldebug.cpp wxLuaDebug.cpp ! removed wxLuaSplitTree.cpp ! wxlstack.cpp wxLuaStackTree.cpp wxLua/modules/wxluasocket ! removed wxLuaDebuggerService.cpp ! wxlsock.cpp wxLuaDebugIO.cpp wxldserv.cpp wxLuaDebugServer.cpp removed wxLuaLibrary.cpp |
|
From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/bindings Modified Files: Makefile Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 31 May 2007 17:18:45 -0000 1.1 --- Makefile 1 Jun 2007 18:19:46 -0000 1.2 *************** *** 6,15 **** WXLUA_DIR = ../ ! LUA = $(WXLUA_DIR)/bin/lua all: wxwidgets wxstc wxluasocket wxluacan wxwidgets: ! @echo Building wxWidgets @($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) # @(cd $(WXLUA_DIR)/bindings/wxwidgets && make -B) --- 6,23 ---- WXLUA_DIR = ../ ! ! ! # If we're using cygwin, lua maybe somewhere else, try some common places ! # note some other variables cygwin sets don't seem to be exported ! ifeq (Cygwin, $(findstring Cygwin, $(XTERM_VERSION))) ! LUA=$(WXLUA_DIR)/bin/vc_lib/lua.exe ! else ! LUA=$(WXLUA_DIR)/bin/lua ! endif all: wxwidgets wxstc wxluasocket wxluacan wxwidgets: ! @echo Building wxWidgets $(LUA) @($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) # @(cd $(WXLUA_DIR)/bindings/wxwidgets && make -B) *************** *** 25,29 **** wxluacan: @echo "Building wxLuaCan (ps. did you forget to run make -B)" ! @(cd $(WXLUA_DIR)/apps/wxluacan/src && make genwxbind) --- 33,40 ---- wxluacan: @echo "Building wxLuaCan (ps. did you forget to run make -B)" ! @(cd $(WXLUA_DIR)/apps/wxluacan/src && make -e LUA=../../$(LUA) genwxbind) ! ! genidocs: ! @($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua) |
|
From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/bindings/wxstc Modified Files: stc.i Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** stc.i 31 May 2007 21:38:38 -0000 1.10 --- stc.i 1 Jun 2007 18:19:46 -0000 1.11 *************** *** 1,5 **** ///////////////////////////////////////////////////////////////////////////// // Purpose: wxStyledTextCtrl from contribs ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. --- 1,5 ---- ///////////////////////////////////////////////////////////////////////////// // Purpose: wxStyledTextCtrl from contribs ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. *************** *** 1800,1804 **** //#else // %override [int linePos] GetCurLine() ! // wxString GetCurLine(int* linePos=NULL); wxString GetCurLine(); //#endif --- 1800,1804 ---- //#else // %override [int linePos] GetCurLine() ! // C++ Func: wxString GetCurLine(int* linePos=NULL); wxString GetCurLine(); //#endif *************** *** 1955,1959 **** // %override [lua string styleBytes] SetStyleBytes(int length, lua string styleBytes) ! // void SetStyleBytes(int length, char* styleBytes); void SetStyleBytes(int length, char* styleBytes); --- 1955,1959 ---- // %override [lua string styleBytes] SetStyleBytes(int length, lua string styleBytes) ! // C++ Func: void SetStyleBytes(int length, char* styleBytes); void SetStyleBytes(int length, char* styleBytes); *************** *** 3100,3104 **** //#else // %override [int startPos, int endPos] GetSelection() ! // void GetSelection(int* startPos, int* endPos); void GetSelection(); //#endif --- 3100,3104 ---- //#else // %override [int startPos, int endPos] GetSelection() ! // C++ Func: void GetSelection(int* startPos, int* endPos); void GetSelection(); //#endif |
|
From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/apps/wxluacan/src Modified Files: Makefile Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 23 May 2007 20:17:24 -0000 1.11 --- Makefile 1 Jun 2007 18:19:45 -0000 1.12 *************** *** 78,82 **** genwxbind: ! $(WXLUA_DIR)/bin/lua -e"rulesFilename=\"wxluacan_rules.lua\"" $(WXLUA_DIR)/bindings/genwxbind.lua > error.txt wxLuaBindings: --- 78,82 ---- genwxbind: ! $(LUA) -e"rulesFilename=\"wxluacan_rules.lua\"" $(WXLUA_DIR)/bindings/genwxbind.lua > error.txt wxLuaBindings: |
|
From: John L. <jr...@us...> - 2007-05-31 21:39:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/modules/wxbind/src Modified Files: config.cpp controls.cpp datetime.cpp dialogs.cpp file.cpp gdi.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp socket.cpp windows.cpp xml.cpp Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** config.cpp 31 May 2007 17:18:49 -0000 1.34 --- config.cpp 31 May 2007 21:38:40 -0000 1.35 *************** *** 51,54 **** --- 51,74 ---- } + static int LUACALL wxLua_wxConfigBase_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Delete[1] = {{ wxLua_wxConfigBase_Delete, 0, 0, s_wxluaargArray_None }}; + + // %override wxLua_wxConfigBase_Delete + // void Destroy() + static int LUACALL wxLua_wxConfigBase_Delete(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); + + if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase + wxConfigBase::Set(NULL); + + // call Destroy + delete self; + // return the number of parameters + return 0; + } + static int LUACALL wxLua_wxConfigBase_DeleteAll(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_DeleteAll[1] = {{ wxLua_wxConfigBase_DeleteAll, 0, 0, s_wxluaargArray_None }}; *************** *** 115,138 **** } - static int LUACALL wxLua_wxConfigBase_Destroy(lua_State *L); - static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Destroy[1] = {{ wxLua_wxConfigBase_Destroy, 0, 0, s_wxluaargArray_None }}; - - // %override wxLua_wxConfigBase_Destroy - // void Destroy() - static int LUACALL wxLua_wxConfigBase_Destroy(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); - - if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase - wxConfigBase::Set(NULL); - - // call Destroy - delete self; - // return the number of parameters - return 0; - } - static int LUACALL wxLua_wxConfigBase_DontCreateOnDemand(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_DontCreateOnDemand[1] = {{ wxLua_wxConfigBase_DontCreateOnDemand, 0, 0, s_wxluaargArray_None }}; --- 135,138 ---- *************** *** 520,554 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Read[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read[1] = {{ wxLua_wxConfigBase_Read, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_Read }}; ! ! // %override wxLua_wxConfigBase_Read ! // bool Read(const wxString& key, wxString* str, const wxString& defaultVal = wxEmptyString) const ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxString returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); ! // const wxString& key ! wxString key = wxlState.GetwxStringType(2); ! // get this ! wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); ! // call Read ! bool ret = self->Read(key, &returns, defaultVal); ! // push the result bool ! lua_pushboolean(L, ret); ! // push the result string ! wxlState.lua_PushString(returns); ! // return the number of parameters ! return 2; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_ReadFloat(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_ReadFloat[1] = {{ wxLua_wxConfigBase_ReadFloat, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_ReadFloat }}; // %override wxLua_wxConfigBase_ReadFloat --- 520,527 ---- } ! #define wxLua_wxConfigBase_Read1 wxLua_wxConfigBase_ReadFloat ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Read1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_Read1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read1[1] = {{ wxLua_wxConfigBase_Read1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Read1 }}; // %override wxLua_wxConfigBase_ReadFloat *************** *** 576,593 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_ReadInt(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_ReadInt[1] = {{ wxLua_wxConfigBase_ReadInt, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_ReadInt }}; ! // %override wxLua_wxConfigBase_ReadInt ! // %rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const ! static int LUACALL wxLua_wxConfigBase_ReadInt(lua_State *L) { wxLuaState wxlState(L); ! long returns = 0; // get number of arguments int argCount = lua_gettop(L); ! // double defaultVal = 0 ! long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key wxString key = wxlState.GetwxStringType(2); --- 549,566 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Read[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read[1] = {{ wxLua_wxConfigBase_Read, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_Read }}; ! // %override wxLua_wxConfigBase_Read ! // bool Read(const wxString& key, wxString* str, const wxString& defaultVal = wxEmptyString) const ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; // get number of arguments int argCount = lua_gettop(L); ! // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& key wxString key = wxlState.GetwxStringType(2); *************** *** 598,603 **** // push the result bool lua_pushboolean(L, ret); ! // push the result number ! lua_pushnumber(L, returns); // return the number of parameters return 2; --- 571,576 ---- // push the result bool lua_pushboolean(L, ret); ! // push the result string ! wxlState.lua_PushString(returns); // return the number of parameters return 2; *************** *** 729,761 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Write[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write[1] = {{ wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }}; ! ! // bool Write(const wxString& key, wxString &value) ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // wxString value ! wxString value = wxlState.GetwxStringType(3); ! // const wxString key ! const wxString key = wxlState.GetwxStringType(2); ! // get this ! wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); ! // call Write ! returns = self->Write(key, value); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_WriteFloat(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_WriteFloat[1] = {{ wxLua_wxConfigBase_WriteFloat, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteFloat }}; ! // %rename WriteFloat bool Write(const wxString &key, double value) ! static int LUACALL wxLua_wxConfigBase_WriteFloat(lua_State *L) { wxLuaState wxlState(L); --- 702,711 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Write1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_Write1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write1[1] = {{ wxLua_wxConfigBase_Write1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write1 }}; ! // bool Write(const wxString &key, double value) ! static int LUACALL wxLua_wxConfigBase_Write1(lua_State *L) { wxLuaState wxlState(L); *************** *** 775,789 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_WriteInt(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_WriteInt[1] = {{ wxLua_wxConfigBase_WriteInt, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteInt }}; ! // %rename WriteInt bool Write(const wxString &key, long value) ! static int LUACALL wxLua_wxConfigBase_WriteInt(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // long value ! long value = (long)wxlua_getnumbertype(L, 3); // const wxString key const wxString key = wxlState.GetwxStringType(2); --- 725,739 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Write[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write[1] = {{ wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }}; ! // bool Write(const wxString& key, wxString &value) ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // wxString value ! wxString value = wxlState.GetwxStringType(3); // const wxString key const wxString key = wxlState.GetwxStringType(2); *************** *** 801,811 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Create", s_wxluafunc_wxLua_wxConfigBase_Create, 1 }, { WXLUAMETHOD_METHOD, "DeleteAll", s_wxluafunc_wxLua_wxConfigBase_DeleteAll, 1 }, { WXLUAMETHOD_METHOD, "DeleteEntry", s_wxluafunc_wxLua_wxConfigBase_DeleteEntry, 1 }, { WXLUAMETHOD_METHOD, "DeleteGroup", s_wxluafunc_wxLua_wxConfigBase_DeleteGroup, 1 }, - { WXLUAMETHOD_METHOD, "Destroy", s_wxluafunc_wxLua_wxConfigBase_Destroy, 1 }, { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "DontCreateOnDemand", s_wxluafunc_wxLua_wxConfigBase_DontCreateOnDemand, 1 }, { WXLUAMETHOD_METHOD, "Exists", s_wxluafunc_wxLua_wxConfigBase_Exists, 1 }, --- 751,798 ---- + #if (wxLUA_USE_wxConfig && wxUSE_CONFIG) + static int LUACALL wxLua_wxConfigBase_Read_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read_overload[] = + { + { wxLua_wxConfigBase_Read_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxConfigBase_Read1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Read1 }, + { wxLua_wxConfigBase_Read, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_Read }, + }; + static int s_wxluafunc_wxLua_wxConfigBase_Read_overload_count = sizeof(s_wxluafunc_wxLua_wxConfigBase_Read_overload)/sizeof(s_wxluafunc_wxLua_wxConfigBase_Read_overload[0]); + // Overloaded function for wxConfigBase::Read + static int LUACALL wxLua_wxConfigBase_Read_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "Read", s_wxluafunc_wxLua_wxConfigBase_Read_overload, s_wxluafunc_wxLua_wxConfigBase_Read_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } + static int LUACALL wxLua_wxConfigBase_Write_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write_overload[] = + { + { wxLua_wxConfigBase_Write_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxConfigBase_Write1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write1 }, + { wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }, + }; + static int s_wxluafunc_wxLua_wxConfigBase_Write_overload_count = sizeof(s_wxluafunc_wxLua_wxConfigBase_Write_overload)/sizeof(s_wxluafunc_wxLua_wxConfigBase_Write_overload[0]); + // Overloaded function for wxConfigBase::Write + static int LUACALL wxLua_wxConfigBase_Write_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "Write", s_wxluafunc_wxLua_wxConfigBase_Write_overload, s_wxluafunc_wxLua_wxConfigBase_Write_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // (wxLUA_USE_wxConfig && wxUSE_CONFIG) + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Create", s_wxluafunc_wxLua_wxConfigBase_Create, 1 }, + { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxConfigBase_Delete, 1 }, { WXLUAMETHOD_METHOD, "DeleteAll", s_wxluafunc_wxLua_wxConfigBase_DeleteAll, 1 }, { WXLUAMETHOD_METHOD, "DeleteEntry", s_wxluafunc_wxLua_wxConfigBase_DeleteEntry, 1 }, { WXLUAMETHOD_METHOD, "DeleteGroup", s_wxluafunc_wxLua_wxConfigBase_DeleteGroup, 1 }, { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "DontCreateOnDemand", s_wxluafunc_wxLua_wxConfigBase_DontCreateOnDemand, 1 }, { WXLUAMETHOD_METHOD, "Exists", s_wxluafunc_wxLua_wxConfigBase_Exists, 1 }, *************** *** 826,832 **** { WXLUAMETHOD_METHOD, "IsExpandingEnvVars", s_wxluafunc_wxLua_wxConfigBase_IsExpandingEnvVars, 1 }, { WXLUAMETHOD_METHOD, "IsRecordingDefaults", s_wxluafunc_wxLua_wxConfigBase_IsRecordingDefaults, 1 }, ! { WXLUAMETHOD_METHOD, "Read", s_wxluafunc_wxLua_wxConfigBase_Read, 1 }, ! { WXLUAMETHOD_METHOD, "ReadFloat", s_wxluafunc_wxLua_wxConfigBase_ReadFloat, 1 }, ! { WXLUAMETHOD_METHOD, "ReadInt", s_wxluafunc_wxLua_wxConfigBase_ReadInt, 1 }, { WXLUAMETHOD_METHOD, "RenameEntry", s_wxluafunc_wxLua_wxConfigBase_RenameEntry, 1 }, { WXLUAMETHOD_METHOD, "RenameGroup", s_wxluafunc_wxLua_wxConfigBase_RenameGroup, 1 }, --- 813,821 ---- { WXLUAMETHOD_METHOD, "IsExpandingEnvVars", s_wxluafunc_wxLua_wxConfigBase_IsExpandingEnvVars, 1 }, { WXLUAMETHOD_METHOD, "IsRecordingDefaults", s_wxluafunc_wxLua_wxConfigBase_IsRecordingDefaults, 1 }, ! ! #if (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "Read", s_wxluafunc_wxLua_wxConfigBase_Read_overload, s_wxluafunc_wxLua_wxConfigBase_Read_overload_count }, ! #endif // (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "RenameEntry", s_wxluafunc_wxLua_wxConfigBase_RenameEntry, 1 }, { WXLUAMETHOD_METHOD, "RenameGroup", s_wxluafunc_wxLua_wxConfigBase_RenameGroup, 1 }, *************** *** 835,841 **** { WXLUAMETHOD_METHOD, "SetPath", s_wxluafunc_wxLua_wxConfigBase_SetPath, 1 }, { WXLUAMETHOD_METHOD, "SetRecordDefaults", s_wxluafunc_wxLua_wxConfigBase_SetRecordDefaults, 1 }, ! { WXLUAMETHOD_METHOD, "Write", s_wxluafunc_wxLua_wxConfigBase_Write, 1 }, ! { WXLUAMETHOD_METHOD, "WriteFloat", s_wxluafunc_wxLua_wxConfigBase_WriteFloat, 1 }, ! { WXLUAMETHOD_METHOD, "WriteInt", s_wxluafunc_wxLua_wxConfigBase_WriteInt, 1 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, --- 824,831 ---- { WXLUAMETHOD_METHOD, "SetPath", s_wxluafunc_wxLua_wxConfigBase_SetPath, 1 }, { WXLUAMETHOD_METHOD, "SetRecordDefaults", s_wxluafunc_wxLua_wxConfigBase_SetRecordDefaults, 1 }, ! ! #if (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "Write", s_wxluafunc_wxLua_wxConfigBase_Write_overload, s_wxluafunc_wxLua_wxConfigBase_Write_overload_count }, ! #endif // (wxLUA_USE_wxConfig && wxUSE_CONFIG) { WXLUAMETHOD_METHOD, 0, 0, 0 }, *************** *** 1052,1055 **** --- 1042,1061 ---- int s_wxluatag_wxConfigPathChanger = -1; + static int LUACALL wxLua_wxConfigPathChanger_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigPathChanger_Delete[1] = {{ wxLua_wxConfigPathChanger_Delete, 0, 0, s_wxluaargArray_None }}; + + static int LUACALL wxLua_wxConfigPathChanger_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxConfigPathChanger * self = (wxConfigPathChanger *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigPathChanger); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + static int LUACALL wxLua_wxConfigPathChanger_Name(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigPathChanger_Name[1] = {{ wxLua_wxConfigPathChanger_Name, 0, 0, s_wxluaargArray_None }}; *************** *** 1105,1108 **** --- 1111,1116 ---- // call constructor returns = new wxConfigPathChanger(pContainer, strEntry); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxObject_wxConfigPathChanger((wxConfigPathChanger *)returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxConfigPathChanger, returns); *************** *** 1116,1119 **** --- 1124,1128 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigPathChanger_methods[] = { + { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxConfigPathChanger_Delete }, { WXLUAMETHOD_METHOD, "Name", s_wxluafunc_wxLua_wxConfigPathChanger_Name, 1 }, Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** print.cpp 31 May 2007 17:18:51 -0000 1.34 --- print.cpp 31 May 2007 21:38:45 -0000 1.35 *************** *** 56,62 **** #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPPIPrinter[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPPIPrinter(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIPrinter[1] = {{ wxLua_wxPrintout_GetPPIPrinter, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPPIPrinter }}; // %override wxLua_wxPrintout_GetPPIPrinter --- 56,61 ---- #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static int LUACALL wxLua_wxPrintout_GetPPIPrinter(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIPrinter[1] = {{ wxLua_wxPrintout_GetPPIPrinter, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPPIPrinter *************** *** 77,83 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPPIScreen[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPPIScreen(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIScreen[1] = {{ wxLua_wxPrintout_GetPPIScreen, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPPIScreen }}; // %override wxLua_wxPrintout_GetPPIScreen --- 76,81 ---- } static int LUACALL wxLua_wxPrintout_GetPPIScreen(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIScreen[1] = {{ wxLua_wxPrintout_GetPPIScreen, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPPIScreen *************** *** 98,104 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPageInfo[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPageInfo(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageInfo[1] = {{ wxLua_wxPrintout_GetPageInfo, 4, 4, s_wxluatagArray_wxLua_wxPrintout_GetPageInfo }}; // %override wxLua_wxPrintout_GetPageInfo --- 96,101 ---- } static int LUACALL wxLua_wxPrintout_GetPageInfo(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageInfo[1] = {{ wxLua_wxPrintout_GetPageInfo, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPageInfo *************** *** 123,129 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPageSizeMM[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPageSizeMM(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizeMM[1] = {{ wxLua_wxPrintout_GetPageSizeMM, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPageSizeMM }}; // %override wxLua_wxPrintout_GetPageSizeMM --- 120,125 ---- } static int LUACALL wxLua_wxPrintout_GetPageSizeMM(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizeMM[1] = {{ wxLua_wxPrintout_GetPageSizeMM, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPageSizeMM *************** *** 144,150 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPageSizePixels[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPageSizePixels(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizePixels[1] = {{ wxLua_wxPrintout_GetPageSizePixels, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPageSizePixels }}; // %override wxLua_wxPrintout_GetPageSizePixels --- 140,145 ---- } static int LUACALL wxLua_wxPrintout_GetPageSizePixels(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizePixels[1] = {{ wxLua_wxPrintout_GetPageSizePixels, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPageSizePixels *************** *** 1997,2005 **** } #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize[] = { &s_wxluatag_wxSize, 0 }; static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize[1] = {{ wxLua_wxPageSetupDialogData_SetPaperSize, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize }}; // void SetPaperSize(const wxSize& sz) --- 1992,2018 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize1[] = { &s_wxluaarg_Enumeration, 0 }; + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize1(lua_State *L); + // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize1[1] = {{ wxLua_wxPageSetupDialogData_SetPaperSize1, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize1 }}; + + // void SetPaperSize(wxPaperSize id) + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize1(lua_State *L) + { + wxLuaState wxlState(L); + // wxPaperSize id + wxPaperSize id = (wxPaperSize)wxlua_getenumerationtype(L, 2); + // get this + wxPageSetupDialogData * self = (wxPageSetupDialogData *)wxlState.GetUserDataType(1, s_wxluatag_wxPageSetupDialogData); + // call SetPaperSize + self->SetPaperSize(id); + + return 0; + } + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize[] = { &s_wxluatag_wxSize, 0 }; static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize[1] = {{ wxLua_wxPageSetupDialogData_SetPaperSize, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize }}; // void SetPaperSize(const wxSize& sz) *************** *** 2081,2084 **** --- 2094,2120 ---- + #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload[] = + { + { wxLua_wxPageSetupDialogData_SetPaperSize_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxPageSetupDialogData_SetPaperSize1, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize1 }, + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + { wxLua_wxPageSetupDialogData_SetPaperSize, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + }; + static int s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload_count = sizeof(s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload)/sizeof(s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload[0]); + // Overloaded function for wxPageSetupDialogData::SetPaperSize + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "SetPaperSize", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload, s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) + #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static int LUACALL wxLua_wxPageSetupDialogData_constructor_overload(lua_State *L); *************** *** 2147,2153 **** { WXLUAMETHOD_METHOD, "SetPaperId", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperId, 1 }, ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) ! { WXLUAMETHOD_METHOD, "SetPaperSize", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize, 1 }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) { WXLUAMETHOD_METHOD, "SetPrintData", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPrintData, 1 }, --- 2183,2189 ---- { WXLUAMETHOD_METHOD, "SetPaperId", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperId, 1 }, ! #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) ! { WXLUAMETHOD_METHOD, "SetPaperSize", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload, s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload_count }, ! #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) { WXLUAMETHOD_METHOD, "SetPrintData", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPrintData, 1 }, Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** controls.cpp 31 May 2007 17:18:50 -0000 1.52 --- controls.cpp 31 May 2007 21:38:41 -0000 1.53 *************** *** 9170,9176 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxTextCtrl_GetSelection[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxTextCtrl_GetSelection(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextCtrl_GetSelection[1] = {{ wxLua_wxTextCtrl_GetSelection, 2, 2, s_wxluatagArray_wxLua_wxTextCtrl_GetSelection }}; // %override wxLua_wxTextCtrl_GetSelection --- 9170,9175 ---- } static int LUACALL wxLua_wxTextCtrl_GetSelection(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextCtrl_GetSelection[1] = {{ wxLua_wxTextCtrl_GetSelection, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxTextCtrl_GetSelection *************** *** 10976,10982 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild[] = { &s_wxluatag_wxTreeItemId, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetFirstChild(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetFirstChild[1] = {{ wxLua_wxTreeCtrl_GetFirstChild, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild }}; // %override wxLua_wxTreeCtrl_GetFirstChild --- 10975,10981 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild[] = { &s_wxluatag_wxTreeItemId, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetFirstChild(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetFirstChild[1] = {{ wxLua_wxTreeCtrl_GetFirstChild, 1, 1, s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild }}; // %override wxLua_wxTreeCtrl_GetFirstChild *************** *** 11277,11281 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild[] = { &s_wxluatag_wxTreeItemId, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetNextChild(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetNextChild[1] = {{ wxLua_wxTreeCtrl_GetNextChild, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild }}; --- 11276,11280 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild[] = { &s_wxluatag_wxTreeItemId, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetNextChild(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetNextChild[1] = {{ wxLua_wxTreeCtrl_GetNextChild, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild }}; Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** xml.cpp 31 May 2007 17:18:53 -0000 1.29 --- xml.cpp 31 May 2007 21:38:47 -0000 1.30 *************** *** 39,43 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; ! // void AddChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) { --- 39,43 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; ! // void AddChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) { *************** *** 57,61 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty1[1] = {{ wxLua_wxXmlNode_AddProperty1, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddProperty1 }}; ! // void AddProperty(wxXmlProperty *prop); static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L) { --- 57,61 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty1[1] = {{ wxLua_wxXmlNode_AddProperty1, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddProperty1 }}; ! // void AddProperty(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L) { *************** *** 75,79 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty[1] = {{ wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }}; ! // void AddProperty(const wxString& name, const wxString& value); static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) { --- 75,79 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty[1] = {{ wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }}; ! // void AddProperty(const wxString& name, const wxString& value) static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) { *************** *** 111,115 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_DeleteProperty[1] = {{ wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }}; ! // bool DeleteProperty(const wxString& name); static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) { --- 111,115 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_DeleteProperty[1] = {{ wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }}; ! // bool DeleteProperty(const wxString& name) static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) { *************** *** 131,135 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetChildren[1] = {{ wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetChildren() const; static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) { --- 131,135 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetChildren[1] = {{ wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetChildren() const static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) { *************** *** 149,153 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetContent[1] = {{ wxLua_wxXmlNode_GetContent, 0, 0, s_wxluaargArray_None }}; ! // wxString GetContent() const; static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) { --- 149,153 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetContent[1] = {{ wxLua_wxXmlNode_GetContent, 0, 0, s_wxluaargArray_None }}; ! // wxString GetContent() const static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) { *************** *** 167,171 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetName[1] = {{ wxLua_wxXmlNode_GetName, 0, 0, s_wxluaargArray_None }}; ! // wxString GetName() const; static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) { --- 167,171 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetName[1] = {{ wxLua_wxXmlNode_GetName, 0, 0, s_wxluaargArray_None }}; ! // wxString GetName() const static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) { *************** *** 185,189 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetNext[1] = {{ wxLua_wxXmlNode_GetNext, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetNext() const; static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) { --- 185,189 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetNext[1] = {{ wxLua_wxXmlNode_GetNext, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetNext() const static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) { *************** *** 203,207 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetParent[1] = {{ wxLua_wxXmlNode_GetParent, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetParent() const; static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) { --- 203,207 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetParent[1] = {{ wxLua_wxXmlNode_GetParent, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetParent() const static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) { *************** *** 218,227 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal[1] = {{ wxLua_wxXmlNode_GetPropVal, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }}; ! // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const; ! static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L) { wxLuaState wxlState(L); --- 218,227 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal1[1] = {{ wxLua_wxXmlNode_GetPropVal1, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1 }}; ! // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const ! static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L) { wxLuaState wxlState(L); *************** *** 241,247 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropValPtr(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropValPtr[1] = {{ wxLua_wxXmlNode_GetPropValPtr, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr }}; // %override wxLua_wxXmlNode_GetPropValPtr --- 241,248 ---- } ! #define wxLua_wxXmlNode_GetPropVal wxLua_wxXmlNode_GetPropValPtr ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal[] = { &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal[1] = {{ wxLua_wxXmlNode_GetPropVal, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }}; // %override wxLua_wxXmlNode_GetPropValPtr *************** *** 270,274 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluaargArray_None }}; ! // wxXmlProperty *GetProperties() const; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) { --- 271,275 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluaargArray_None }}; ! // wxXmlProperty *GetProperties() const static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) { *************** *** 288,292 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetType[1] = {{ wxLua_wxXmlNode_GetType, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNodeType GetType() const; static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) { --- 289,293 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetType[1] = {{ wxLua_wxXmlNode_GetType, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNodeType GetType() const static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) { *************** *** 307,311 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_HasProp[1] = {{ wxLua_wxXmlNode_HasProp, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_HasProp }}; ! // bool HasProp(const wxString& propName) const; static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) { --- 308,312 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_HasProp[1] = {{ wxLua_wxXmlNode_HasProp, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_HasProp }}; ! // bool HasProp(const wxString& propName) const static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) { *************** *** 328,332 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_InsertChild[1] = {{ wxLua_wxXmlNode_InsertChild, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }}; ! // void InsertChild(wxXmlNode *child, wxXmlNode *before_node); static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) { --- 329,333 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_InsertChild[1] = {{ wxLua_wxXmlNode_InsertChild, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }}; ! // void InsertChild(wxXmlNode *child, wxXmlNode *before_node) static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) { *************** *** 348,352 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_RemoveChild[1] = {{ wxLua_wxXmlNode_RemoveChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }}; ! // bool RemoveChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) { --- 349,353 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_RemoveChild[1] = {{ wxLua_wxXmlNode_RemoveChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }}; ! // bool RemoveChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) { *************** *** 369,373 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetChildren[1] = {{ wxLua_wxXmlNode_SetChildren, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }}; ! // void SetChildren(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) { --- 370,374 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetChildren[1] = {{ wxLua_wxXmlNode_SetChildren, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }}; ! // void SetChildren(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) { *************** *** 387,391 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetContent[1] = {{ wxLua_wxXmlNode_SetContent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetContent }}; ! // void SetContent(const wxString& con); static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) { --- 388,392 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetContent[1] = {{ wxLua_wxXmlNode_SetContent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetContent }}; ! // void SetContent(const wxString& con) static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) { *************** *** 405,409 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetName[1] = {{ wxLua_wxXmlNode_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetName }}; ! // void SetName(const wxString& name); static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) { --- 406,410 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetName[1] = {{ wxLua_wxXmlNode_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetName }}; ! // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) { *************** *** 423,427 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetNext[1] = {{ wxLua_wxXmlNode_SetNext, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetNext }}; ! // void SetNext(wxXmlNode *next); static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) { --- 424,428 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetNext[1] = {{ wxLua_wxXmlNode_SetNext, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetNext }}; ! // void SetNext(wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) { *************** *** 441,445 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetParent[1] = {{ wxLua_wxXmlNode_SetParent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetParent }}; ! // void SetParent(wxXmlNode *parent); static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) { --- 442,446 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetParent[1] = {{ wxLua_wxXmlNode_SetParent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetParent }}; ! // void SetParent(wxXmlNode *parent) static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) { *************** *** 459,463 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetProperties[1] = {{ wxLua_wxXmlNode_SetProperties, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }}; ! // void SetProperties(wxXmlProperty *prop); static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) { --- 460,464 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetProperties[1] = {{ wxLua_wxXmlNode_SetProperties, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }}; ! // void SetProperties(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) { *************** *** 477,481 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetType }}; ! // void SetType(wxXmlNodeType type); static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) { --- 478,482 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetType }}; ! // void SetType(wxXmlNodeType type) static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) { *************** *** 495,499 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }}; ! // wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next); static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) { --- 496,500 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }}; ! // wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) { *************** *** 527,531 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }}; ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L) { --- 528,532 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }}; ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString) static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L) { *************** *** 591,594 **** --- 592,612 ---- return wxlState.CallOverloadedFunction(&overload_method); } + static int LUACALL wxLua_wxXmlNode_GetPropVal_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload[] = + { + { wxLua_wxXmlNode_GetPropVal_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxXmlNode_GetPropVal1, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1 }, + { wxLua_wxXmlNode_GetPropVal, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }, + }; + static int s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload)/sizeof(s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload[0]); + // Overloaded function for wxXmlNode::GetPropVal + static int LUACALL wxLua_wxXmlNode_GetPropVal_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "GetPropVal", s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload, s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } static int LUACALL wxLua_wxXmlNode_constructor_overload(lua_State *L); // function overload table *************** *** 626,631 **** { WXLUAMETHOD_METHOD, "GetNext", s_wxluafunc_wxLua_wxXmlNode_GetNext, 1 }, { WXLUAMETHOD_METHOD, "GetParent", s_wxluafunc_wxLua_wxXmlNode_GetParent, 1 }, ! { WXLUAMETHOD_METHOD, "GetPropVal", s_wxluafunc_wxLua_wxXmlNode_GetPropVal, 1 }, ! { WXLUAMETHOD_METHOD, "GetPropValPtr", s_wxluafunc_wxLua_wxXmlNode_GetPropValPtr, 1 }, { WXLUAMETHOD_METHOD, "GetProperties", s_wxluafunc_wxLua_wxXmlNode_GetProperties, 1 }, { WXLUAMETHOD_METHOD, "GetType", s_wxluafunc_wxLua_wxXmlNode_GetType, 1 }, --- 644,652 ---- { WXLUAMETHOD_METHOD, "GetNext", s_wxluafunc_wxLua_wxXmlNode_GetNext, 1 }, { WXLUAMETHOD_METHOD, "GetParent", s_wxluafunc_wxLua_wxXmlNode_GetParent, 1 }, ! ! #if (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "GetPropVal", s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload, s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload_count }, ! #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "GetProperties", s_wxluafunc_wxLua_wxXmlNode_GetProperties, 1 }, { WXLUAMETHOD_METHOD, "GetType", s_wxluafunc_wxLua_wxXmlNode_GetType, 1 }, Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** regex.cpp 31 May 2007 17:18:51 -0000 1.26 --- regex.cpp 31 May 2007 21:38:45 -0000 1.27 *************** *** 76,82 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_GetMatch(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch[1] = {{ wxLua_wxRegEx_GetMatch, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch }}; // wxString GetMatch(const wxString& text, size_t index = 0) const --- 76,114 ---- } + #define wxLua_wxRegEx_GetMatch1 wxLua_wxRegEx_GetMatchIndexes + static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch1[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxRegEx_GetMatch1(lua_State *L); + // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch1[1] = {{ wxLua_wxRegEx_GetMatch1, 0, 1, s_wxluatagArray_wxLua_wxRegEx_GetMatch1 }}; + + // %override wxLua_wxRegEx_GetMatchIndexes + // %rename GetMatchPointer bool GetMatch(size_t* start, size_t* len, size_t index = 0) const + static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // size_t index = 0 + size_t index = (argCount >= 2 ? (size_t)wxlState.GetNumberType(2) : 0); + // size_t* len + size_t len = 0; + // size_t* start + size_t start = 0; + // get this + wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); + // call GetMatch + returns = self->GetMatch(&start, &len, index); + // push the result number + lua_pushboolean(L, returns); + // push the match start and length indexes + lua_pushnumber(L, start); + lua_pushnumber(L, len); + // return the number of parameters + return 3; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_GetMatch(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch[1] = {{ wxLua_wxRegEx_GetMatch, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch }}; // wxString GetMatch(const wxString& text, size_t index = 0) const *************** *** 119,153 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatchIndexes[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 }; - static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L); - static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatchIndexes[1] = {{ wxLua_wxRegEx_GetMatchIndexes, 2, 3, s_wxluatagArray_wxLua_wxRegEx_GetMatchIndexes }}; - - // %override wxLua_wxRegEx_GetMatchIndexes - // %rename GetMatchPointer bool GetMatch(size_t* start, size_t* len, size_t index = 0) const - static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get number of arguments - int argCount = lua_gettop(L); - // size_t index = 0 - size_t index = (argCount >= 2 ? (size_t)wxlState.GetNumberType(2) : 0); - // size_t* len - size_t len = 0; - // size_t* start - size_t start = 0; - // get this - wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); - // call GetMatch - returns = self->GetMatch(&start, &len, index); - // push the result number - lua_pushboolean(L, returns); - // push the match start and length indexes - lua_pushnumber(L, start); - lua_pushnumber(L, len); - // return the number of parameters - return 3; - } - static int LUACALL wxLua_wxRegEx_IsValid(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_IsValid[1] = {{ wxLua_wxRegEx_IsValid, 0, 0, s_wxluaargArray_None }}; --- 151,154 ---- *************** *** 324,327 **** --- 325,345 ---- #if (wxLUA_USE_wxRegEx && wxUSE_REGEX) + static int LUACALL wxLua_wxRegEx_GetMatch_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch_overload[] = + { + { wxLua_wxRegEx_GetMatch_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxRegEx_GetMatch1, 0, 1, s_wxluatagArray_wxLua_wxRegEx_GetMatch1 }, + { wxLua_wxRegEx_GetMatch, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch }, + }; + static int s_wxluafunc_wxLua_wxRegEx_GetMatch_overload_count = sizeof(s_wxluafunc_wxLua_wxRegEx_GetMatch_overload)/sizeof(s_wxluafunc_wxLua_wxRegEx_GetMatch_overload[0]); + // Overloaded function for wxRegEx::GetMatch + static int LUACALL wxLua_wxRegEx_GetMatch_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "GetMatch", s_wxluafunc_wxLua_wxRegEx_GetMatch_overload, s_wxluafunc_wxLua_wxRegEx_GetMatch_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } static int LUACALL wxLua_wxRegEx_constructor_overload(lua_State *L); // function overload table *************** *** 347,353 **** { WXLUAMETHOD_METHOD, "Compile", s_wxluafunc_wxLua_wxRegEx_Compile, 1 }, { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxRegEx_Delete }, ! { WXLUAMETHOD_METHOD, "GetMatch", s_wxluafunc_wxLua_wxRegEx_GetMatch, 1 }, { WXLUAMETHOD_METHOD, "GetMatchCount", s_wxluafunc_wxLua_wxRegEx_GetMatchCount, 1 }, - { WXLUAMETHOD_METHOD, "GetMatchIndexes", s_wxluafunc_wxLua_wxRegEx_GetMatchIndexes, 1 }, { WXLUAMETHOD_METHOD, "IsValid", s_wxluafunc_wxLua_wxRegEx_IsValid, 1 }, { WXLUAMETHOD_METHOD, "Matches", s_wxluafunc_wxLua_wxRegEx_Matches, 1 }, --- 365,374 ---- { WXLUAMETHOD_METHOD, "Compile", s_wxluafunc_wxLua_wxRegEx_Compile, 1 }, { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxRegEx_Delete }, ! ! #if (wxLUA_USE_wxRegEx && wxUSE_REGEX) ! { WXLUAMETHOD_METHOD, "GetMatch", s_wxluafunc_wxLua_wxRegEx_GetMatch_overload, s_wxluafunc_wxLua_wxRegEx_GetMatch_overload_count }, ! #endif // (wxLUA_USE_wxRegEx && wxUSE_REGEX) ! { WXLUAMETHOD_METHOD, "GetMatchCount", s_wxluafunc_wxLua_wxRegEx_GetMatchCount, 1 }, { WXLUAMETHOD_METHOD, "IsValid", s_wxluafunc_wxLua_wxRegEx_IsValid, 1 }, { WXLUAMETHOD_METHOD, "Matches", s_wxluafunc_wxLua_wxRegEx_Matches, 1 }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** file.cpp 31 May 2007 17:18:50 -0000 1.41 --- file.cpp 31 May 2007 21:38:43 -0000 1.42 *************** *** 1154,1161 **** #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxUSE_LONGLONG) - #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) - static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetTimes[] = { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, 0 }; static int LUACALL wxLua_wxFileName_GetTimes(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetTimes[1] = {{ wxLua_wxFileName_GetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_GetTimes }}; // %override wxLua_wxFileName_GetTimes --- 1154,1159 ---- #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxUSE_LONGLONG) static int LUACALL wxLua_wxFileName_GetTimes(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetTimes[1] = {{ wxLua_wxFileName_GetTimes, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxFileName_GetTimes *************** *** 1186,1191 **** } - #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) - static int LUACALL wxLua_wxFileName_GetVolume(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetVolume[1] = {{ wxLua_wxFileName_GetVolume, 0, 0, s_wxluaargArray_None }}; --- 1184,1187 ---- *************** *** 2398,2405 **** #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxUSE_LONGLONG) - #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) { WXLUAMETHOD_METHOD, "GetTimes", s_wxluafunc_wxLua_wxFileName_GetTimes, 1 }, - #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) - { WXLUAMETHOD_METHOD, "GetVolume", s_wxluafunc_wxLua_wxFileName_GetVolume, 1 }, { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetVolumeSeparator", s_wxluafunc_wxLua_wxFileName_GetVolumeSeparator, 1 }, --- 2394,2398 ---- *************** *** 2733,2739 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Read[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxFile_Read(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Read[1] = {{ wxLua_wxFile_Read, 2, 2, s_wxluatagArray_wxLua_wxFile_Read }}; // %override wxLua_wxFile_Read --- 2726,2732 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Read[] = { &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxFile_Read(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Read[1] = {{ wxLua_wxFile_Read, 1, 1, s_wxluatagArray_wxLua_wxFile_Read }}; // %override wxLua_wxFile_Read *************** *** 3379,3386 **** #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetAllFiles[] = { &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetAllFiles(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetAllFiles[1] = {{ wxLua_wxDir_GetAllFiles, 2, 4, s_wxluatagArray_wxLua_wxDir_GetAllFiles }}; // %override wxLua_wxDir_GetAllFiles --- 3372,3378 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetAllFiles[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetAllFiles(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetAllFiles[1] = {{ wxLua_wxDir_GetAllFiles, 1, 3, s_wxluatagArray_wxLua_wxDir_GetAllFiles }}; // %override wxLua_wxDir_GetAllFiles *************** *** 3409,3417 **** } ! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir) ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetFirst(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetFirst[1] = {{ wxLua_wxDir_GetFirst, 1, 3, s_wxluatagArray_wxLua_wxDir_GetFirst }}; // %override wxLua_wxDir_GetFirst --- 3401,3407 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetFirst[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetFirst(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetFirst[1] = {{ wxLua_wxDir_GetFirst, 0, 2, s_wxluatagArray_wxLua_wxDir_GetFirst }}; // %override wxLua_wxDir_GetFirst *************** *** 3458,3464 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetNext[] = { &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxDir_GetNext(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetNext[1] = {{ wxLua_wxDir_GetNext, 1, 1, s_wxluatagArray_wxLua_wxDir_GetNext }}; // %override wxLua_wxDir_GetNext --- 3448,3453 ---- } static int LUACALL wxLua_wxDir_GetNext(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetNext[1] = {{ wxLua_wxDir_GetNext, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxDir_GetNext *************** *** 3665,3672 **** #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) - #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir) { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetAllFiles", s_wxluafunc_wxLua_wxDir_GetAllFiles, 1 },... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-05-31 21:39:26
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/docs Modified Files: changelog.txt wxluaref.html Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluaref.html 31 May 2007 17:18:47 -0000 1.18 --- wxluaref.html 31 May 2007 21:38:40 -0000 1.19 *************** *** 809,813 **** // <a href="#wxLogNull">wxLogNull</a><br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxLogNull">wxLogNull</a></b></font></font><blockquote> // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough<br> <a href="#wxLogNull">wxLogNull</a>()<br> --- 809,813 ---- // <a href="#wxLogNull">wxLogNull</a><br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <i>%encapsulate</i> <i>%delete</i> <b><a name="wxLogNull">wxLogNull</a></b></font></font><blockquote> // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough<br> [...1817 lines suppressed...] // Set the styles for a segment of the document.<br> + <br> <font color=#CC3300> // <i>%override</i> [lua string styleBytes] SetStyleBytes(int length, lua string styleBytes)</font><br> + // void SetStyleBytes(int length, char* styleBytes);<br> void SetStyleBytes(int length, char* styleBytes);<br> <br> *************** *** 17479,17483 **** //#else<br> <font color=#CC3300> // <i>%override</i> [int startPos, int endPos] GetSelection()</font><br> ! void GetSelection(int* startPos, int* endPos);<br> //#endif<br> <br> --- 17751,17756 ---- //#else<br> <font color=#CC3300> // <i>%override</i> [int startPos, int endPos] GetSelection()</font><br> ! // void GetSelection(int* startPos, int* endPos);<br> ! void GetSelection();<br> //#endif<br> <br> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** changelog.txt 31 May 2007 17:18:47 -0000 1.31 --- changelog.txt 31 May 2007 21:38:40 -0000 1.32 *************** *** 53,57 **** Removed %static and %static_only since these are automatically handled and static functions are put into the class table. ! Removed %property tag since these are generated on the fly and - Changed version strings and numbers to match how wxWidgets defines them. WXLUA_MAJOR_VERSION -> wxLUA_MAJOR_VERSION --- 53,59 ---- Removed %static and %static_only since these are automatically handled and static functions are put into the class table. ! Removed %property tag since these are generated on the fly. ! Depricated %constructor tag, use %rename NewConstructor ClassName(...) ! It is currently kept for very special cases, none of which exist now. - Changed version strings and numbers to match how wxWidgets defines them. WXLUA_MAJOR_VERSION -> wxLUA_MAJOR_VERSION *************** *** 62,66 **** WXCHECK_WXLUA_VERSION -> wxLUA_CHECK_VERSION Added wxLUA_CHECK_VERSION_FULL ! version 2.8.0.0 (released 24/12/2006) --- 64,69 ---- WXCHECK_WXLUA_VERSION -> wxLUA_CHECK_VERSION Added wxLUA_CHECK_VERSION_FULL ! - Renamed wxConfigBase::Destroy() to Delete() to match the %delete generated ! functions. version 2.8.0.0 (released 24/12/2006) |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i gdi.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i socket.i windows.i xml.i Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** menutool.i 31 May 2007 17:18:46 -0000 1.15 --- menutool.i 31 May 2007 21:38:39 -0000 1.16 *************** *** 28,32 **** %class wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) ! // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) --- 28,33 ---- %class wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) ! ! // %override wxMenu* wxMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) *************** *** 45,50 **** void Enable(int id, bool enable) int FindItem(const wxString& itemString) const ! // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItemById(int id) ! %rename FindItemById wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const wxMenuItem* FindItemByPosition(size_t position) const wxString GetHelpString(int id) const --- 46,54 ---- void Enable(int id, bool enable) int FindItem(const wxString& itemString) const ! ! // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItem(int id) ! // wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const ! %override_name wxLua_wxMenu_FindItemById wxMenuItem* FindItem(int id) const ! wxMenuItem* FindItemByPosition(size_t position) const wxString GetHelpString(int id) const Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** clipdrag.i 31 May 2007 17:18:46 -0000 1.24 --- clipdrag.i 31 May 2007 21:38:38 -0000 1.25 *************** *** 116,130 **** // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! //virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const virtual void GetAllFormats(wxDataObject::Direction dir = wxDataObject::Get) const // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! //virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual bool GetDataHere(const wxDataFormat& format) const virtual int GetDataSize(const wxDataFormat& format) const virtual int GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const virtual wxDataFormat GetPreferredFormat(wxDataObject::Direction dir = wxDataObject::Get) const // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! //virtual bool SetData(const wxDataFormat& format, int len, const void *buf) virtual bool SetData(const wxDataFormat& format, const wxString& str) %endclass --- 116,134 ---- // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! // virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const virtual void GetAllFormats(wxDataObject::Direction dir = wxDataObject::Get) const + // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! // virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual bool GetDataHere(const wxDataFormat& format) const + virtual int GetDataSize(const wxDataFormat& format) const virtual int GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const virtual wxDataFormat GetPreferredFormat(wxDataObject::Direction dir = wxDataObject::Get) const + // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! // virtual bool SetData(const wxDataFormat& format, int len, const void *buf) virtual bool SetData(const wxDataFormat& format, const wxString& str) + %endclass *************** *** 138,147 **** void SetFormat(const wxDataFormat& format) virtual size_t GetDataSize() const // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! //virtual bool GetDataHere(void *buf) const virtual bool GetDataHere() const // %override bool wxDataObjectSimple::SetData(lua string) ! //virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) %endclass --- 142,154 ---- void SetFormat(const wxDataFormat& format) virtual size_t GetDataSize() const + // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! // virtual bool GetDataHere(void *buf) const virtual bool GetDataHere() const + // %override bool wxDataObjectSimple::SetData(lua string) ! // virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) + %endclass *************** *** 301,305 **** --- 308,314 ---- // %override [lua table of strings] wxDropFilesEvent::GetFiles() + // wxString* GetFiles() const wxString* GetFiles() const + int GetNumberOfFiles() const wxPoint GetPosition() const Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** data.i 31 May 2007 17:18:46 -0000 1.27 --- data.i 31 May 2007 21:38:38 -0000 1.28 *************** *** 55,60 **** //void Dump(ostream& stream) ! // %override [new class type] wxObject::DynamicCast() converts the wxObject to an object of type classname void *DynamicCast(const wxString &classname) wxClassInfo* GetClassInfo() wxObjectRefData* GetRefData() const --- 55,63 ---- //void Dump(ostream& stream) ! ! // %override [new class type] wxObject::DynamicCast() converts the wxObject ! // to an object of type classname void *DynamicCast(const wxString &classname) + wxClassInfo* GetClassInfo() wxObjectRefData* GetRefData() const *************** *** 156,166 **** %class %delete %noclassinfo wxGenericValidator, wxValidator // FIXME test this // %override wxGenericValidatorBool for wxCheckBox and wxRadioButton, input is wxLuaObject ? ! %constructor wxGenericValidatorBool(bool *boolPtr) // for wxButton and wxComboBox, wxStaticText and wxTextCtrl ! %constructor wxGenericValidatorString(wxString *valPtr) // for wxGauge, wxScrollBar, wxRadioBox, wxSpinButton, wxChoice ! %constructor wxGenericValidatorInt(int *valPtr) // for wxListBox and wxCheckListBox ! %constructor wxGenericValidatorArray(wxArrayInt *valPtr) %endclass --- 159,173 ---- %class %delete %noclassinfo wxGenericValidator, wxValidator // FIXME test this // %override wxGenericValidatorBool for wxCheckBox and wxRadioButton, input is wxLuaObject ? ! %rename wxGenericValidatorBool wxGenericValidator(bool *boolPtr) ! // for wxButton and wxComboBox, wxStaticText and wxTextCtrl ! %rename wxGenericValidatorString wxGenericValidator(wxString *valPtr) ! // for wxGauge, wxScrollBar, wxRadioBox, wxSpinButton, wxChoice ! %rename wxGenericValidatorInt wxGenericValidator(int *valPtr) ! // for wxListBox and wxCheckListBox ! %rename wxGenericValidatorArray wxGenericValidator(wxArrayInt *valPtr) ! %endclass Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** print.i 31 May 2007 17:18:47 -0000 1.15 --- print.i 31 May 2007 21:38:40 -0000 1.16 *************** *** 22,35 **** wxDC * GetDC() // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) // %override [int w, int h] wxPrintout::GetPageSizeMM() ! void GetPageSizeMM(int *w, int *h) // %override [int w, int h] wxPrintout::GetPageSizePixels() ! void GetPageSizePixels(int *w, int *h) // %override [int w, int h] wxPrintout::GetPPIPrinter() ! void GetPPIPrinter(int *w, int *h) // %override [int w, int h] wxPrintout::GetPPIScreen() ! void GetPPIScreen(int *w, int *h) wxString GetTitle() bool HasPage(int pageNum) --- 22,46 ---- wxDC * GetDC() + // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! // void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) ! void GetPageInfo() ! // %override [int w, int h] wxPrintout::GetPageSizeMM() ! // void GetPageSizeMM(int *w, int *h) ! void GetPageSizeMM() ! // %override [int w, int h] wxPrintout::GetPageSizePixels() ! // void GetPageSizePixels(int *w, int *h) ! void GetPageSizePixels() ! // %override [int w, int h] wxPrintout::GetPPIPrinter() ! // void GetPPIPrinter(int *w, int *h) ! void GetPPIPrinter() ! // %override [int w, int h] wxPrintout::GetPPIScreen() ! // void GetPPIScreen(int *w, int *h) ! void GetPPIScreen() ! wxString GetTitle() bool HasPage(int pageNum) *************** *** 325,330 **** bool Ok() const void SetPaperSize(const wxSize& sz) void SetPaperId(wxPaperSize id) - //%rename SetPaperSizeById void SetPaperSize(wxPaperSize id) void SetMinMarginTopLeft(const wxPoint& pt) void SetMinMarginBottomRight(const wxPoint& pt) --- 336,341 ---- bool Ok() const void SetPaperSize(const wxSize& sz) + void SetPaperSize(wxPaperSize id) void SetPaperId(wxPaperSize id) void SetMinMarginTopLeft(const wxPoint& pt) void SetMinMarginBottomRight(const wxPoint& pt) Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** file.i 31 May 2007 17:18:46 -0000 1.21 --- file.i 31 May 2007 21:38:39 -0000 1.22 *************** *** 177,182 **** --- 177,185 ---- static wxString GetCwd(const wxString& volume = "") int GetDirCount() const + // %override [lua string table] wxFileName::GetDirs() + // const wxArrayString& GetDirs() const const wxArrayString& GetDirs() const + wxString GetExt() const static wxString GetForbiddenChars(wxPathFormat format = wxPATH_NATIVE) *************** *** 198,203 **** %wxchkver_2_8 wxULongLong GetSize() const //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file) // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const wxString GetVolume() const static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE) --- 201,209 ---- %wxchkver_2_8 wxULongLong GetSize() const //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file) + // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! // bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const ! bool GetTimes() const ! wxString GetVolume() const static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE) *************** *** 242,254 **** bool SetTimes(const wxDateTime* dtAccess, const wxDateTime* dtMod, const wxDateTime* dtCreate) void SetVolume(const wxString& volume) // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //%rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) bool Touch() --- 248,264 ---- bool SetTimes(const wxDateTime* dtAccess, const wxDateTime* dtMod, const wxDateTime* dtCreate) void SetVolume(const wxString& volume) + // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) + // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) + // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) + bool Touch() *************** *** 323,334 **** wxFileOffset Length() const bool Open(const wxString& filename, wxFile::OpenMode mode = wxFile::read) // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! size_t Read(void* buffer, unsigned int count) wxFileOffset Seek(wxFileOffset offset, wxSeekMode mode = wxFromStart) wxFileOffset SeekEnd(wxFileOffset offset = 0) wxFileOffset Tell() const // %override size_t wxFile::Write(lua string, unsigned int count) ! //size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass --- 333,349 ---- wxFileOffset Length() const bool Open(const wxString& filename, wxFile::OpenMode mode = wxFile::read) + // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! // size_t Read(void* buffer, unsigned int count) ! size_t Read(unsigned int count) ! wxFileOffset Seek(wxFileOffset offset, wxSeekMode mode = wxFromStart) wxFileOffset SeekEnd(wxFileOffset offset = 0) wxFileOffset Tell() const + // %override size_t wxFile::Write(lua string, unsigned int count) ! // size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) + size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass *************** *** 387,397 **** static bool Exists(const wxString& dir) // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const wxString GetName() const // %override [bool, string filename] wxDir::GetNext() ! bool GetNext(wxString * filename) const bool HasFiles(const wxString& filespec = "") bool HasSubDirs(const wxString& dirspec = "") --- 402,420 ---- static bool Exists(const wxString& dir) + // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! static unsigned int GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const ! bool GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) const ! wxString GetName() const + // %override [bool, string filename] wxDir::GetNext() ! // bool GetNext(wxString * filename) const ! bool GetNext() const ! bool HasFiles(const wxString& filespec = "") bool HasSubDirs(const wxString& dirspec = "") *************** *** 455,467 **** size_t LastRead() const char Peek() // %override [lua string] wxInputStream::Read(size_t size) ! //wxInputStream& Read(void *buffer, size_t size) ! wxInputStream& Read(size_t size) wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const ! // %override size_t wxInputStream::Unget(lua string, size_t size) ! //%rename Unget size_t Ungetch(const char* buffer, size_t size) ! %rename Unget size_t Ungetch(const wxString& str, size_t size) bool Ungetch(char c) %endclass --- 478,494 ---- size_t LastRead() const char Peek() + // %override [lua string] wxInputStream::Read(size_t size) ! // wxInputStream& Read(void *buffer, size_t size) ! wxString Read(size_t size) ! wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const ! ! // %override size_t wxInputStream::Ungetch(lua string, size_t size) ! // size_t Ungetch(const char* buffer, size_t size) ! %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size) ! bool Ungetch(char c) %endclass *************** *** 478,484 **** wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellO() const // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! //wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) wxOutputStream& Write(wxInputStream& stream_in) %endclass --- 505,513 ---- wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellO() const + // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! // wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) + wxOutputStream& Write(wxInputStream& stream_in) %endclass Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** regex.i 31 May 2007 17:18:47 -0000 1.7 --- regex.i 31 May 2007 21:38:40 -0000 1.8 *************** *** 36,50 **** bool IsValid() const wxString GetMatch(const wxString& text, size_t index = 0) const ! // %override [bool, size_t start, size_t len] wxRegEx::GetMatchIndexes(size_t index = 0) const ! %rename GetMatchIndexes bool GetMatch(size_t* start, size_t* len, size_t index = 0) const size_t GetMatchCount() const // Note: only need this form of Matches bool Matches(const wxString &text, int flags = 0) const // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! int Replace(wxString* text, const wxString& replacement, size_t maxMatches = 0) const // %override [int, string text] ReplaceAll(const wxString& text, const wxString& replacement) const ! int ReplaceAll(wxString* text, const wxString& replacement) const // %override [int, string text] ReplaceFirst(const wxString& text, const wxString& replacement) const ! int ReplaceFirst(wxString* text, const wxString& replacement) const %endclass --- 36,60 ---- bool IsValid() const wxString GetMatch(const wxString& text, size_t index = 0) const ! ! // %override [bool, size_t start, size_t len] wxRegEx::GetMatch(size_t index = 0) const ! // bool GetMatch(size_t* start, size_t* len, size_t index = 0) const ! %override_name wxLua_wxRegEx_GetMatchIndexes bool GetMatch(size_t index = 0) const ! size_t GetMatchCount() const // Note: only need this form of Matches bool Matches(const wxString &text, int flags = 0) const + // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // int Replace(wxString* text, const wxString& replacement, size_t maxMatches = 0) const ! int Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // %override [int, string text] ReplaceAll(const wxString& text, const wxString& replacement) const ! // int ReplaceAll(wxString* text, const wxString& replacement) const ! int ReplaceAll(const wxString& text, const wxString& replacement) const ! // %override [int, string text] ReplaceFirst(const wxString& text, const wxString& replacement) const ! // int ReplaceFirst(wxString* text, const wxString& replacement) const ! int ReplaceFirst(const wxString& text, const wxString& replacement) const ! %endclass Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** dialogs.i 31 May 2007 17:18:46 -0000 1.28 --- dialogs.i 31 May 2007 21:38:39 -0000 1.29 *************** *** 240,243 **** --- 240,244 ---- wxString GetDirectory() const wxString GetFilename() const + // %override [lua string table] wxFileDialog::GetFilenames() // void GetFilenames(wxArrayString& filenames) const *************** *** 247,250 **** --- 248,252 ---- wxString GetMessage() const wxString GetPath() const + // %override [lua string table] wxFileDialog::GetPaths() // void GetPaths(wxArrayString& paths) const *************** *** 328,332 **** %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) --- 330,335 ---- %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! // wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) *************** *** 490,495 **** void Resume() // %override [bool, bool skip] Update(int value, const wxString& newmsg = "") ! bool Update(int value, const wxString& newmsg = "", bool* skip = NULL) %endclass --- 493,501 ---- void Resume() + // %override [bool, bool skip] Update(int value, const wxString& newmsg = "") ! // bool Update(int value, const wxString& newmsg = "", bool* skip = NULL) ! bool Update(int value, const wxString& newmsg = "") ! %endclass Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xml.i 31 May 2007 17:18:47 -0000 1.9 --- xml.i 31 May 2007 21:38:40 -0000 1.10 *************** *** 34,64 **** %class %delete %noclassinfo %encapsulate wxXmlNode wxXmlNode() ! wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); ! wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next); ! void AddChild(wxXmlNode *child); ! void InsertChild(wxXmlNode *child, wxXmlNode *before_node); ! bool RemoveChild(wxXmlNode *child); ! void AddProperty(const wxString& name, const wxString& value); ! bool DeleteProperty(const wxString& name); ! wxXmlNodeType GetType() const; ! wxString GetName() const; ! wxString GetContent() const; ! wxXmlNode *GetParent() const; ! wxXmlNode *GetNext() const; ! wxXmlNode *GetChildren() const; ! wxXmlProperty *GetProperties() const; ! // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) const; ! %rename GetPropValPtr bool GetPropVal(const wxString& propName, wxString *value) const; ! wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const; ! bool HasProp(const wxString& propName) const; ! void SetType(wxXmlNodeType type); ! void SetName(const wxString& name); ! void SetContent(const wxString& con); ! void SetParent(wxXmlNode *parent); ! void SetNext(wxXmlNode *next); ! void SetChildren(wxXmlNode *child); ! void SetProperties(wxXmlProperty *prop); ! void AddProperty(wxXmlProperty *prop); %endclass --- 34,67 ---- %class %delete %noclassinfo %encapsulate wxXmlNode wxXmlNode() ! wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString) ! wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next) ! void AddChild(wxXmlNode *child) ! void InsertChild(wxXmlNode *child, wxXmlNode *before_node) ! bool RemoveChild(wxXmlNode *child) ! void AddProperty(const wxString& name, const wxString& value) ! bool DeleteProperty(const wxString& name) ! wxXmlNodeType GetType() const ! wxString GetName() const ! wxString GetContent() const ! wxXmlNode *GetParent() const ! wxXmlNode *GetNext() const ! wxXmlNode *GetChildren() const ! wxXmlProperty *GetProperties() const ! ! // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) const ! // bool GetPropVal(const wxString& propName, wxString *value) const ! %override_name wxLua_wxXmlNode_GetPropValPtr bool GetPropVal(const wxString& propName) const ! ! wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const ! bool HasProp(const wxString& propName) const ! void SetType(wxXmlNodeType type) ! void SetName(const wxString& name) ! void SetContent(const wxString& con) ! void SetParent(wxXmlNode *parent) ! void SetNext(wxXmlNode *next) ! void SetChildren(wxXmlNode *child) ! void SetProperties(wxXmlProperty *prop) ! void AddProperty(wxXmlProperty *prop) %endclass Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** windows.i 31 May 2007 17:18:47 -0000 1.34 --- windows.i 31 May 2007 21:38:40 -0000 1.35 *************** *** 16,20 **** %include "wx/utils.h" ! %class %delete %noclassinfo %encapsulate wxWindowDisabler // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxWindowDisabler(wxWindow *winToSkip = NULL) --- 16,20 ---- %include "wx/utils.h" ! %class %noclassinfo %encapsulate %delete wxWindowDisabler // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxWindowDisabler(wxWindow *winToSkip = NULL) *************** *** 87,92 **** !%wxchkver_2_5 void Clear() %wxchkver_2_5 void ClearBackground() // %override [int x, int y] ClientToScreen(int x, int y) const ! %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const //(int* x, int* y) const virtual wxPoint ClientToScreen(const wxPoint& pt) const virtual bool Close(bool force = false) --- 87,95 ---- !%wxchkver_2_5 void Clear() %wxchkver_2_5 void ClearBackground() + // %override [int x, int y] ClientToScreen(int x, int y) const ! // virtual void ClientToScreen(int* x, int* y) const ! %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const ! virtual wxPoint ClientToScreen(const wxPoint& pt) const virtual bool Close(bool force = false) *************** *** 124,129 **** wxWindowList& GetChildren() //static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) ! // %override [int width, int height] wxWindow::GetClientSize() const ! %rename GetClientSizeWH virtual void GetClientSize(int* width, int* height) const wxSize GetClientSize() const !%wxchkver_2_6 wxLayoutConstraints* GetConstraints() const // deprecated use sizers --- 127,135 ---- wxWindowList& GetChildren() //static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) ! ! // %override [int width, int height] wxWindow::GetClientSizeWH() const ! // virtual void GetClientSize(int* width, int* height) const ! %rename GetClientSizeWH virtual void GetClientSize() const ! wxSize GetClientSize() const !%wxchkver_2_6 wxLayoutConstraints* GetConstraints() const // deprecated use sizers *************** *** 146,151 **** virtual wxString GetName() const virtual wxWindow* GetParent() const ! // %override [int x, int y] GetPosition(int x, int y) const - specify dummy x to get overload ! %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition(int x, int y=0) const // (int* x, int* y) const wxPoint GetPosition() const virtual wxRect GetRect() const --- 152,160 ---- virtual wxString GetName() const virtual wxWindow* GetParent() const ! ! // %override [int x, int y] GetPosition(int x, int y) const ! // virtual void GetPosition(int* x, int* y) const ! %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const ! wxPoint GetPosition() const virtual wxRect GetRect() const *************** *** 154,170 **** virtual int GetScrollThumb(int orientation) virtual wxSize GetSize() const ! // %override [int width, int height] wxWindow::GetSize() const // virtual void GetSize(int* width, int* height) const ! %rename GetSizeWH virtual void GetSize(int* width, int* height) const wxSizer* GetSizer() const // %override [int x, int y, int descent, int externalLeading] int wxWindow::GetTextExtent(const wxString& string, const wxFont* font = NULL ) const // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const ! virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const !%wxchkver_2_7 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const wxValidator* GetValidator() const ! // %override [int width, int height] wxWindow::GetVirtualSize() const - specify dummy width to get overload ! %override_name wxLua_wxWindow_GetVirtualSizeWH void GetVirtualSize(int width, int height=0) const // (int* width, int* height) const wxSize GetVirtualSize() const long GetWindowStyleFlag() const --- 163,187 ---- virtual int GetScrollThumb(int orientation) virtual wxSize GetSize() const ! ! // %override [int width, int height] wxWindow::GetSizeWH() const // virtual void GetSize(int* width, int* height) const ! %rename GetSizeWH virtual void GetSize() const ! wxSizer* GetSizer() const + // %override [int x, int y, int descent, int externalLeading] int wxWindow::GetTextExtent(const wxString& string, const wxFont* font = NULL ) const // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const ! // virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const ! virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const ! !%wxchkver_2_7 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const wxValidator* GetValidator() const ! ! // %override [int width, int height] wxWindow::GetVirtualSizeWH() const ! // void GetVirtualSize(int* width, int* height) const ! %override_name wxLua_wxWindow_GetVirtualSizeWH %rename GetVirtualSizeWH void GetVirtualSize() const ! wxSize GetVirtualSize() const long GetWindowStyleFlag() const *************** *** 206,211 **** virtual bool Reparent(wxWindow* newParent) virtual wxPoint ScreenToClient(const wxPoint& pt) const ! // %override %rename [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const // (int* x, int* y) const virtual bool ScrollLines(int lines) virtual bool ScrollPages(int pages) --- 223,231 ---- virtual bool Reparent(wxWindow* newParent) virtual wxPoint ScreenToClient(const wxPoint& pt) const ! ! // %override [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! // virtual void ScreenToClient(int* x, int* y) const ! %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const ! virtual bool ScrollLines(int lines) virtual bool ScrollPages(int pages) *************** *** 458,463 **** //int GetSelection() const wxColour GetThemeBackgroundColour() const // %override [int page, int flags] HitTest(const wxPoint& pt) ! int HitTest(const wxPoint& pt, long *flags = NULL) //bool InsertPage(int index, wxNotebookPage* page, const wxString& text, bool select = false, int imageId = -1) //bool RemovePage(int page) --- 478,486 ---- //int GetSelection() const wxColour GetThemeBackgroundColour() const + // %override [int page, int flags] HitTest(const wxPoint& pt) ! // int HitTest(const wxPoint& pt, long *flags = NULL) ! int HitTest(const wxPoint& pt) ! //bool InsertPage(int index, wxNotebookPage* page, const wxString& text, bool select = false, int imageId = -1) //bool RemovePage(int page) *************** *** 786,800 **** // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! void CalcScrolledPosition( int x, int y, int *xx, int *yy) const // %override [int xx, int yy] void CalcUnscrolledPosition(int x, int y) const ! void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const bool Create(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHSCROLL | wxVSCROLL, const wxString& name = "wxScrolledWindow") void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const // %override [int x, int y] GetViewStart() const ! void GetViewStart(int* x, int* y) const // %override [int x, int y] GetVirtualSize() const ! void GetVirtualSize(int* x, int* y) const bool IsRetained() const --- 809,832 ---- // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! // void CalcScrolledPosition( int x, int y, int *xx, int *yy) const ! void CalcScrolledPosition( int x, int y) const ! // %override [int xx, int yy] void CalcUnscrolledPosition(int x, int y) const ! // void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const ! void CalcUnscrolledPosition( int x, int y) const ! bool Create(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHSCROLL | wxVSCROLL, const wxString& name = "wxScrolledWindow") void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! // void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const ! void GetScrollPixelsPerUnit() const ! // %override [int x, int y] GetViewStart() const ! // void GetViewStart(int* x, int* y) const ! void GetViewStart() const ! // %override [int x, int y] GetVirtualSize() const ! // void GetVirtualSize(int* x, int* y) const ! void GetVirtualSize() const bool IsRetained() const Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** gdi.i 31 May 2007 17:18:46 -0000 1.46 --- gdi.i 31 May 2007 21:38:39 -0000 1.47 *************** *** 22,27 **** --- 22,30 ---- // %override [int, x, int y] wxPoint::GetXY() + // wxLua added function int GetXY() const + // %override void wxPoint::Set(int x, int y) + // wxLua added function void Set(int x, int y) *************** *** 167,173 **** wxBitmap ConvertToBitmap() const wxRect GetBox() const ! // %override [int x, int y, int width, int height] wxRegion::GetBoxCoords() ! //%rename GetBoxCoords void GetBox(int &x, int &y, int &width, int &height) ! %rename GetBoxCoords void GetBox() bool Intersect(long x, long y, long width, long height) bool Intersect(const wxRect& rect) --- 170,178 ---- wxBitmap ConvertToBitmap() const wxRect GetBox() const ! ! // %override [int x, int y, int width, int height] wxRegion::GetBoxXYWH() ! // void GetBox(int &x, int &y, int &width, int &height) ! %rename GetBoxXYWH void GetBox() ! bool Intersect(long x, long y, long width, long height) bool Intersect(const wxRect& rect) *************** *** 202,207 **** --- 207,214 ---- bool HaveRects() void Reset() + // %override wxRegionIterator::Next() is ++ operator void Next() // operator++ + %endclass *************** *** 539,545 **** wxFontEncoding CharsetToEncoding(const wxString &charset, bool interactive = true) static wxFontMapper *Get() // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) // %rename GetAltForEncodingInternal bool GetAltForEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info, const wxString &faceName = "", bool interactive = true) static wxString GetDefaultConfigPath() static wxFontEncoding GetEncoding(size_t n) --- 546,557 ---- wxFontEncoding CharsetToEncoding(const wxString &charset, bool interactive = true) static wxFontMapper *Get() + // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! // bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) ! bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! ! // This function is really for wxWidgets internal use // %rename GetAltForEncodingInternal bool GetAltForEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info, const wxString &faceName = "", bool interactive = true) + static wxString GetDefaultConfigPath() static wxFontEncoding GetEncoding(size_t n) *************** *** 929,939 **** wxBitmap() - %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(void * data, int type, int width, int height, int depth = -1) wxBitmap(const wxBitmap& bitmap) wxBitmap( int width, int height, int depth = -1) wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) // wxBitmap(const char **data) Load from XPM %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable) ! wxBitmap(const wxImage &image, int depth = -1) //%win static void AddHandler(wxBitmapHandler* handler) --- 941,956 ---- wxBitmap() wxBitmap(const wxBitmap& bitmap) wxBitmap( int width, int height, int depth = -1) wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) + wxBitmap(const wxImage &image, int depth = -1) + + // %override wxBitmap(LuaTable stringTable where each index is a row in the image) // wxBitmap(const char **data) Load from XPM %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable) ! ! // %override wxBitmap(lua string of data, int type, int width, int height, int depth = -1) ! // wxBitmap(const void* data, int type, int width, int height, int depth = -1) ! %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(const wxString& data, int type, int width, int height, int depth = -1) //%win static void AddHandler(wxBitmapHandler* handler) *************** *** 1092,1098 **** wxIcon GetIcon(int index) const int GetImageCount() // %override [int width, int height] wxImageList::GetSize(int index) ! //void GetSize(int index, int& width, int& height) void GetSize(int index) bool Remove(int index) bool RemoveAll() --- 1109,1117 ---- wxIcon GetIcon(int index) const int GetImageCount() + // %override [int width, int height] wxImageList::GetSize(int index) ! // void GetSize(int index, int& width, int& height) void GetSize(int index) + bool Remove(int index) bool RemoveAll() *************** *** 1262,1273 **** //void GetSizeMM(wxCoord *width, wxCoord *height) const // wxSize GetSizeMM() const const wxColour& GetTextBackground() const // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) ! void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) %wxchkver_2_8 %rename GetTextExtentSize wxSize GetTextExtent(const wxString& string) const // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) ! %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *heightLine = NULL, wxFont *font = NULL) const %wxchkver_2_8 %rename GetMultiLineTextExtentSize wxSize GetMultiLineTextExtent(const wxString& string) const const wxColour& GetTextForeground() void GetUserScale(double *x, double *y) --- 1281,1297 ---- //void GetSizeMM(wxCoord *width, wxCoord *height) const // wxSize GetSizeMM() const const wxColour& GetTextBackground() const + // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) ! void GetTextExtent(const wxString& string, wxFont *font = NULL) ! %wxchkver_2_8 %rename GetTextExtentSize wxSize GetTextExtent(const wxString& string) const + // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) ! %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxFont *font = NULL) const ! %wxchkver_2_8 %rename GetMultiLineTextExtentSize wxSize GetMultiLineTextExtent(const wxString& string) const + const wxColour& GetTextForeground() void GetUserScale(double *x, double *y) *************** *** 1432,1442 **** bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() // %override [int x, int y] wxCaret::GetPositionXY() ! //%rename GetPositionXY void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() wxPoint GetPosition() ! // %override [int x, int y] wxCaret::GetSizeWH void GetSize() ! //%rename GetSizeWH void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() wxSize GetSize() wxWindow *GetWindow() --- 1456,1470 ---- bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() + // %override [int x, int y] wxCaret::GetPositionXY() ! // void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() + wxPoint GetPosition() ! ! // %override [int x, int y] wxCaret::GetSizeWH() ! // void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() + wxSize GetSize() wxWindow *GetWindow() *************** *** 1457,1461 **** %include "wx/caret.h" ! %class %delete %noclassinfo %encapsulate wxCaretSuspend // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxCaretSuspend(wxWindow *win = NULL) --- 1485,1489 ---- %include "wx/caret.h" ! %class %noclassinfo %encapsulate %delete wxCaretSuspend // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxCaretSuspend(wxWindow *win = NULL) *************** *** 1493,1498 **** %class wxGLCanvas, wxWindow ! // %override Note: attribList[] parameter is a lua table with integer indexes ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) --- 1521,1529 ---- %class wxGLCanvas, wxWindow ! // %override wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) ! // Note: attribList[] parameter is a lua table with integer indexes ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** html.i 31 May 2007 17:18:46 -0000 1.17 --- html.i 31 May 2007 21:38:39 -0000 1.18 *************** *** 23,32 **** --- 23,42 ---- // %override [bool, int pagebreak] wxHtmlCell::AdjustPagebreak(int pagebreak) + + // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) + // bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) %not_overload !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) + + // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) + // bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) + //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info) + // %override wxHtmlCell* Find(int condition, [none, string, or int]) + // virtual const wxHtmlCell* Find(int condition, void *param = 0) virtual const wxHtmlCell* Find(int condition, void *param = 0) + int GetDescent() const wxHtmlCell* GetFirstChild() *************** *** 83,90 **** wxString GetName() const wxString GetParam(const wxString& par, bool with_commas = false) const // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! bool GetParamAsColour(const wxString& par, wxColour *clr) const // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! bool GetParamAsInt(const wxString& par, int *value) const bool HasEnding() const bool HasParam(const wxString& par) const --- 93,105 ---- wxString GetName() const wxString GetParam(const wxString& par, bool with_commas = false) const + // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! // bool GetParamAsColour(const wxString& par, wxColour *clr) const ! bool GetParamAsColour(const wxString& par) const ! // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! // bool GetParamAsInt(const wxString& par, int *value) const ! bool GetParamAsInt(const wxString& par) const ! bool HasEnding() const bool HasParam(const wxString& par) const *************** *** 168,173 **** void SelectWord(const wxPoint& pos) void SetBorders(int b) ! // %override void SetFonts(wxString normal_face, wxString fixed_face, {lua int table}) ! void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) bool SetPage(const wxString& source) void SetRelatedFrame(wxFrame* frame, const wxString& format) --- 183,191 ---- void SelectWord(const wxPoint& pos) void SetBorders(int b) ! ! // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) ! void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) ! bool SetPage(const wxString& source) void SetRelatedFrame(wxFrame* frame, const wxString& format) *************** *** 244,249 **** void SetFontSize(int s) void SetFontUnderlined(int x) ! // %override void SetFonts(wxString normal_face, wxString fixed_face, {lua int table}) ! void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetLink(const wxHtmlLinkInfo& link) void SetLinkColor(const wxColour& clr) --- 262,270 ---- void SetFontSize(int s) void SetFontUnderlined(int x) ! ! // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) ! void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) ! void SetLink(const wxHtmlLinkInfo& link) void SetLinkColor(const wxColour& clr) Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** datetime.i 31 May 2007 17:18:46 -0000 1.25 --- datetime.i 31 May 2007 21:38:39 -0000 1.26 *************** *** 138,148 **** wxDateTime() ! %constructor wxDateTimeFromTime(time_t dateTime) ! %constructor wxDateTimeFromJDN(double dateTime) ! %constructor wxDateTimeFromHMS(int hour, int minute, int second, int millisec) ! %constructor wxDateTimeFromDMY(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() ! %rename SetToTime wxDateTime& Set(time_t time) %rename SetToJDN wxDateTime& Set(double dateTime) %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) --- 138,148 ---- wxDateTime() ! wxDateTime(time_t dateTime) // use with lua's os.time() on MSW, Linux, others? ! %rename wxDateTimeFromJDN wxDateTime(double dateTime) ! %rename wxDateTimeFromHMS wxDateTime(int hour, int minute, int second, int millisec) ! %rename wxDateTimeFromDMY wxDateTime(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() ! wxDateTime& Set(time_t time) // use with lua's os.time() on MSW, Linux, others? %rename SetToJDN wxDateTime& Set(double dateTime) %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) *************** *** 426,432 **** --- 426,434 ---- void SetHoliday(size_t day) void ResetAttr(size_t day) + // %override [wxCalendarHitTestResult, wxDateTime date, wxDateTime::WeekDay wd] wxCalendarCtrl::HitTest(const wxPoint& pos) // wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime* date = NULL, wxDateTime::WeekDay* wd = NULL) wxCalendarHitTestResult HitTest(const wxPoint& pos) + %endclass *************** *** 515,518 **** --- 517,521 ---- // bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const + wxDateTime GetValue() const void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** appframe.i 31 May 2007 17:18:46 -0000 1.32 --- appframe.i 31 May 2007 21:38:38 -0000 1.33 *************** *** 129,133 **** // wxLogNull ! %class %delete %noclassinfo %encapsulate wxLogNull // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxLogNull() --- 129,133 ---- // wxLogNull ! %class %noclassinfo %encapsulate %delete wxLogNull // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxLogNull() *************** *** 288,294 **** void SetStatusBarPane(int n) virtual void SetStatusText(const wxString& text, int number = 0) // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! //virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) void SetToolBar(wxToolBar* toolBar) %endclass --- 288,296 ---- void SetStatusBarPane(int n) virtual void SetStatusText(const wxString& text, int number = 0) + // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! // virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) + void SetToolBar(wxToolBar* toolBar) %endclass *************** *** 336,350 **** void PopStatusText(int field = 0) void PushStatusText(const wxString& string, int field = 0) // %override void wxStatusBar::SetFieldsCount(either a single number or a lua table with number indexes and values) // virtual void SetFieldsCount(int number = 1, int* widths = NULL) virtual void SetFieldsCount(LuaTable intTable) void SetMinHeight(int height) virtual void SetStatusText(const wxString& text, int i = 0) // %override void wxStatusBar::SetStatusWidths(lua table with number indexes a... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-05-31 21:39:26
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/bindings/wxstc Modified Files: stc.i Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** stc.i 31 May 2007 17:18:46 -0000 1.9 --- stc.i 31 May 2007 21:38:38 -0000 1.10 *************** *** 1800,1804 **** //#else // %override [int linePos] GetCurLine() ! wxString GetCurLine(int* linePos=NULL); //#endif --- 1800,1805 ---- //#else // %override [int linePos] GetCurLine() ! // wxString GetCurLine(int* linePos=NULL); ! wxString GetCurLine(); //#endif *************** *** 1952,1956 **** --- 1953,1959 ---- // Set the styles for a segment of the document. + // %override [lua string styleBytes] SetStyleBytes(int length, lua string styleBytes) + // void SetStyleBytes(int length, char* styleBytes); void SetStyleBytes(int length, char* styleBytes); *************** *** 3097,3101 **** //#else // %override [int startPos, int endPos] GetSelection() ! void GetSelection(int* startPos, int* endPos); //#endif --- 3100,3105 ---- //#else // %override [int startPos, int endPos] GetSelection() ! // void GetSelection(int* startPos, int* endPos); ! void GetSelection(); //#endif |
|
From: John L. <jr...@us...> - 2007-05-31 21:39:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/modules/wxluadebug/src Modified Files: wxlstack.cpp Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlstack.cpp 31 May 2007 17:18:54 -0000 1.2 --- wxlstack.cpp 31 May 2007 21:38:49 -0000 1.3 *************** *** 104,108 **** m_findCaseCheckBox = new wxCheckBox(panel, ID_WXLUA_STACK_FINDCASE_CHECKBOX, ! wxT("Case")); m_findCaseCheckBox->SetValue(true); m_findCaseCheckBox->SetToolTip(wxT("Match case when finding")); --- 104,108 ---- m_findCaseCheckBox = new wxCheckBox(panel, ID_WXLUA_STACK_FINDCASE_CHECKBOX, ! wxT("Match case")); m_findCaseCheckBox->SetValue(true); m_findCaseCheckBox->SetToolTip(wxT("Match case when finding")); *************** *** 148,152 **** m_listCtrl->SetColumnWidth(0, txt_width); m_listCtrl->SetColumnWidth(3, txt_width); // make it wide since it's the last ! m_listCtrl->GetTextExtent(wxT("55:5555"), &txt_width, &txt_height); m_listCtrl->SetColumnWidth(1, txt_width); m_listCtrl->GetTextExtent(wxT("Light User DataX"), &txt_width, &txt_height); --- 148,152 ---- m_listCtrl->SetColumnWidth(0, txt_width); m_listCtrl->SetColumnWidth(3, txt_width); // make it wide since it's the last ! m_listCtrl->GetTextExtent(wxT("555:5555"), &txt_width, &txt_height); m_listCtrl->SetColumnWidth(1, txt_width); m_listCtrl->GetTextExtent(wxT("Light User DataX"), &txt_width, &txt_height); |
|
From: John L. <jr...@us...> - 2007-05-31 21:39:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** stc.cpp 31 May 2007 17:18:54 -0000 1.31 --- stc.cpp 31 May 2007 21:38:47 -0000 1.32 *************** *** 1920,1926 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCurLine[] = { &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxStyledTextCtrl_GetCurLine(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_GetCurLine[1] = {{ wxLua_wxStyledTextCtrl_GetCurLine, 0, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCurLine }}; // %override wxLua_wxStyledTextCtrl_GetCurLine --- 1920,1925 ---- } static int LUACALL wxLua_wxStyledTextCtrl_GetCurLine(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_GetCurLine[1] = {{ wxLua_wxStyledTextCtrl_GetCurLine, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxStyledTextCtrl_GetCurLine *************** *** 2998,3004 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetSelection[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxStyledTextCtrl_GetSelection(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_GetSelection[1] = {{ wxLua_wxStyledTextCtrl_GetSelection, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_GetSelection }}; // %override wxLua_wxStyledTextCtrl_GetSelection --- 2997,3002 ---- } static int LUACALL wxLua_wxStyledTextCtrl_GetSelection(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_GetSelection[1] = {{ wxLua_wxStyledTextCtrl_GetSelection, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxStyledTextCtrl_GetSelection |
|
From: John L. <jr...@us...> - 2007-05-31 21:39:24
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/samples Modified Files: debug.wx.lua editor.wx.lua wxluasudoku.wx.lua Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** wxluasudoku.wx.lua 31 May 2007 17:18:56 -0000 1.67 --- wxluasudoku.wx.lua 31 May 2007 21:38:49 -0000 1.68 *************** *** 4408,4423 **** local _ if config:HasEntry(path.."/LastOpenedFilepath") then ! _, sudokuGUI.filePath = config:Read(path.."/LastOpenedFilepath") end if config:HasEntry(path.."/LastOpenedFilename") then ! _, sudokuGUI.fileName = config:Read(path.."/LastOpenedFilename") end if config:HasEntry(path.."/GenerateDifficulty") then ! _, sudokuGUI.difficulty = config:ReadInt(path.."/GenerateDifficulty") end else config:Write(path.."/LastOpenedFilepath", sudokuGUI.filePath) config:Write(path.."/LastOpenedFilename", sudokuGUI.fileName) ! config:WriteInt(path.."/GenerateDifficulty", sudokuGUI.difficulty) end --- 4408,4423 ---- local _ if config:HasEntry(path.."/LastOpenedFilepath") then ! _, sudokuGUI.filePath = config:Read(path.."/LastOpenedFilepath", "") end if config:HasEntry(path.."/LastOpenedFilename") then ! _, sudokuGUI.fileName = config:Read(path.."/LastOpenedFilename", "") end if config:HasEntry(path.."/GenerateDifficulty") then ! _, sudokuGUI.difficulty = config:Read(path.."/GenerateDifficulty", 0) end else config:Write(path.."/LastOpenedFilepath", sudokuGUI.filePath) config:Write(path.."/LastOpenedFilename", sudokuGUI.fileName) ! config:Write(path.."/GenerateDifficulty", sudokuGUI.difficulty) end *************** *** 4443,4451 **** if read then if config:HasEntry(key) then ! local _, v = config:ReadInt(key) sudokuGUI.CheckMenuItem(pref, inttobool(v)) end else ! config:WriteInt(key, booltoint(sudokuGUI.IsCheckedMenuItem(pref))) end end --- 4443,4451 ---- if read then if config:HasEntry(key) then ! local _, v = config:Read(key, 0) sudokuGUI.CheckMenuItem(pref, inttobool(v)) end else ! config:Write(key, booltoint(sudokuGUI.IsCheckedMenuItem(pref))) end end Index: debug.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** debug.wx.lua 31 May 2007 17:18:55 -0000 1.10 --- debug.wx.lua 31 May 2007 21:38:49 -0000 1.11 *************** *** 385,392 **** frame:Connect(wxID_NOPROMPT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! if config:ReadInt("/Controls/Check", 1) == 1 then ! config:WriteInt("/Controls/Check", 0) else ! config:WriteInt("/Controls/Check", 1) end end ) --- 385,392 ---- frame:Connect(wxID_NOPROMPT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! if config:Read("/Controls/Check", 1) == 1 then ! config:Write("/Controls/Check", 0) else ! config:Write("/Controls/Check", 1) end end ) *************** *** 418,425 **** x, y = frame:GetPosition() ! config:WriteInt("/MainFrame/x", x) ! config:WriteInt("/MainFrame/y", y) ! config:WriteInt("/MainFrame/w", w) ! config:WriteInt("/MainFrame/h", h) config:Set():Destroy() --- 418,425 ---- x, y = frame:GetPosition() ! config:Write("/MainFrame/x", x) ! config:Write("/MainFrame/y", y) ! config:Write("/MainFrame/w", w) ! config:Write("/MainFrame/h", h) config:Set():Destroy() *************** *** 435,439 **** causeError() end) ! if config:ReadInt("/Controls/Check", 1) == 1 then wx.wxMessageBox([[You can disable this message box by unchecking the checkbox in the main window (of course, a real --- 435,439 ---- causeError() end) ! if config:Read("/Controls/Check", 1) == 1 then wx.wxMessageBox([[You can disable this message box by unchecking the checkbox in the main window (of course, a real *************** *** 447,454 **** local x, y, w, h ! x = config:ReadInt("x", 50) ! y = config:ReadInt("y", 50) ! w = config:ReadInt("w", 350) ! h = config:ReadInt("h", 200) frame:Move(x, y) --- 447,454 ---- local x, y, w, h ! x = config:Read("x", 50) ! y = config:Read("y", 50) ! w = config:Read("w", 350) ! h = config:Read("h", 200) frame:Move(x, y) Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** editor.wx.lua 31 May 2007 17:18:55 -0000 1.50 --- editor.wx.lua 31 May 2007 21:38:49 -0000 1.51 *************** *** 247,255 **** config:SetPath("/"..windowName) ! local _, s = config:ReadInt("s", -1) ! local _, x = config:ReadInt("x", 0) ! local _, y = config:ReadInt("y", 0) ! local _, w = config:ReadInt("w", 0) ! local _, h = config:ReadInt("h", 0) if (s ~= -1) and (s ~= 2) then --- 247,255 ---- config:SetPath("/"..windowName) ! local _, s = config:Read("s", -1) ! local _, x = config:Read("x", 0) ! local _, y = config:Read("y", 0) ! local _, w = config:Read("w", 0) ! local _, h = config:Read("h", 0) if (s ~= -1) and (s ~= 2) then *************** *** 285,295 **** end ! config:WriteInt("s", s) if s == 0 then ! config:WriteInt("x", x) ! config:WriteInt("y", y) ! config:WriteInt("w", w) ! config:WriteInt("h", h) end --- 285,295 ---- end ! config:Write("s", s) if s == 0 then ! config:Write("x", x) ! config:Write("y", y) ! config:Write("w", w) ! config:Write("h", h) end *************** *** 2327,2331 **** ConfigSaveFramePosition(frame, "MainFrame") ! config:Set():Destroy() event:Skip() CloseWatchWindow() --- 2327,2331 ---- ConfigSaveFramePosition(frame, "MainFrame") ! config:Set():Delete() event:Skip() CloseWatchWindow() |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** xml.cpp 19 Mar 2007 03:47:20 -0000 1.28 --- xml.cpp 31 May 2007 17:18:53 -0000 1.29 *************** *** 35,40 **** int s_wxluatag_wxXmlNode = -1; - #if wxLUA_USE_wxXMLResource && wxUSE_XML static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 }; // void AddChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) --- 35,42 ---- int s_wxluatag_wxXmlNode = -1; static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 }; [...1851 lines suppressed...] ! { WXLUAMETHOD_METHOD, "SetFlags", s_wxluafunc_wxLua_wxXmlResource_SetFlags, 1 }, ! { WXLUAMETHOD_METHOD, "Unload", s_wxluafunc_wxLua_wxXmlResource_Unload, 1 }, ! #if (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_CONSTRUCTOR, "wxXmlResource", s_wxluafunc_wxLua_wxXmlResource_constructor_overload, s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count }, ! #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) ! ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]) - 1; + + + WXLUADEFINE wxXmlResource_enums[] = { + { NULL, 0, }, + }; + + int wxXmlResource_enumCount = sizeof(wxXmlResource_enums)/sizeof(wxXmlResource_enums[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** defsutil.cpp 19 May 2007 02:05:46 -0000 1.31 --- defsutil.cpp 31 May 2007 17:18:50 -0000 1.32 *************** *** 36,39 **** --- 36,42 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, 0, 0, s_wxluaargArray_None }}; + // void CloseOutput() static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) *************** *** 50,54 **** #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! #if wxLUA_USE_wxProcess static int LUACALL wxLua_wxProcess_Delete(lua_State *L) { --- 53,59 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! static int LUACALL wxLua_wxProcess_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Delete[1] = {{ wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxProcess_Delete(lua_State *L) { *************** *** 64,67 **** --- 69,75 ---- } + static int LUACALL wxLua_wxProcess_Detach(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, 0, 0, s_wxluaargArray_None }}; + // void Detach() static int LUACALL wxLua_wxProcess_Detach(lua_State *L) *************** *** 76,82 **** } ! #endif // wxLUA_USE_wxProcess #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) --- 84,110 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Exists[] = { &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxProcess_Exists(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Exists[1] = {{ wxLua_wxProcess_Exists, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }}; ! ! // static bool Exists(int pid) ! static int LUACALL wxLua_wxProcess_Exists(lua_State *L) ! { ! bool returns; ! // int pid ! int pid = (int)wxlua_getnumbertype(L, 1); ! // call Exists ! returns = wxProcess::Exists(pid); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) + static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluaargArray_None }}; + // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) *************** *** 94,97 **** --- 122,128 ---- } + static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, 0, 0, s_wxluaargArray_None }}; + // wxInputStream *GetInputStream() const static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) *************** *** 109,112 **** --- 140,146 ---- } + static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluaargArray_None }}; + // wxOutputStream *GetOutputStream() const static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) *************** *** 127,130 **** --- 161,167 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluaargArray_None }}; + // bool IsErrorAvailable() const static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) *************** *** 142,145 **** --- 179,185 ---- } + static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluaargArray_None }}; + // bool IsInputAvailable() const static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) *************** *** 157,160 **** --- 197,203 ---- } + static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluaargArray_None }}; + // bool IsInputOpened() const static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) *************** *** 174,178 **** #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! #if wxLUA_USE_wxProcess // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) --- 217,223 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, 0, 0, s_wxluaargArray_None }}; ! // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) *************** *** 190,194 **** --- 235,266 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxProcess_Kill(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }}; + + // static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN) + static int LUACALL wxLua_wxProcess_Kill(lua_State *L) + { + wxKillError returns; + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxKILL_NOCHILDREN + int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxKILL_NOCHILDREN); + // wxSignal sig = wxSIGTERM + wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getenumerationtype(L, 2) : wxSIGTERM); + // int pid + int pid = (int)wxlua_getnumbertype(L, 1); + // call Kill + returns = wxProcess::Kill(pid, sig, flags); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Open[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxProcess_Open(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Open[1] = {{ wxLua_wxProcess_Open, 1, 2, s_wxluatagArray_wxLua_wxProcess_Open }}; + // static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC) static int LUACALL wxLua_wxProcess_Open(lua_State *L) *************** *** 199,205 **** int argCount = lua_gettop(L); // int flags = wxEXEC_ASYNC ! int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxEXEC_ASYNC); // const wxString cmd ! const wxString cmd = wxlState.GetwxStringType(2); // call Open returns = (wxProcess *)wxProcess::Open(cmd, flags); --- 271,277 ---- int argCount = lua_gettop(L); // int flags = wxEXEC_ASYNC ! int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxEXEC_ASYNC); // const wxString cmd ! const wxString cmd = wxlState.GetwxStringType(1); // call Open returns = (wxProcess *)wxProcess::Open(cmd, flags); *************** *** 210,213 **** --- 282,288 ---- } + static int LUACALL wxLua_wxProcess_Redirect(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, 0, 0, s_wxluaargArray_None }}; + // void Redirect() static int LUACALL wxLua_wxProcess_Redirect(lua_State *L) *************** *** 222,229 **** } - #endif // wxLUA_USE_wxProcess #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 }; // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) --- 297,306 ---- } #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 }; + static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_SetPipeStreams[1] = {{ wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }}; + // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) *************** *** 246,254 **** #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) - #if wxLUA_USE_wxProcess static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 }; // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) { wxLuaState wxlState(L); wxProcess *returns; --- 323,334 ---- #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxProcess_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_constructor[1] = {{ wxLua_wxProcess_constructor, 0, 2, s_wxluatagArray_wxLua_wxProcess_constructor }}; + // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxProcess *returns; *************** *** 256,260 **** int argCount = lua_gettop(L); // int nId = wxID_ANY ! int nId = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : wxID_ANY); // wxEvtHandler parent = NULL wxEvtHandler * parent = (argCount >= 1 ? (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler) : NULL); --- 336,340 ---- int argCount = lua_gettop(L); // int nId = wxID_ANY ! int nId = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxID_ANY); // wxEvtHandler parent = NULL wxEvtHandler * parent = (argCount >= 1 ? (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler) : NULL); *************** *** 269,273 **** } - #endif // wxLUA_USE_wxProcess --- 349,352 ---- *************** *** 276,311 **** WXLUAMETHOD wxProcess_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, s_wxluaargArray_None }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, s_wxluaargArray_None }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluaargArray_None }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluaargArray_None }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "IsRedirected", wxLua_wxProcess_IsRedirected, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Open", wxLua_wxProcess_Open, 2, 1, s_wxluatagArray_wxLua_wxProcess_Open }, ! { LuaMethod, "Redirect", wxLua_wxProcess_Redirect, 0, 0, s_wxluaargArray_None }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]) - 1; #endif // wxLUA_USE_wxProcess --- 355,399 ---- WXLUAMETHOD wxProcess_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "CloseOutput", s_wxluafunc_wxLua_wxProcess_CloseOutput, 1 }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxProcess_Delete }, ! { WXLUAMETHOD_METHOD, "Detach", s_wxluafunc_wxLua_wxProcess_Detach, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Exists", s_wxluafunc_wxLua_wxProcess_Exists, 1 }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_METHOD, "GetErrorStream", s_wxluafunc_wxLua_wxProcess_GetErrorStream, 1 }, ! { WXLUAMETHOD_METHOD, "GetInputStream", s_wxluafunc_wxLua_wxProcess_GetInputStream, 1 }, ! { WXLUAMETHOD_METHOD, "GetOutputStream", s_wxluafunc_wxLua_wxProcess_GetOutputStream, 1 }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "IsErrorAvailable", s_wxluafunc_wxLua_wxProcess_IsErrorAvailable, 1 }, ! { WXLUAMETHOD_METHOD, "IsInputAvailable", s_wxluafunc_wxLua_wxProcess_IsInputAvailable, 1 }, ! { WXLUAMETHOD_METHOD, "IsInputOpened", s_wxluafunc_wxLua_wxProcess_IsInputOpened, 1 }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "IsRedirected", s_wxluafunc_wxLua_wxProcess_IsRedirected, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Kill", s_wxluafunc_wxLua_wxProcess_Kill, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Open", s_wxluafunc_wxLua_wxProcess_Open, 1 }, ! { WXLUAMETHOD_METHOD, "Redirect", s_wxluafunc_wxLua_wxProcess_Redirect, 1 }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_METHOD, "SetPipeStreams", s_wxluafunc_wxLua_wxProcess_SetPipeStreams, 1 }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_CONSTRUCTOR, "wxProcess", s_wxluafunc_wxLua_wxProcess_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]) - 1; + + + WXLUADEFINE wxProcess_enums[] = { + { NULL, 0, }, + }; + + int wxProcess_enumCount = sizeof(wxProcess_enums)/sizeof(wxProcess_enums[0]) - 1; #endif // wxLUA_USE_wxProcess *************** *** 319,323 **** int s_wxluatag_wxMouseState = -1; ! #if wxCHECK_VERSION(2,7,0) // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) --- 407,413 ---- int s_wxluatag_wxMouseState = -1; ! static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, 0, 0, s_wxluaargArray_None }}; ! // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) *************** *** 335,338 **** --- 425,431 ---- } + static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, 0, 0, s_wxluaargArray_None }}; + // bool CmdDown() static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L) *************** *** 350,353 **** --- 443,449 ---- } + static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, 0, 0, s_wxluaargArray_None }}; + // bool ControlDown() static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L) *************** *** 365,368 **** --- 461,467 ---- } + static int LUACALL wxLua_wxMouseState_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_Delete[1] = {{ wxLua_wxMouseState_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxMouseState_Delete(lua_State *L) { *************** *** 378,381 **** --- 477,483 ---- } + static int LUACALL wxLua_wxMouseState_GetX(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, 0, 0, s_wxluaargArray_None }}; + // wxCoord GetX() static int LUACALL wxLua_wxMouseState_GetX(lua_State *L) *************** *** 393,396 **** --- 495,501 ---- } + static int LUACALL wxLua_wxMouseState_GetY(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, 0, 0, s_wxluaargArray_None }}; + // wxCoord GetY() static int LUACALL wxLua_wxMouseState_GetY(lua_State *L) *************** *** 408,411 **** --- 513,519 ---- } + static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, 0, 0, s_wxluaargArray_None }}; + // bool LeftDown() static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L) *************** *** 423,426 **** --- 531,537 ---- } + static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, 0, 0, s_wxluaargArray_None }}; + // bool MetaDown() static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L) *************** *** 438,441 **** --- 549,555 ---- } + static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluaargArray_None }}; + // bool MiddleDown() static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L) *************** *** 453,456 **** --- 567,573 ---- } + static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, 0, 0, s_wxluaargArray_None }}; + // bool RightDown() static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L) *************** *** 469,472 **** --- 586,592 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetAltDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetAltDown[1] = {{ wxLua_wxMouseState_SetAltDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }}; + // void SetAltDown(bool down) static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L) *************** *** 474,478 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 594,598 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 484,487 **** --- 604,610 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetControlDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetControlDown[1] = {{ wxLua_wxMouseState_SetControlDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }}; + // void SetControlDown(bool down) static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L) *************** *** 489,493 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 612,616 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 499,502 **** --- 622,628 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetLeftDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetLeftDown[1] = {{ wxLua_wxMouseState_SetLeftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }}; + // void SetLeftDown(bool down) static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L) *************** *** 504,508 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 630,634 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 514,517 **** --- 640,646 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMetaDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMetaDown[1] = {{ wxLua_wxMouseState_SetMetaDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }}; + // void SetMetaDown(bool down) static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L) *************** *** 519,523 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 648,652 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 529,532 **** --- 658,664 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMiddleDown[1] = {{ wxLua_wxMouseState_SetMiddleDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }}; + // void SetMiddleDown(bool down) static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L) *************** *** 534,538 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 666,670 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 544,547 **** --- 676,682 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetRightDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetRightDown[1] = {{ wxLua_wxMouseState_SetRightDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }}; + // void SetRightDown(bool down) static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L) *************** *** 549,553 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 684,688 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 559,562 **** --- 694,700 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetShiftDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetShiftDown[1] = {{ wxLua_wxMouseState_SetShiftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }}; + // void SetShiftDown(bool down) static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L) *************** *** 564,568 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 702,706 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 574,577 **** --- 712,718 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetX[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxMouseState_SetX(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetX[1] = {{ wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }}; + // void SetX(wxCoord x) static int LUACALL wxLua_wxMouseState_SetX(lua_State *L) *************** *** 579,583 **** wxLuaState wxlState(L); // wxCoord x ! wxCoord x = (wxCoord)wxlState.GetNumberType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 720,724 ---- wxLuaState wxlState(L); // wxCoord x ! wxCoord x = (wxCoord)wxlua_getnumbertype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 589,592 **** --- 730,736 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetY[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxMouseState_SetY(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetY[1] = {{ wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }}; + // void SetY(wxCoord y) static int LUACALL wxLua_wxMouseState_SetY(lua_State *L) *************** *** 594,598 **** wxLuaState wxlState(L); // wxCoord y ! wxCoord y = (wxCoord)wxlState.GetNumberType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 738,742 ---- wxLuaState wxlState(L); // wxCoord y ! wxCoord y = (wxCoord)wxlua_getnumbertype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 603,606 **** --- 747,753 ---- } + static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluaargArray_None }}; + // bool ShiftDown() static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L) *************** *** 618,624 **** --- 765,775 ---- } + static int LUACALL wxLua_wxMouseState_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }}; + // wxMouseState() static int LUACALL wxLua_wxMouseState_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxMouseState *returns; *************** *** 633,637 **** } - #endif // wxCHECK_VERSION(2,7,0) --- 784,787 ---- *************** *** 639,668 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { LuaMethod, "AltDown", wxLua_wxMouseState_AltDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "CmdDown", wxLua_wxMouseState_CmdDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "ControlDown", wxLua_wxMouseState_ControlDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxMouseState_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetY", wxLua_wxMouseState_GetY, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "LeftDown", wxLua_wxMouseState_LeftDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "MetaDown", wxLua_wxMouseState_MetaDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "MiddleDown", wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RightDown", wxLua_wxMouseState_RightDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "SetAltDown", wxLua_wxMouseState_SetAltDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }, ! { LuaMethod, "SetControlDown", wxLua_wxMouseState_SetControlDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }, ! { LuaMethod, "SetLeftDown", wxLua_wxMouseState_SetLeftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }, ! { LuaMethod, "SetMetaDown", wxLua_wxMouseState_SetMetaDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }, ! { LuaMethod, "SetMiddleDown", wxLua_wxMouseState_SetMiddleDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }, ! { LuaMethod, "SetRightDown", wxLua_wxMouseState_SetRightDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }, ! { LuaMethod, "SetShiftDown", wxLua_wxMouseState_SetShiftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }, ! { LuaMethod, "SetX", wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }, ! { LuaMethod, "SetY", wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }, ! { LuaMethod, "ShiftDown", wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]) - 1; #endif // wxCHECK_VERSION(2,7,0) --- 789,825 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { WXLUAMETHOD_METHOD, "AltDown", s_wxluafunc_wxLua_wxMouseState_AltDown, 1 }, ! { WXLUAMETHOD_METHOD, "CmdDown", s_wxluafunc_wxLua_wxMouseState_CmdDown, 1 }, ! { WXLUAMETHOD_METHOD, "ControlDown", s_wxluafunc_wxLua_wxMouseState_ControlDown, 1 }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxMouseState_Delete }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxMouseState_GetX, 1 }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxMouseState_GetY, 1 }, ! { WXLUAMETHOD_METHOD, "LeftDown", s_wxluafunc_wxLua_wxMouseState_LeftDown, 1 }, ! { WXLUAMETHOD_METHOD, "MetaDown", s_wxluafunc_wxLua_wxMouseState_MetaDown, 1 }, ! { WXLUAMETHOD_METHOD, "MiddleDown", s_wxluafunc_wxLua_wxMouseState_MiddleDown, 1 }, ! { WXLUAMETHOD_METHOD, "RightDown", s_wxluafunc_wxLua_wxMouseState_RightDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetAltDown", s_wxluafunc_wxLua_wxMouseState_SetAltDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetControlDown", s_wxluafunc_wxLua_wxMouseState_SetControlDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetLeftDown", s_wxluafunc_wxLua_wxMouseState_SetLeftDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetMetaDown", s_wxluafunc_wxLua_wxMouseState_SetMetaDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetMiddleDown", s_wxluafunc_wxLua_wxMouseState_SetMiddleDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetRightDown", s_wxluafunc_wxLua_wxMouseState_SetRightDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetShiftDown", s_wxluafunc_wxLua_wxMouseState_SetShiftDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxMouseState_SetX, 1 }, ! { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxMouseState_SetY, 1 }, ! { WXLUAMETHOD_METHOD, "ShiftDown", s_wxluafunc_wxLua_wxMouseState_ShiftDown, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxMouseState", s_wxluafunc_wxLua_wxMouseState_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]) - 1; + + + WXLUADEFINE wxMouseState_enums[] = { + { NULL, 0, }, + }; + + int wxMouseState_enumCount = sizeof(wxMouseState_enums)/sizeof(wxMouseState_enums[0]) - 1; #endif // wxCHECK_VERSION(2,7,0) *************** *** 676,680 **** int s_wxluatag_wxBusyCursor = -1; ! #if wxLUA_USE_wxBusyCursor static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) { --- 833,839 ---- int s_wxluatag_wxBusyCursor = -1; ! static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_Delete[1] = {{ wxLua_wxBusyCursor_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) { *************** *** 690,701 **** } - #endif // wxLUA_USE_wxBusyCursor #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, 0 }; // %override wxLua_wxBusyCursor_constructor // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { wxLuaState wxlState(L); wxBusyCursor *returns; --- 849,863 ---- } #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, 0 }; + static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_constructor[1] = {{ wxLua_wxBusyCursor_constructor, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }}; + // %override wxLua_wxBusyCursor_constructor // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBusyCursor *returns; *************** *** 722,735 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyCursor_methods[] = { ! { LuaMethod, "Delete", wxLua_wxBusyCursor_Delete, 0, 0, s_wxluaargArray_None }, #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, s_wxluatagArray_wxLua_wxBusyCursor_constructor }, #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { LuaMethod, 0, 0, 0, 0 }, }; int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]) - 1; #endif // wxLUA_USE_wxBusyCursor --- 884,904 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyCursor_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyCursor_Delete }, #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyCursor", s_wxluafunc_wxLua_wxBusyCursor_constructor, 1 }, #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]) - 1; + + + WXLUADEFINE wxBusyCursor_enums[] = { + { NULL, 0, }, + }; + + int wxBusyCursor_enumCount = sizeof(wxBusyCursor_enums)/sizeof(wxBusyCursor_enums[0]) - 1; #endif // wxLUA_USE_wxBusyCursor *************** *** 743,747 **** int s_wxluatag_wxBusyInfo = -1; ! #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) { --- 912,918 ---- int s_wxluatag_wxBusyInfo = -1; ! static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_Delete[1] = {{ wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) { *************** *** 758,764 **** --- 929,939 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyInfo_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 }; + static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_constructor[1] = {{ wxLua_wxBusyInfo_constructor, 1, 2, s_wxluatagArray_wxLua_wxBusyInfo_constructor }}; + // wxBusyInfo(const wxString& message, wxWindow *parent = NULL) static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBusyInfo *returns; *************** *** 779,783 **** } - #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 954,957 ---- *************** *** 785,795 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { ! { LuaMethod, "Delete", wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, s_wxluatagArray_wxLua_wxBusyInfo_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 959,976 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyInfo_Delete }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyInfo", s_wxluafunc_wxLua_wxBusyInfo_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]) - 1; + + + WXLUADEFINE wxBusyInfo_enums[] = { + { NULL, 0, }, + }; + + int wxBusyInfo_enumCount = sizeof(wxBusyInfo_enums)/sizeof(wxBusyInfo_enums[0]) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlua.cpp 19 Mar 2007 03:47:20 -0000 1.33 --- wxlua.cpp 31 May 2007 17:18:53 -0000 1.34 *************** *** 33,36 **** --- 33,39 ---- int s_wxluatag_wxLuaState = -1; + static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaState_Delete(lua_State *L) { *************** *** 50,59 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxLuaObject --- 53,69 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]) - 1; + + WXLUADEFINE wxLuaState_enums[] = { + { NULL, 0, }, + }; + + int wxLuaState_enumCount = sizeof(wxLuaState_enums)/sizeof(wxLuaState_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxLuaObject *************** *** 63,66 **** --- 73,79 ---- int s_wxluatag_wxLuaObject = -1; + static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) { *************** *** 76,79 **** --- 89,95 ---- } + static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }}; + // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) *************** *** 91,94 **** --- 107,113 ---- } + static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }}; + // %override wxLua_wxLuaObject_GetObject // void *GetObject() const *************** *** 105,108 **** --- 124,130 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluaarg_Enumeration, 0 }; + static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; + // bool HasAllocationFlag(wxLuaObject_Type flag) static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) *************** *** 111,115 **** bool returns; // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlState.GetEnumerationType(2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); --- 133,137 ---- bool returns; // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlua_getenumerationtype(L, 2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); *************** *** 123,126 **** --- 145,151 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }}; + // int SetAllocationFlag(wxLuaObject_Type flag, bool set) static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L) *************** *** 129,135 **** int returns; // bool set ! bool set = wxlState.GetBooleanType(3); // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlState.GetEnumerationType(2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); --- 154,160 ---- int returns; // bool set ! bool set = wxlua_getbooleantype(L, 3); // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlua_getenumerationtype(L, 2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); *************** *** 143,146 **** --- 168,174 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, 0, 1, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; + // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) *************** *** 156,163 **** --- 184,195 ---- } + static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }}; + // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaObject *returns; *************** *** 176,190 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { LuaGetProp, "AllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }, ! { LuaGetProp, "Object", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Object", wxLua_wxLuaObject_SetObject, 1, 1, s_wxluaargArray_None }, ! { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }, ! { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, ! { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; --- 208,219 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete }, ! { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1 }, ! { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1 }, ! { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1 }, ! { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1 }, ! { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; *************** *** 192,195 **** --- 221,231 ---- + WXLUADEFINE wxLuaObject_enums[] = { + { NULL, 0, }, + }; + + int wxLuaObject_enumCount = sizeof(wxLuaObject_enums)/sizeof(wxLuaObject_enums[0]) - 1; + + #if wxLUA_USE_wxLuaPrintout // --------------------------------------------------------------------------- *************** *** 200,204 **** int s_wxluatag_wxLuaPrintout = -1; ! #if wxLUA_USE_wxLuaPrintout static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { --- 236,242 ---- int s_wxluatag_wxLuaPrintout = -1; ! static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { *************** *** 214,217 **** --- 252,258 ---- } + static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }}; + // wxLuaObject *GetID() static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L) *************** *** 230,233 **** --- 271,277 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, 2, 4, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }}; + // void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L) *************** *** 237,247 **** int argCount = lua_gettop(L); // int pageTo = 0 ! int pageTo = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : 0); // int pageFrom = 0 ! int pageFrom = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : 0); // int maxPage ! int maxPage = (int)wxlState.GetNumberType(3); // int minPage ! int minPage = (int)wxlState.GetNumberType(2); // get this wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); --- 281,291 ---- int argCount = lua_gettop(L); // int pageTo = 0 ! int pageTo = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0); // int pageFrom = 0 ! int pageFrom = (argCount >= 4 ? (int)wxlua_getnumbertype(L, 4) : 0); // int maxPage ! int maxPage = (int)wxlua_getnumbertype(L, 3); // int minPage ! int minPage = (int)wxlua_getnumbertype(L, 2); // get this wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); *************** *** 253,260 **** --- 297,308 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 }; + static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }}; + // %override wxLua_wxLuaPrintout_constructor // wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL) static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaPrintout *returns; *************** *** 275,279 **** } - #endif // wxLUA_USE_wxLuaPrintout --- 323,326 ---- *************** *** 281,293 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "SetPageInfo", wxLua_wxLuaPrintout_SetPageInfo, 4, 2, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }, ! { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]) - 1; #endif // wxLUA_USE_wxLuaPrintout --- 328,347 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete }, ! { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1 }, ! { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]) - 1; + + + WXLUADEFINE wxLuaPrintout_enums[] = { + { NULL, 0, }, + }; + + int wxLuaPrintout_enumCount = sizeof(wxLuaPrintout_enums)/sizeof(wxLuaPrintout_enums[0]) - 1; #endif // wxLUA_USE_wxLuaPrintout *************** *** 303,310 **** --- 357,368 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }}; + // %override wxLua_wxLuaHtmlWindow_constructor // wxLuaHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "wxLuaHtmlWindow") static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaHtmlWindow *returns; *************** *** 341,351 **** WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow --- 399,416 ---- WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1 }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]) - 1; + + + WXLUADEFINE wxLuaHtmlWindow_enums[] = { + { NULL, 0, }, + }; + + int wxLuaHtmlWindow_enumCount = sizeof(wxLuaHtmlWindow_enums)/sizeof(wxLuaHtmlWindow_enums[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 359,363 **** int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! #if wxLUA_USE_wxLuaHtmlWindow static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { --- 424,430 ---- int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { *************** *** 373,379 **** } - #endif // wxLUA_USE_wxLuaHtmlWindow #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) --- 440,448 ---- } #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) + static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }}; + // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) *************** *** 391,394 **** --- 460,466 ---- } + static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }}; + // const wxHtmlTag *GetHtmlTag() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) *************** *** 408,412 **** #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! #if wxLUA_USE_wxLuaHtmlWindow // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) --- 480,486 ---- #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }}; ! // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) *************** *** 424,434 **** } - #endif // wxLUA_USE_wxLuaHtmlWindow - - #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) - #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) - - #if wxLUA_USE_wxLuaHtmlWindow static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; // void SetParseInnerCalled(bool fParseInnerCalled = true) static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L) --- 498,505 ---- } static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 0, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }}; + // void SetParseInnerCalled(bool fParseInnerCalled = true) static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L) *************** *** 438,442 **** int argCount = lua_gettop(L); // bool fParseInnerCalled = true ! bool fParseInnerCalled = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-05-31 17:19:50
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/docs Modified Files: binding.html changelog.txt wxlua.html wxluaref.html Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluaref.html 13 Mar 2007 05:01:01 -0000 1.17 --- wxluaref.html 31 May 2007 17:18:47 -0000 1.18 *************** *** 35,39 **** <a href="#wxBitmapButton">wxBitmapButton</a><br> <a href="#wxBitmapDataObject">wxBitmapDataObject</a><br> ! <a href="#wxBitmapHandler">wxBitmapHandler</a><br> <a href="#wxBookCtrlBase">wxBookCtrlBase</a> - (Not in wxWidgets reference manual)<br> <a href="#wxBookCtrlBaseEvent">wxBookCtrlBaseEvent</a> - (Not in wxWidgets reference manual)<br> --- 35,39 ---- <a href="#wxBitmapButton">wxBitmapButton</a><br> <a href="#wxBitmapDataObject">wxBitmapDataObject</a><br> ! wxBitmapHandler - (Not wrapped)<br> <a href="#wxBookCtrlBase">wxBookCtrlBase</a> - (Not in wxWidgets reference manual)<br> [...8906 lines suppressed...] - <font color=#000077> <i>%property</i>=LinesAdded, read, write</font><br> - <font color=#000077> <i>%property</i>=Line, read, write</font><br> - <font color=#000077> <i>%property</i>=FoldLevelNow, read, write</font><br> - <font color=#000077> <i>%property</i>=FoldLevelPrev, read, write</font><br> - <font color=#000077> <i>%property</i>=Margin, read, write</font><br> - <font color=#000077> <i>%property</i>=Message, read, write</font><br> - <font color=#000077> <i>%property</i>=WParam, read, write</font><br> - <font color=#000077> <i>%property</i>=LParam, read, write</font><br> - <font color=#000077> <i>%property</i>=ListType, read, write</font><br> - <font color=#000077> <i>%property</i>=X, read, write</font><br> - <font color=#000077> <i>%property</i>=Y, read, write</font><br> - <font color=#000077> <i>%property</i>=DragText, read, write</font><br> - <font color=#000077> <i>%property</i>=DragAllowMove, read, write</font><br> - <font color=#000077> <i>%property</i>=DragResult, read, write</font><br> - <font color=#000077> <i>%property</i>=Shift, read</font><br> - <font color=#000077> <i>%property</i>=Control, read</font><br> - <font color=#000077> <i>%property</i>=Alt, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 17652,17655 ---- Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxlua.html 21 May 2007 01:07:59 -0000 1.18 --- wxlua.html 31 May 2007 17:18:47 -0000 1.19 *************** *** 11,14 **** --- 11,15 ---- </head> + <body> *************** *** 190,195 **** everything that's needed is contained within it. C++ programmers or users on platforms that we don't provide binaries will need a ! development library of wxWidgets >=2.6.3, typically the source ! code itself that's been compiled on your system. More information about compiling wxLua is contained in the install.htm file and on <a href="http://wxlua.sourceforge.net/">http://wxlua.sourceforge.net</a>. <h2><a name="Introduction_to_Lua_very_brief"></a><u>Introduction --- 191,197 ---- everything that's needed is contained within it. C++ programmers or users on platforms that we don't provide binaries will need a ! development library of wxWidgets, typically the source ! code itself that you have compiled on your system. More ! information about compiling wxLua is contained in the install.htm file and on <a href="http://wxlua.sourceforge.net/">http://wxlua.sourceforge.net</a>. <h2><a name="Introduction_to_Lua_very_brief"></a><u>Introduction *************** *** 480,485 **** return multiple values and be passed less or more variables ! than specified. The unhandled returns or inputs are set to ! <span style="font-style: italic;">nil</span> or if there are extra thrown out. </li> --- 482,486 ---- return multiple values and be passed less or more variables ! than specified. The unhandled returns or inputs are set to <span style="font-style: italic;">nil</span> or if there are extra thrown out. </li> *************** *** 776,780 **** "classes" in the namespace <b><i>wx</i></b> from ! wxWidgets. <br> <br> --- 777,783 ---- "classes" in the namespace <b><i>wx</i></b> from ! wxWidgets. Additional libraries may be added as bindings and can be ! placed in their own "namespace" table, but for the examples below we ! will use the wx table. <br> <br> *************** *** 852,861 **** <li>All ! enums that are members of classes are available as <i>wx.CLASSNAME_ENUM_NAME</i></li> <ul> <li>Example : <i>"enum wxFTP::TransferMode { ! ASCII, ... }"</i> is accessible as <i>wx.wxFTP_ASCII</i></li> </ul> --- 855,864 ---- <li>All ! enums that are members of classes are available as <i>wx.CLASSNAME.ENUM_NAME</i></li> <ul> <li>Example : <i>"enum wxFTP::TransferMode { ! ASCII, ... }"</i> is accessible as <i>wx.wxFTP.ASCII</i></li> </ul> *************** *** 899,904 **** <ul> ! <li>All ! <i>wxEVT_XXX</i> wxEventTypes (a number) are available as <i>wx.wxEVT_XXX</i></li> --- 902,906 ---- <ul> ! <li>All <i>wxEVT_XXX</i> wxEventTypes (a number) are available as <i>wx.wxEVT_XXX</i></li> *************** *** 1014,1025 **** <li>Example : <i>"pt = wx.wxPoint(1, ! 2); pt2 = wx.wxPointCopy(pt)"</i>, but some functions ! are overloaded, using the <i>%overload</i> tag in the ! interface files, meaning that the proper function to call ! is determined at runtime so <i>"pt3 = wx.wxPoint(pt2)"</i> ! also works. Since the binding generator needs to generate the <i>wx.wxPointCopy</i> ! function anyway, it is available, but using the overloaded function is ! much nicer. The interface files declare renamed constructors using the <i>%constructor</i> ! tag.</li> </ul> --- 1016,1030 ---- <li>Example : <i>"pt = wx.wxPoint(1, ! 2); pt2 = wx.wxPoint(pt)"</i>.</li> ! ! <li>Functions with the same ! name are overloaded (as in C++) and ! the proper function to call ! is determined at runtime. </li> ! ! <li>The Classes are tables in lua, but have a __call ! metatable so they can be called as a function. If you need to get the ! constructor function itself you can use <i>CLASS_NAME.new(...)</i> ! which is the constructor exposed as a function.</li> </ul> *************** *** 1047,1054 **** tag in the interface files. You call the functions using the name after the <i>%rename</i> tag with the same parameters as the ! original function. This is done for the cases where the C++ function is ! overloaded, meaning that there are two or more functions with the same ! name that take different parameters, see also <span style="font-style: italic;">%overload</span> binding ! tag.</li> </ul> --- 1052,1057 ---- tag in the interface files. You call the functions using the name after the <i>%rename</i> tag with the same parameters as the ! original function. This is only done for special cases that ! would be awkward, if not impossible, to wrap otherwise.</li> </ul> *************** *** 1060,1065 **** <ul> ! <li>Declared in the interface files using the <i>%property</i> ! tag.</li> </ul> --- 1063,1071 ---- <ul> ! <li>These are generated on the fly when the function is called and work only for these functions.</li> ! <ul> ! <li>GetXXX() takes no values and returns one.</li> ! <li>SetXXX() takes one value and returns one.</li> ! </ul> </ul> *************** *** 1113,1116 **** --- 1119,1144 ---- </ul> + <li><b>Static functions</b> are part of the + table that holds the class and can be called with or without a class + instance.</li> + + <ul> + + <li>Example : <i>f = wx.wxFileName('dummy'); + f:GetCwd() == wx.wxFileName.GetCwd()</i></li> + + </ul> + + <li><b>Enum members</b> are also part of the + table that holds the class and are used by accessing the class table + itself.</li> + + <ul> + + <li>Example : <i>"enum wxFTP::TransferMode { + ASCII, ... }"</i> is accessible as <i>wx.wxFTP.ASCII</i></li> + + </ul> + <li><b>Operator functions</b> allow you to use *************** *** 1129,1137 **** declare the remaining ones as functions.</li> ! <li>Declaring every operator for all classes in wxLua is usually not necessary because in C++ they typically shadow an existing function that wxLua already wraps.</li> <li>Declared in the interface files using the <i>%operator</i> --- 1157,1168 ---- declare the remaining ones as functions.</li> ! <li>Note also that declaring every operator for all classes in wxLua is usually not necessary because in C++ they typically shadow an existing function that wxLua already wraps.</li> + <li>The lua = operator for a class object will merely + create a reference to the object and this itself is useful.</li> + <li>Declared in the interface files using the <i>%operator</i> *************** *** 1669,1674 **** line, set break points, view call stack, etc.</li> ! <li>The ! <i>File</i>, <i>Edit</i>, and <i>Search</i> menus offer typical editor functionality.</li> --- 1700,1704 ---- line, set break points, view call stack, etc.</li> ! <li>The <i>File</i>, <i>Edit</i>, and <i>Search</i> menus offer typical editor functionality.</li> *************** *** 1727,1735 **** debuggee process.</li> ! <li><i>Step</i> - Take one step in debugging the program.</li> ! <li><i>Step Over</i> - Step over a function call.</li> - <li><i>Step Out</i> - Step out of a function call.</li> - <li><i>Continue</i> - Continue running the program.</li> <li><i>Break</i> - Break a running program.</li> --- 1757,1772 ---- debuggee process.</li> ! <li><i>Step</i> - Take one step in debugging ! the program.</li> ! ! <li><i>Step Over</i> - Step over a function ! call.</li> ! ! <li><i>Step Out</i> - Step out of a function ! call.</li> ! ! <li><i>Continue</i> - Continue running the ! program.</li> <li><i>Break</i> - Break a running program.</li> *************** *** 1742,1747 **** of variables for the lua program being currently debugged.</li> ! <li><i>Show Output Window</i> - Show or hide the output window for messages during debugging.</li> ! <li><i>Clear Output Window</i> - When checked, clear the text in the output window when starting to debug.</li> </ul> --- 1779,1788 ---- of variables for the lua program being currently debugged.</li> ! ! <li><i>Show Output Window</i> - Show or hide ! the output window for messages during debugging.</li> ! ! <li><i>Clear Output Window</i> - When checked, ! clear the text in the output window when starting to debug.</li> </ul> Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** binding.html 3 May 2007 21:05:33 -0000 1.16 --- binding.html 31 May 2007 17:18:47 -0000 1.17 *************** *** 1,15 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Binding HowTo</title> <meta content="John Labenski" name="author"></head> ! <body><h2><u>wxLuaBinding - writing and generating the binding files</u> ! </h2><div style="text-align: justify;"> ! The binding generator for wxLua provides information for lua code to interface to a C/C++ API. The C/C++ objects are created in lua as [...2072 lines suppressed...] %__WXPM__<br> + %__WXSTUBS__<br> + %__WXXT__<br> + %__WXX11__<br> + %__WXWINE__<br> + %__WXUNIVERSAL__<br> + %__X__<br> + %__WXWINCE__<br> ! ! <br> ! ! </body> ! </html> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** changelog.txt 22 May 2007 03:27:54 -0000 1.30 --- changelog.txt 31 May 2007 17:18:47 -0000 1.31 *************** *** 23,26 **** --- 23,67 ---- wxTreeCtrl that tries to act like a listctrl. Cleaner, faster, and smaller. + - **** Big changes to the wxLua syntax! **** + Hopefully this will be the last since it is now a little more flexible and + logical with far fewer gotcha's since it matches the C++ documentation + very closely now. + - Removed wx.wxNull, the NULL tag for NULL pointers. Use wx.NULL now. + - *** Removed MOST %renamed functions so that they are not overloaded. + For example wxSizer::AddWindow/AddSizer is now just wxSizer::Add! + Removed most renamed constructors so like wxEmptyBitmap, wxBitmapFromFile + and you now need only call wxBitmap(...) and wxLua will determine which + appropriate function to call. + - Changed class member enums to be accessed by + wx.ClassName.enumName instead of previously wx.ClassName_enumName. + - Changed static class member functions to be accessed by + wx.ClassName.StaticFuncName instead of previously wx.ClassName_StaticFuncName + - Changed the class constructor functions to be a lua table instead of a C + function. You can call the table using the __call metable, there is no + code change required for wxLua scripts. You can get a pointer to the C + function using the "new" table item of the class table if you actually want + to get at the function. + - Binding changes: + Replaced %define %string with %define_string. + Replaced %define %pointer with %define_pointer. + Replaced %define %object with %define_object. + Replaced %define %event with %define_event. + Note: %define alone is still just for numbers. + Removed %overload tag since this is done automatically. + Added %override_name tag to enforce the name of the C function to use since + the binding generator will append 1,2,3,... to overloaded functions. + Removed %static and %static_only since these are automatically handled + and static functions are put into the class table. + Removed %property tag since these are generated on the fly and + - Changed version strings and numbers to match how wxWidgets defines them. + WXLUA_MAJOR_VERSION -> wxLUA_MAJOR_VERSION + WXLUA_MINOR_VERSION -> wxLUA_MINOR_VERSION + WXLUA_RELEASE_VERSION -> wxLUA_RELEASE_NUMBER + WXLUA_SUBRELEASE_VERSION -> wxLUA_SUBRELEASE_NUMBER + WXLUA_VERSION_STRING -> wxLUA_VERSION_STRING + WXCHECK_WXLUA_VERSION -> wxLUA_CHECK_VERSION + Added wxLUA_CHECK_VERSION_FULL + + version 2.8.0.0 (released 24/12/2006) -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-05-31 17:19:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxstc_bind.cpp 19 Mar 2007 03:47:21 -0000 1.20 --- wxstc_bind.cpp 31 May 2007 17:18:54 -0000 1.21 *************** *** 1481,1485 **** { ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 1481,1485 ---- { ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; *************** *** 1497,1502 **** static WXLUACLASS classList[] = { ! { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL }, ! { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL }, { 0, 0, 0, 0, 0, 0, 0 }, --- 1497,1502 ---- static WXLUACLASS classList[] = { ! { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL ,wxStyledTextCtrl_enums, wxStyledTextCtrl_enumCount, }, ! { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL ,wxStyledTextEvent_enums, wxStyledTextEvent_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** stc.cpp 19 Mar 2007 03:47:20 -0000 1.30 --- stc.cpp 31 May 2007 17:18:54 -0000 1.31 *************** *** 28,31 **** --- 28,34 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument[] = { &s_wxluaarg_LightUserData, 0 }; + static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; + // void AddRefDocument(void* docPointer); static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L) *************** *** 43,46 **** [...9447 lines suppressed...] ! { WXLUAMETHOD_METHOD, "SetModificationType", s_wxluafunc_wxLua_wxStyledTextEvent_SetModificationType, 1 }, ! { WXLUAMETHOD_METHOD, "SetModifiers", s_wxluafunc_wxLua_wxStyledTextEvent_SetModifiers, 1 }, ! { WXLUAMETHOD_METHOD, "SetPosition", s_wxluafunc_wxLua_wxStyledTextEvent_SetPosition, 1 }, ! { WXLUAMETHOD_METHOD, "SetText", s_wxluafunc_wxLua_wxStyledTextEvent_SetText, 1 }, ! { WXLUAMETHOD_METHOD, "SetWParam", s_wxluafunc_wxLua_wxStyledTextEvent_SetWParam, 1 }, ! { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxStyledTextEvent_SetX, 1 }, ! { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxStyledTextEvent_SetY, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxStyledTextEvent", s_wxluafunc_wxLua_wxStyledTextEvent_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, ! }; ! int wxStyledTextEvent_methodCount = sizeof(wxStyledTextEvent_methods)/sizeof(wxStyledTextEvent_methods[0]) - 1; ! ! WXLUADEFINE wxStyledTextEvent_enums[] = { ! { NULL, 0, }, }; ! int wxStyledTextEvent_enumCount = sizeof(wxStyledTextEvent_enums)/sizeof(wxStyledTextEvent_enums[0]) - 1; |
|
From: John L. <jr...@us...> - 2007-05-31 17:19:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxbind.h 15 Mar 2007 23:24:57 -0000 1.20 --- wxbind.h 31 May 2007 17:18:53 -0000 1.21 *************** *** 26,32 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 6 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 6 // --------------------------------------------------------------------------- --- 26,32 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 7 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 7 // --------------------------------------------------------------------------- *************** *** 65,71 **** --- 65,75 ---- extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; + extern WXDLLIMPEXP_WXBINDSTC WXLUADEFINE wxStyledTextCtrl_enums[]; + extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_enumCount; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; + extern WXDLLIMPEXP_WXBINDSTC WXLUADEFINE wxStyledTextEvent_enums[]; + extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_enumCount; |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/bindings/wxwidgets Modified Files: Makefile appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i fl.i gdi.i geometry.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i sizer.i socket.i wave.i windows.i wx_rules.lua wxlua.i xml.i Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wave.i 14 Mar 2007 05:08:09 -0000 1.16 --- wave.i 31 May 2007 17:18:47 -0000 1.17 *************** *** 22,35 **** %class %delete %noclassinfo wxSound, wxObject ! %constructor wxSoundDefault() wxSound(const wxString& fileName, bool isResource = false) //wxSound(int size, const wxByte* data) bool Create(const wxString& fileName, bool isResource = false) ! //%rename CreateFromData bool Create(int size, const wxByte* data) bool IsOk() const !%win static bool IsPlaying() const bool Play(unsigned int flags = wxSOUND_ASYNC) const ! %rename PlayFile static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC) static void Stop() %endclass --- 22,35 ---- %class %delete %noclassinfo wxSound, wxObject ! wxSound() wxSound(const wxString& fileName, bool isResource = false) //wxSound(int size, const wxByte* data) bool Create(const wxString& fileName, bool isResource = false) ! //bool Create(int size, const wxByte* data) bool IsOk() const !%win static bool IsPlaying() const bool Play(unsigned int flags = wxSOUND_ASYNC) const ! static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC) static void Stop() %endclass *************** *** 45,50 **** %class %delete %noclassinfo wxWave, wxObject wxWave(const wxString& fileName, bool isResource = false) ! %constructor wxWaveDefault() bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const --- 45,51 ---- %class %delete %noclassinfo wxWave, wxObject + wxWave() wxWave(const wxString& fileName, bool isResource = false) ! bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const *************** *** 77,89 **** %endenum ! %define %string wxMEDIABACKEND_DIRECTSHOW //wxT("wxAMMediaBackend") ! %define %string wxMEDIABACKEND_MCI //wxT("wxMCIMediaBackend") ! %define %string wxMEDIABACKEND_QUICKTIME //wxT("wxQTMediaBackend") ! %define %string wxMEDIABACKEND_GSTREAMER //wxT("wxGStreamerMediaBackend") ! %wxchkver_2_8 %define %string wxMEDIABACKEND_REALPLAYER //wxT("wxRealPlayerMediaBackend") ! %wxchkver_2_8 %define %string wxMEDIABACKEND_WMP10 //wxT("wxWMP10MediaBackend") %class wxMediaCtrl, wxControl ! %constructor wxMediaCtrlDefault() wxMediaCtrl( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) --- 78,90 ---- %endenum ! %define_string wxMEDIABACKEND_DIRECTSHOW //wxT("wxAMMediaBackend") ! %define_string wxMEDIABACKEND_MCI //wxT("wxMCIMediaBackend") ! %define_string wxMEDIABACKEND_QUICKTIME //wxT("wxQTMediaBackend") ! %define_string wxMEDIABACKEND_GSTREAMER //wxT("wxGStreamerMediaBackend") ! %wxchkver_2_8 %define_string wxMEDIABACKEND_REALPLAYER //wxT("wxRealPlayerMediaBackend") ! %wxchkver_2_8 %define_string wxMEDIABACKEND_WMP10 //wxT("wxWMP10MediaBackend") %class wxMediaCtrl, wxControl ! wxMediaCtrl() wxMediaCtrl( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) *************** *** 95,100 **** wxFileOffset Length() bool Load(const wxString& fileName) ! %rename LoadFromURI bool Load(const wxURI& location) ! %rename LoadFromURIWithProxy bool Load(const wxURI& location, const wxURI& proxy) bool LoadURI(const wxString& fileName) // { return Load(wxURI(fileName)); } bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) // { return Load(wxURI(fileName), wxURI(proxy)); } --- 96,101 ---- wxFileOffset Length() bool Load(const wxString& fileName) ! bool Load(const wxURI& location) ! bool Load(const wxURI& location, const wxURI& proxy) bool LoadURI(const wxString& fileName) // { return Load(wxURI(fileName)); } bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) // { return Load(wxURI(fileName), wxURI(proxy)); } *************** *** 122,131 **** %class %delete wxMediaEvent, wxNotifyEvent ! %define %event wxEVT_MEDIA_FINISHED ! %define %event wxEVT_MEDIA_STOP ! %define %event wxEVT_MEDIA_LOADED ! %wxchkver_2_6_4 %define %event wxEVT_MEDIA_STATECHANGED ! %wxchkver_2_6_4 %define %event wxEVT_MEDIA_PLAY ! %wxchkver_2_6_4 %define %event wxEVT_MEDIA_PAUSE wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) --- 123,132 ---- %class %delete wxMediaEvent, wxNotifyEvent ! %define_event wxEVT_MEDIA_FINISHED ! %define_event wxEVT_MEDIA_STOP ! %define_event wxEVT_MEDIA_LOADED ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_STATECHANGED ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PLAY ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PAUSE wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) *************** *** 163,167 **** int GetNumberAxes() const int GetNumberButtons() const ! %wxchkver_2_8 %static int GetNumberJoysticks() const !%wxchkver_2_8 int GetNumberJoysticks() const int GetPollingMax() const --- 164,168 ---- int GetNumberAxes() const int GetNumberButtons() const ! %wxchkver_2_8 static int GetNumberJoysticks() const !%wxchkver_2_8 int GetNumberJoysticks() const int GetPollingMax() const *************** *** 207,214 **** %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) --- 208,215 ---- %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) Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 21 Dec 2006 06:02:03 -0000 1.7 --- Makefile 31 May 2007 17:18:46 -0000 1.8 *************** *** 13,24 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: $(DEPFILES) @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) ! genidocs: $(DEPFILES) @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua) --- 13,24 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! #DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) ! genidocs: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua) Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** menutool.i 14 Mar 2007 05:08:09 -0000 1.14 --- menutool.i 31 May 2007 17:18:46 -0000 1.15 *************** *** 29,37 **** wxMenu(const wxString& title = "", long style = 0) // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators ! %constructor wxCreateMenu(int luatable, const wxString& title = "", long style = 0) wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename AppendMenu wxMenuItem* Append(int id, const wxString& item, wxMenu *subMenu, const wxString& helpString = "") ! %rename AppendItem wxMenuItem* Append(wxMenuItem* menuItem) wxMenuItem* AppendCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* AppendRadioItem(int id, const wxString& item, const wxString& helpString = "") --- 29,37 ---- wxMenu(const wxString& title = "", long style = 0) // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators ! %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Append(int id, const wxString& item, wxMenu *subMenu, const wxString& helpString = "") ! wxMenuItem* Append(wxMenuItem* menuItem) wxMenuItem* AppendCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* AppendRadioItem(int id, const wxString& item, const wxString& helpString = "") *************** *** 40,46 **** void Check(int id, bool check) void Delete(int id) ! %rename DeleteItem void Delete(wxMenuItem *item) void Destroy(int id) ! %rename DestroyItem void Destroy(wxMenuItem *item) void Enable(int id, bool enable) int FindItem(const wxString& itemString) const --- 40,46 ---- void Check(int id, bool check) void Delete(int id) ! void Delete(wxMenuItem *item) void Destroy(int id) ! void Destroy(wxMenuItem *item) void Enable(int id, bool enable) int FindItem(const wxString& itemString) const *************** *** 54,58 **** wxString GetTitle() const wxMenuItem* Insert(size_t pos, int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename InsertItem wxMenuItem* Insert(size_t pos, wxMenuItem *item) wxMenuItem* InsertCheckItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") wxMenuItem* InsertRadioItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") --- 54,58 ---- wxString GetTitle() const wxMenuItem* Insert(size_t pos, int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Insert(size_t pos, wxMenuItem *item) wxMenuItem* InsertCheckItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") wxMenuItem* InsertRadioItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") *************** *** 61,76 **** bool IsEnabled(int id) const wxMenuItem* Prepend(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename PrependItem wxMenuItem* Prepend(wxMenuItem *item) wxMenuItem* PrependCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependRadioItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependSeparator() wxMenuItem* Remove(wxMenuItem *item) ! %rename RemoveById wxMenuItem* Remove(int id) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) void SetTitle(const wxString& title) void UpdateUI(wxEvtHandler* source = NULL) const - - %property=Title, read %endclass --- 61,74 ---- bool IsEnabled(int id) const wxMenuItem* Prepend(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Prepend(wxMenuItem *item) wxMenuItem* PrependCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependRadioItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependSeparator() wxMenuItem* Remove(wxMenuItem *item) ! wxMenuItem* Remove(int id) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) void SetTitle(const wxString& title) void UpdateUI(wxEvtHandler* source = NULL) const %endclass *************** *** 105,110 **** %wxchkver_2_8 virtual void UpdateMenus() - - %property=MenuCount, read %endclass --- 103,106 ---- *************** *** 149,154 **** // void SetName(const wxString& text) const - deprecated %win void SetTextColour(const wxColour& colour) const - - %property=Help, read, write %endclass --- 145,148 ---- *************** *** 161,166 **** bool DeleteObject(wxMenuItem *pMenuItem) int GetCount() const - - %property=Count, read %endclass --- 155,158 ---- *************** *** 171,177 **** %class %delete wxMenuEvent, wxEvent ! %define %event wxEVT_MENU_HIGHLIGHT ! %define %event wxEVT_MENU_OPEN ! %define %event wxEVT_MENU_CLOSE wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL) --- 163,169 ---- %class %delete wxMenuEvent, wxEvent ! %define_event wxEVT_MENU_HIGHLIGHT ! %define_event wxEVT_MENU_OPEN ! %define_event wxEVT_MENU_CLOSE wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL) *************** *** 208,213 **** wxToolBarToolBase* AddSeparator() wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxBitmap& bitmap2 = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelpString = "", const wxString& longHelpString = "", wxObject* clientData = NULL) ! %rename AddToolSimple wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename AddToolTool wxToolBarToolBase* AddTool(wxToolBarToolBase* tool) wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) --- 200,205 ---- wxToolBarToolBase* AddSeparator() wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxBitmap& bitmap2 = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelpString = "", const wxString& longHelpString = "", wxObject* clientData = NULL) ! wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxToolBarToolBase* AddTool(wxToolBarToolBase* tool) wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) *************** *** 234,243 **** wxToolBarToolBase* InsertControl(size_t pos, wxControl *control) wxToolBarToolBase* InsertSeparator(size_t pos) ! %rename InsertToolSimple wxToolBarToolBase* InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = false, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") wxToolBarToolBase* InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL) ! %rename InsertToolTool wxToolBarToolBase * InsertTool(size_t pos, wxToolBarToolBase* tool) wxToolBarToolBase* RemoveTool(int id) bool Realize() ! %rename SetMarginsXY void SetMargins(int x, int y) void SetMargins(const wxSize& size) void SetToolBitmapSize(const wxSize& size) --- 226,235 ---- wxToolBarToolBase* InsertControl(size_t pos, wxControl *control) wxToolBarToolBase* InsertSeparator(size_t pos) ! wxToolBarToolBase* InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = false, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") wxToolBarToolBase* InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL) ! wxToolBarToolBase * InsertTool(size_t pos, wxToolBarToolBase* tool) wxToolBarToolBase* RemoveTool(int id) bool Realize() ! void SetMargins(int x, int y) void SetMargins(const wxSize& size) void SetToolBitmapSize(const wxSize& size) *************** *** 251,263 **** void SetMaxRowsCols(int rows, int cols) void ToggleTool(int toolId, const bool toggle) - - %property=ToolEnabled, read - %property=ToolSize, read - %property=MaxRows, read - %property=MaxCols, read - %property=ToolMargins, read - %property=ToolPacking, read, write - %property=ToolSeparation, read, write - %property=ToolBitmapSize, read, write %endclass --- 243,246 ---- *************** *** 268,273 **** %class wxToolBar, wxToolBarBase wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") - %constructor wxToolBarDefault() bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") --- 251,256 ---- %class wxToolBar, wxToolBarBase + wxToolBar() wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") *************** *** 282,287 **** %class wxToolBarSimple, wxToolBarBase wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! %constructor wxPreToolBarSimple() bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) --- 265,271 ---- %class wxToolBarSimple, wxToolBarBase + wxToolBarSimple() wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) *************** *** 337,347 **** wxObject *GetClientData() void SetClientData(wxObject* clientData) - - %property=NormalBitmap, read, write - %property=DisabledBitmap, read, write - %property=Bitmap, read - %property=ClientData, read, write - %property=LongHelp, read, write - %property=ShortHelp, read, write %endclass --- 321,324 ---- Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** clipdrag.i 9 Mar 2007 00:15:12 -0000 1.23 --- clipdrag.i 31 May 2007 17:18:46 -0000 1.24 *************** *** 16,21 **** %class wxClipboard, wxObject ! !%wxchkver_2_5 %define %pointer wxTheClipboard ! %wxchkver_2_5 %staticonly wxClipboard *Get() // wxClipboard() use global clipboard only --- 16,21 ---- %class wxClipboard, wxObject ! !%wxchkver_2_5 %define_pointer wxTheClipboard ! %wxchkver_2_5 static wxClipboard *Get() // wxClipboard() use global clipboard only *************** *** 48,54 **** %class %delete wxClipboardTextEvent, wxCommandEvent ! %define %event wxEVT_COMMAND_TEXT_COPY ! %define %event wxEVT_COMMAND_TEXT_CUT ! %define %event wxEVT_COMMAND_TEXT_PASTE wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0) --- 48,54 ---- %class %delete wxClipboardTextEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_TEXT_COPY ! %define_event wxEVT_COMMAND_TEXT_CUT ! %define_event wxEVT_COMMAND_TEXT_PASTE wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0) *************** *** 91,98 **** %class %delete %noclassinfo %encapsulate wxDataFormat ! %define %object wxFormatInvalid ! %overload wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! %overload %constructor wxDataFormatUser(const wxString &format) wxString GetId() const --- 91,98 ---- %class %delete %noclassinfo %encapsulate wxDataFormat ! %define_object wxFormatInvalid ! wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! wxDataFormat(const wxString &format) wxString GetId() const *************** *** 102,108 **** %operator bool operator==(const wxDataFormat& format) const - - %property=Id, read, write - %property=Type, read, write %endclass --- 102,105 ---- *************** *** 147,153 **** //virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) - - %property=DataSize, read - %property=Format, read, write %endclass --- 144,147 ---- *************** *** 286,291 **** %win|%mac wxDropSource(wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) %gtk wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %win %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) ! %gtk %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) --- 280,285 ---- %win|%mac wxDropSource(wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) %gtk wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %win wxDropSource(wxDataObject& data, wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) ! %gtk wxDropSource(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) *************** *** 302,306 **** %class %delete wxDropFilesEvent, wxEvent ! %define %event wxEVT_DROP_FILES // wxDropFilesEvent(WXTYPE id = 0, int noFiles = 0, wxString* files = NULL) only handle this event --- 296,300 ---- %class %delete wxDropFilesEvent, wxEvent ! %define_event wxEVT_DROP_FILES // wxDropFilesEvent(WXTYPE id = 0, int noFiles = 0, wxString* files = NULL) only handle this event Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** data.i 19 Mar 2007 03:47:18 -0000 1.26 --- data.i 31 May 2007 17:18:46 -0000 1.27 *************** *** 89,97 **** int GetSize() const bool IsKindOf(wxClassInfo* info) - - %property=BaseClassName1, read - %property=BaseClassName2, read - %property=ClassName, read - %property=Size, read %endclass --- 89,92 ---- *************** *** 106,110 **** %class wxValidator, wxEvtHandler ! %define %object wxDefaultValidator wxWindow* GetWindow() const --- 101,105 ---- %class wxValidator, wxEvtHandler ! %define_object wxDefaultValidator wxWindow* GetWindow() const *************** *** 114,119 **** virtual bool TransferToWindow() virtual bool Validate(wxWindow* parent) - - %property=Window, read, write %endclass --- 109,112 ---- *************** *** 150,159 **** //!%wxchkver_2_5|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList) //!%wxchkver_2_5|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList) - //!%wxchkver_2_5|%wxcompat_2_4 %property=ExcludeList, read, write - //!%wxchkver_2_5|%wxcompat_2_4 %property=IncludeList, read, write - - %wxchkver_2_5 %property=Excludes, read, write - %wxchkver_2_5 %property=Includes, read, write - %property=Style, read, write %endclass --- 143,146 ---- *************** *** 197,224 **** wxList() ! %overload wxNode *Append(wxObject *object) ! %overload %rename AppendNumKey wxNode *Append(long key, wxObject *object) ! %overload %rename AppendStringKey wxNode *Append(const wxString& key, wxObject *object) void Clear() void DeleteContents(bool destroy) bool DeleteNode(wxNode *pNode) bool DeleteObject(wxObject *pObject) ! %overload wxNode* Find(wxObject* pObject) ! %overload %rename FindNumKey wxNode *Find(long key) ! %overload %rename FindStringKey wxNode *Find(const wxString &key) int GetCount() const wxNode *GetFirst() wxNode *GetLast() int IndexOf(wxObject* pObject) ! %overload wxNode *Insert(wxObject *pObject) ! %overload %rename InsertAt wxNode *Insert(size_t position, wxObject *pObject) ! %overload %rename InsertBefore wxNode *Insert(wxNode *pNode, wxObject *pObject) bool IsEmpty() const wxNode *Item(int iIndex) const wxNode *Member(wxObject *pObject) - - %property=Count, read - %property=First, read - %property=Last, read %endclass --- 184,207 ---- wxList() ! wxNode *Append(wxObject *object) ! wxNode *Append(long key, wxObject *object) ! wxNode *Append(const wxString& key, wxObject *object) void Clear() void DeleteContents(bool destroy) bool DeleteNode(wxNode *pNode) bool DeleteObject(wxObject *pObject) ! wxNode* Find(wxObject* pObject) ! wxNode *Find(long key) ! wxNode *Find(const wxString &key) int GetCount() const wxNode *GetFirst() wxNode *GetLast() int IndexOf(wxObject* pObject) ! wxNode *Insert(wxObject *pObject) ! wxNode *Insert(size_t position, wxObject *pObject) ! wxNode *Insert(wxNode *pNode, wxObject *pObject) bool IsEmpty() const wxNode *Item(int iIndex) const wxNode *Member(wxObject *pObject) %endclass *************** *** 234,241 **** void SetData(wxObject *data) //int IndexOf() - unfortunately a protected member of wxNodeBase - - %property=Data, read, write - %property=Previous, read - %property=Next, read %endclass --- 217,220 ---- *************** *** 256,260 **** // void RemoveAt(size_t index, size_t count = 1) // void Shrink() - // %property=Count, read //%endclass --- 235,238 ---- *************** *** 267,273 **** %class %delete %noclassinfo %encapsulate wxArrayInt ! %overload wxArrayInt() ! %overload %constructor wxArrayIntCopy(const wxArrayInt& array) ! %overload %constructor wxArrayIntFromTable(const wxArrayInt_FromLuaTable& array) // %override [lua table] wxArrayInt::ToLuaTable() const --- 245,251 ---- %class %delete %noclassinfo %encapsulate wxArrayInt ! wxArrayInt() ! wxArrayInt(const wxArrayInt& array) ! wxArrayInt(const wxArrayInt_FromLuaTable& array) // %override [lua table] wxArrayInt::ToLuaTable() const *************** *** 286,291 **** void RemoveAt(size_t index) void Shrink() - - %property=Count, read %endclass --- 264,267 ---- *************** *** 300,306 **** %class %delete %noclassinfo %encapsulate wxArrayString ! %overload wxArrayString() ! %overload %constructor wxArrayStringCopy(const wxArrayString& array) ! %overload %constructor wxArrayStringFromTable(const wxArrayString_FromLuaTable& array) // %override [lua table] wxArrayString::ToLuaTable() const --- 276,282 ---- %class %delete %noclassinfo %encapsulate wxArrayString ! wxArrayString() ! wxArrayString(const wxArrayString& array) ! wxArrayString(const wxArrayString_FromLuaTable& array) // %override [lua table] wxArrayString::ToLuaTable() const *************** *** 330,337 **** %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString ! %overload wxSortedArrayString() ! //%constructor wxSortedArrayStringCopy(const wxSortedArrayString& array) ! %overload %constructor wxSortedArrayStringCopy(const wxSortedArrayString& src) ! %overload %constructor wxSortedArrayStringFromTable(const wxArrayString_FromLuaTable& array) %endclass --- 306,312 ---- %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString ! wxSortedArrayString() ! wxSortedArrayString(const wxSortedArrayString& src) ! wxSortedArrayString(const wxArrayString_FromLuaTable& array) %endclass *************** *** 373,385 **** // wxObject * Delete(long key) // void DeleteContents(bool flag) ! // %rename GetNumKey wxObject * Get(long key) ! // %rename GetStringKey wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) // !%wxchkver_2_5 wxNode * Next() // %wxchkver_2_5 wxHashTable::Node * Next() ! // %rename PutNumKey void Put(long key, wxObject *object) ! // %rename PutStringKey void Put(const wxString & key, wxObject *object) // int GetCount() const - // %property=Count, read //%endclass --- 348,359 ---- // wxObject * Delete(long key) // void DeleteContents(bool flag) ! // wxObject * Get(long key) ! // wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) // !%wxchkver_2_5 wxNode * Next() // %wxchkver_2_5 wxHashTable::Node * Next() ! // void Put(long key, wxObject *object) ! // void Put(const wxString & key, wxObject *object) // int GetCount() const //%endclass Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** print.i 9 Mar 2007 00:15:12 -0000 1.14 --- print.i 31 May 2007 17:18:47 -0000 1.15 *************** *** 242,246 **** %class %delete wxPrintData, wxObject wxPrintData() ! %constructor wxPrintDataCopy(const wxPrintData& data) wxPrintData *Copy() --- 242,246 ---- %class %delete wxPrintData, wxObject wxPrintData() ! wxPrintData(const wxPrintData& data) wxPrintData *Copy() *************** *** 298,323 **** //!%wxchkver_2_7 void SetPrinterTranslateY(long y) //!%wxchkver_2_7 void SetPrinterTranslation(long x, long y) - - %property=Collate, read, write - %property=Colour, read, write - %property=Duplex, read, write - %property=Filename, read, write - %property=NoCopies, read, write - %property=Orientation, read, write - %property=PaperId, read, write - %property=PaperSize, read, write - %property=PrinterName, read, write - %property=PrintMode, read, write - %property=Quality, read, write - - //!%wxchkver_2_7 %property=FontMetricPath, read, write - //!%wxchkver_2_7 %property=PreviewCommand, read, write - //!%wxchkver_2_7 %property=PrinterCommand, read, write - //!%wxchkver_2_7 %property=PrinterOptions, read, write - //!%wxchkver_2_7 %property=PrinterScaleX, read, write - //!%wxchkver_2_7 %property=PrinterScaleY, read, write - //!%wxchkver_2_7 %property=PrinterTranslateX, read, write - //!%wxchkver_2_7 %property=PrinterTranslateY, read, write - %endclass --- 298,301 ---- *************** *** 327,331 **** %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! %constructor wxPageSetupDialogDataCopy(const wxPageSetupDialogData& data) wxPageSetupDialogData *Copy() --- 305,309 ---- %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! wxPageSetupDialogData(const wxPageSetupDialogData& data) wxPageSetupDialogData *Copy() *************** *** 367,385 **** //wxPageSetupDialogData& operator=(const wxPageSetupData& data) //wxPageSetupDialogData& operator=(const wxPrintData& data) - - %property=EnableHelp, read - %property=EnableMargins, read - %property=EnableOrientation, read - %property=EnablePaper, read - %property=EnablePrinter, read - %property=DefaultInfo, read, write - %property=DefaultMinMargins, read, write - %property=MarginBottomRight, read, write - %property=MarginTopLeft, read, write - %property=MinMarginBottomRight, read, write - %property=MinMarginTopLeft, read, write - %property=PaperId, read, write - %property=PaperSize, read, write - %property=PrintData, read, write %endclass --- 345,348 ---- *************** *** 396,401 **** wxPageSetupDialogData& GetPageSetupDialogData() int ShowModal() - - %property=PageSetupDialogData, read %endclass --- 359,362 ---- *************** *** 410,416 **** wxDC* GetPrintDC() int ShowModal() - - %property=PrintDialogData, read - %property=PrintDC, read %endclass --- 371,374 ---- *************** *** 420,425 **** %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! %constructor wxPrintDialogDataCopy(const wxPrintDialogData& dialogData) ! %constructor wxPrintDialogDataFromPrintData(const wxPrintData& data) // copied straight from cmndata.h not docs --- 378,383 ---- %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! wxPrintDialogData(const wxPrintDialogData& dialogData) ! wxPrintDialogData(const wxPrintData& data) // copied straight from cmndata.h not docs *************** *** 457,469 **** %operator void operator=(const wxPrintDialogData& data) - - %property=Collate, read, write - %property=FromPage, read, write - %property=MinPage, read, write - %property=MaxPage, read, write - %property=NoCopies, read, write - %property=PrintData, read, write - %property=PrintToFile, read, write - %property=ToPage, read, write %endclass --- 415,418 ---- *************** *** 529,536 **** void SetPrintout(wxLuaPrintout *printout) void SetZoom(int percent) - - %property=Canvas, read, write - %property=Frame, read, write - %property=Printout, read, write %endclass --- 478,481 ---- Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** file.i 15 Mar 2007 14:20:15 -0000 1.20 --- file.i 31 May 2007 17:18:46 -0000 1.21 *************** *** 56,72 **** // wxLua only has storage for wxChar* in bindings, wxFILE_SEP_XXX are #defined // as wxChar wxT('.'), so we just redefine them to be wxT(".") or wxChar* ! %define %string wxFILE_SEP_EXT wxT(".") ! %define %string wxFILE_SEP_DSK wxT(":") ! %define %string wxFILE_SEP_PATH_DOS wxT("\\") ! %define %string wxFILE_SEP_PATH_UNIX wxT("/") ! %define %string wxFILE_SEP_PATH_MAC wxT(":") ! %define %string wxFILE_SEP_PATH_VMS wxT(".") // VMS also uses '[' and ']' ! %define %string wxFILE_SEP_PATH wxLua_FILE_SEP_PATH // hack to convert from wxChar wxT('') to wxChar* wxT("") ! %define %string wxPATH_SEP_DOS // wxT(";") ! %define %string wxPATH_SEP_UNIX // wxT(":") ! %define %string wxPATH_SEP_MAC // wxT(";") ! %define %string wxPATH_SEP // wxPATH_SEP_XXX %define wxARE_FILENAMES_CASE_SENSITIVE // bool 1/0 --- 56,72 ---- // wxLua only has storage for wxChar* in bindings, wxFILE_SEP_XXX are #defined // as wxChar wxT('.'), so we just redefine them to be wxT(".") or wxChar* ! %define_string wxFILE_SEP_EXT wxT(".") ! %define_string wxFILE_SEP_DSK wxT(":") ! %define_string wxFILE_SEP_PATH_DOS wxT("\\") ! %define_string wxFILE_SEP_PATH_UNIX wxT("/") ! %define_string wxFILE_SEP_PATH_MAC wxT(":") ! %define_string wxFILE_SEP_PATH_VMS wxT(".") // VMS also uses '[' and ']' ! %define_string wxFILE_SEP_PATH wxLua_FILE_SEP_PATH // hack to convert from wxChar wxT('') to wxChar* wxT("") ! %define_string wxPATH_SEP_DOS // wxT(";") ! %define_string wxPATH_SEP_UNIX // wxT(":") ! %define_string wxPATH_SEP_MAC // wxT(";") ! %define_string wxPATH_SEP // wxPATH_SEP_XXX %define wxARE_FILENAMES_CASE_SENSITIVE // bool 1/0 *************** *** 90,94 **** !%wxchkver_2_8 void Add(const wxString& path) %wxchkver_2_8 bool Add(const wxString& path) ! %wxchkver_2_8 %rename AddArray void Add(const wxArrayString_FromLuaTable& paths) // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename) const --- 90,94 ---- !%wxchkver_2_8 void Add(const wxString& path) %wxchkver_2_8 bool Add(const wxString& path) ! %wxchkver_2_8 void Add(const wxArrayString_FromLuaTable& paths) // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename) const *************** *** 97,102 **** wxString FindAbsoluteValidPath(const wxString& filename) const // Given full path and filename, add path to list ! !%wxchkver_2_8 void EnsureFileAccessible(const wxString& path) ! %wxchkver_2_8 bool EnsureFileAccessible(const wxString& path) %endclass --- 97,102 ---- wxString FindAbsoluteValidPath(const wxString& filename) const // Given full path and filename, add path to list ! %not_overload !%wxchkver_2_8 void EnsureFileAccessible(const wxString& path) ! %not_overload %wxchkver_2_8 bool EnsureFileAccessible(const wxString& path) %endclass *************** *** 114,119 **** %define wxPATH_MKDIR_FULL ! //%define %string wxFILE_SEP_PATH // this is wxChar see override wxFileSeparator ! //%define %string wxPATH_SEP // this is wxChar see override wxFileSeparator %define wxFILE %define wxDIR --- 114,119 ---- %define wxPATH_MKDIR_FULL ! //%define_string wxFILE_SEP_PATH // this is wxChar see override wxFileSeparator ! //%define_string wxPATH_SEP // this is wxChar see override wxFileSeparator %define wxFILE %define wxDIR *************** *** 143,163 **** %class %delete %noclassinfo %encapsulate wxFileName ! %constructor wxFileNameDefault() ! %constructor wxFileNameCopy(const wxFileName& filename) wxFileName(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %constructor wxFileNamePath(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %constructor wxFileNameVolume(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AppendDir(const wxString& dir) ! %overload void Assign(const wxFileName& filepath) ! %overload %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) void AssignHomeDir() !%wxchkver_2_8 void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) ! %wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) %rename AssignTempFileNameGetName void AssignTempFileName(const wxString& prefix) %wxchkver_2_8&&wxUSE_FILE void AssignTempFileName(const wxString& prefix, wxFile *fileTemp) //%wxchkver_2_8&&wxUSE_FFILE void AssignTempFileName(const wxString& prefix, wxFFile *fileTemp) --- 143,163 ---- %class %delete %noclassinfo %encapsulate wxFileName ! wxFileName() ! wxFileName(const wxFileName& filename) wxFileName(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! wxFileName(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! wxFileName(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AppendDir(const wxString& dir) ! void Assign(const wxFileName& filepath) ! void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) void AssignHomeDir() !%wxchkver_2_8 void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) ! %wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) void AssignTempFileName(const wxString& prefix) %wxchkver_2_8&&wxUSE_FILE void AssignTempFileName(const wxString& prefix, wxFile *fileTemp) //%wxchkver_2_8&&wxUSE_FFILE void AssignTempFileName(const wxString& prefix, wxFFile *fileTemp) *************** *** 170,177 **** //%wxchkver_2_8&&wxUSE_FFILE static wxString CreateTempFileName(const wxString& prefix, wxFFile *fileTemp); bool DirExists() ! %rename DirExistsName static bool DirExists(const wxString& dir) static wxFileName DirName(const wxString& dir) bool FileExists() ! %rename FileExistsName static bool FileExists(const wxString& file) static wxFileName FileName(const wxString& file) static wxString GetCwd(const wxString& volume = "") --- 170,177 ---- //%wxchkver_2_8&&wxUSE_FFILE static wxString CreateTempFileName(const wxString& prefix, wxFFile *fileTemp); bool DirExists() ! static bool DirExists(const wxString& dir) static wxFileName DirName(const wxString& dir) bool FileExists() ! static bool FileExists(const wxString& file) static wxFileName FileName(const wxString& file) static wxString GetCwd(const wxString& volume = "") *************** *** 227,239 **** bool MakeRelativeTo(const wxString& pathBase = "", wxPathFormat format = wxPATH_NATIVE) bool Mkdir(int perm = 4095, int flags = 0) ! %rename MkdirName static bool Mkdir(const wxString& dir, int perm = 4095, int flags = 0) bool Normalize(int flags = wxPATH_NORM_ALL, const wxString& cwd = wxEmptyString, wxPathFormat format = wxPATH_NATIVE) void PrependDir(const wxString& dir) void RemoveDir(int pos) bool Rmdir() ! %rename RmdirName static bool Rmdir(const wxString& dir) bool SameAs(const wxFileName& filepath, wxPathFormat format = wxPATH_NATIVE) const bool SetCwd() ! %rename SetCwdName static bool SetCwd(const wxString& cwd) void SetExt(const wxString& ext) void SetEmptyExt() --- 227,239 ---- bool MakeRelativeTo(const wxString& pathBase = "", wxPathFormat format = wxPATH_NATIVE) bool Mkdir(int perm = 4095, int flags = 0) ! static bool Mkdir(const wxString& dir, int perm = 4095, int flags = 0) bool Normalize(int flags = wxPATH_NORM_ALL, const wxString& cwd = wxEmptyString, wxPathFormat format = wxPATH_NATIVE) void PrependDir(const wxString& dir) void RemoveDir(int pos) bool Rmdir() ! static bool Rmdir(const wxString& dir) bool SameAs(const wxFileName& filepath, wxPathFormat format = wxPATH_NATIVE) const bool SetCwd() ! static bool SetCwd(const wxString& cwd) void SetExt(const wxString& ext) void SetEmptyExt() *************** *** 308,312 **** %class %delete %noclassinfo %encapsulate wxFile wxFile() ! %constructor wxFileOpen(const wxString& filename, wxFile::OpenMode mode = wxFile::read) static bool Access(const wxString& name, wxFile::OpenMode mode) --- 308,312 ---- %class %delete %noclassinfo %encapsulate wxFile wxFile() ! wxFile(const wxString& filename, wxFile::OpenMode mode = wxFile::read) static bool Access(const wxString& name, wxFile::OpenMode mode) *************** *** 331,335 **** //size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) ! %rename WriteString size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass --- 331,335 ---- //size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) ! size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass *************** *** 340,344 **** %class %noclassinfo %encapsulate %delete wxTempFile ! %constructor wxTempFileDefault() // associates the temp file with the file to be replaced and opens it wxTempFile(const wxString& strName) --- 340,344 ---- %class %noclassinfo %encapsulate %delete wxTempFile ! wxTempFile() // associates the temp file with the file to be replaced and opens it wxTempFile(const wxString& strName) *************** *** 384,388 **** %class %delete %noclassinfo %encapsulate wxDir wxDir() ! %constructor wxDirOpen(const wxString& dir) static bool Exists(const wxString& dir) --- 384,388 ---- %class %delete %noclassinfo %encapsulate wxDir wxDir() ! wxDir(const wxString& dir) static bool Exists(const wxString& dir) *************** *** 448,452 **** %class %noclassinfo wxInputStream, wxStreamBase ! // wxInputStream() this os only a base class bool CanRead() const --- 448,452 ---- %class %noclassinfo wxInputStream, wxStreamBase ! // wxInputStream() this is only a base class bool CanRead() const *************** *** 458,462 **** //wxInputStream& Read(void *buffer, size_t size) wxInputStream& Read(size_t size) ! %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const --- 458,462 ---- //wxInputStream& Read(void *buffer, size_t size) wxInputStream& Read(size_t size) ! wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const *************** *** 481,485 **** //wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) ! %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in) %endclass --- 481,485 ---- //wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) ! wxOutputStream& Write(wxInputStream& stream_in) %endclass *************** *** 491,495 **** %class %noclassinfo wxFileInputStream, wxInputStream wxFileInputStream(const wxString& fileName) ! %constructor wxFileInputStreamFile(wxFile& file) //wxFileInputStream(int fd) --- 491,495 ---- %class %noclassinfo wxFileInputStream, wxInputStream wxFileInputStream(const wxString& fileName) ! wxFileInputStream(wxFile& file) //wxFileInputStream(int fd) *************** *** 502,506 **** %class %noclassinfo wxFileOutputStream, wxOutputStream wxFileOutputStream(const wxString& fileName) ! %constructor wxFileOutputStreamFile(wxFile& file) //wxFileOutputStream(int fd) --- 502,506 ---- %class %noclassinfo wxFileOutputStream, wxOutputStream wxFileOutputStream(const wxString& fileName) ! wxFileOutputStream(wxFile& file) //wxFileOutputStream(int fd) Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** regex.i 23 Feb 2007 04:35:30 -0000 1.6 --- regex.i 31 May 2007 17:18:47 -0000 1.7 *************** *** 30,34 **** %class %delete %noclassinfo %encapsulate wxRegEx ! %constructor wxRegExDefault() wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) --- 30,34 ---- %class %delete %noclassinfo %encapsulate wxRegEx ! wxRegEx() wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dialogs.i 17 Mar 2007 19:08:09 -0000 1.27 --- dialogs.i 31 May 2007 17:18:46 -0000 1.28 *************** *** 60,64 **** %wxchkver_2_8&&wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent = NULL, const wxFont& fontInit = wxNullFont, const wxString& caption = "") // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) %if wxUSE_NUMBERDLG %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4 --- 60,66 ---- %wxchkver_2_8&&wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent = NULL, const wxFont& fontInit = wxNullFont, const wxString& caption = "") // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! // int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, LuaTable strTable, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! %if wxUSE_NUMBERDLG %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4 *************** *** 90,95 **** %class wxDialog, wxTopLevelWindow wxDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog") - %constructor wxEmptyDialog() void Centre(int direction = wxBOTH) --- 92,97 ---- %class wxDialog, wxTopLevelWindow + wxDialog() wxDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog") void Centre(int direction = wxBOTH) *************** *** 114,119 **** bool Show(const bool show) int ShowModal() - - %property=ReturnCode, read, write %endclass --- 116,119 ---- *************** *** 203,208 **** wxColourData& GetColourData() //int ShowModal() - in wxDialog - - %property=ColourData, read %endclass --- 203,206 ---- *************** *** 214,218 **** %class %delete wxColourData, wxObject wxColourData() ! %constructor wxColourDataCopy(const wxColourData& cData) bool GetChooseFull() const --- 212,216 ---- %class %delete wxColourData, wxObject wxColourData() ! wxColourData(const wxColourData& cData) bool GetChooseFull() const *************** *** 222,228 **** void SetColour(wxColour &colour) void SetCustomColour(int i, wxColour &colour) - - %property=Colour, read, write - %property=ChooseFull, read, write %endclass --- 220,223 ---- *************** *** 237,243 **** %class wxFileDialog, wxDialog ! // %constructor wxFileDialogDefault() no default constructor in MSW ! !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) ! %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") // since there's no default constructor in MSW you can't call this so it's best to not have it at all --- 232,238 ---- %class wxFileDialog, wxDialog ! // wxFileDialog() no default constructor in MSW ! %not_overload !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) ! %not_overload %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") // since there's no default constructor in MSW you can't call this so it's best to not have it at all *************** *** 246,255 **** wxString GetFilename() const // %override [lua string table] wxFileDialog::GetFilenames() ! void GetFilenames(wxArrayString& filenames) const int GetFilterIndex() const wxString GetMessage() const wxString GetPath() const // %override [lua string table] wxFileDialog::GetPaths() ! void GetPaths(wxArrayString& paths) const !%wxchkver_2_7 long GetStyle() const wxString GetWildcard() const --- 241,254 ---- wxString GetFilename() const // %override [lua string table] wxFileDialog::GetFilenames() ! // void GetFilenames(wxArrayString& filenames) const ! void GetFilenames() const ! int GetFilterIndex() const wxString GetMessage() const wxString GetPath() const // %override [lua string table] wxFileDialog::GetPaths() ! // void GetPaths(wxArrayString& paths) const ! void GetPaths() const ! !%wxchkver_2_7 long GetStyle() const wxString GetWildcard() const *************** *** 262,273 **** void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog - - %property=Directory, read, write - %property=Filename, read, write - %property=FilterIndex, read, write - %property=Message, read, write - %property=Path, read, write - !%wxchkver_2_7 %property=Style, read, write - %property=Wildcard, read, write %endclass --- 261,264 ---- *************** *** 296,303 **** !%wxchkver_2_7 void SetStyle(long style) // int ShowModal() - in wxDialog - - %property=Message, read, write - %property=Path, read, write - !%wxchkver_2_7 %property=Style, read, write %endclass --- 287,290 ---- *************** *** 348,354 **** void SetSelection(int selection) const // int ShowModal() - in wxDialog - - %property=StringSelection, read - %property=Selection, read, write %endclass --- 335,338 ---- *************** *** 368,373 **** void SetValue(const wxString& value) // int ShowModal() - in wxDialog - - %property=Value, read, write %endclass --- 352,355 ---- *************** *** 394,399 **** wxFontData& GetFontData() // int ShowModal() - in wxDialog - - %win %property=FontData, read %endclass --- 376,379 ---- *************** *** 405,409 **** %class %delete %noclassinfo wxFontData wxFontData() ! %constructor wxFontDataCopy(const wxFontData& data) void EnableEffects(bool enable) --- 385,389 ---- %class %delete %noclassinfo wxFontData wxFontData() ! wxFontData(const wxFontData& data) void EnableEffects(bool enable) *************** *** 420,428 **** void SetRange(int minimum, int maximum) void SetShowHelp(bool showHelp) - - %property=AllowSymbols, read, write - %property=C... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-05-31 17:19:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** wxbind.h 23 Mar 2007 04:27:22 -0000 1.64 --- wxbind.h 31 May 2007 17:18:47 -0000 1.65 *************** *** 43,49 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 6 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 6 // --------------------------------------------------------------------------- --- 43,49 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' [...2656 lines suppressed...] extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUADEFINE wxWizard_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardEvent; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUADEFINE wxWizardEvent_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPage; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUADEFINE wxWizardPage_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPageSimple; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUADEFINE wxWizardPageSimple_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_enumCount; #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard |
|
From: John L. <jr...@us...> - 2007-05-31 17:19:20
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/bindings/wxluasocket Modified Files: Makefile wxluasocket.i Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 21 Dec 2006 06:02:02 -0000 1.2 --- Makefile 31 May 2007 17:18:45 -0000 1.3 *************** *** 13,21 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxluasocket/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: $(DEPFILES) @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket/error.txt) --- 13,21 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! #DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxluasocket/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket/error.txt) Index: wxluasocket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluasocket.i 13 Dec 2006 06:57:49 -0000 1.9 --- wxluasocket.i 31 May 2007 17:18:45 -0000 1.10 *************** *** 57,70 **** %class %delete wxLuaDebuggerEvent, wxEvent ! %define %event wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED ! %define %event wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED ! %define %event wxEVT_WXLUA_DEBUGGER_BREAK ! %define %event wxEVT_WXLUA_DEBUGGER_PRINT ! %define %event wxEVT_WXLUA_DEBUGGER_ERROR ! %define %event wxEVT_WXLUA_DEBUGGER_EXIT ! %define %event wxEVT_WXLUA_DEBUGGER_STACK_ENUM ! %define %event wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM ! %define %event wxEVT_WXLUA_DEBUGGER_TABLE_ENUM ! %define %event wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR int GetLineNumber() const --- 57,70 ---- %class %delete wxLuaDebuggerEvent, wxEvent ! %define_event wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED ! %define_event wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED ! %define_event wxEVT_WXLUA_DEBUGGER_BREAK ! %define_event wxEVT_WXLUA_DEBUGGER_PRINT ! %define_event wxEVT_WXLUA_DEBUGGER_ERROR ! %define_event wxEVT_WXLUA_DEBUGGER_EXIT ! %define_event wxEVT_WXLUA_DEBUGGER_STACK_ENUM ! %define_event wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM ! %define_event wxEVT_WXLUA_DEBUGGER_TABLE_ENUM ! %define_event wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR int GetLineNumber() const |
|
From: John L. <jr...@us...> - 2007-05-31 17:19:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/bindings/wxstc Modified Files: Makefile stc.i wxstc_datatypes.lua Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** stc.i 9 Mar 2007 00:15:11 -0000 1.8 --- stc.i 31 May 2007 17:18:46 -0000 1.9 *************** *** 3189,3256 **** // void AppendTextRaw(const char* text); - - - %property=Length, read - %property=CharAt, read - %property=ViewWhiteSpace, read, write - %property=Anchor, read, write - %property=EndStyled, read - %property=EOLMode, read, write - %property=BufferedDraw, read, write - %property=TabWidth, read, write - %property=CodePage, read, write - %property=CaretPeriod, read, write - %property=StyleBits, read, write - %property=MaxLineState, read - %property=CaretLineVisible, read, write - !%wxchkver_2_7_1 %property=CaretLineBack, read, write - %wxchkver_2_7_1 %property=CaretLineBackground, read, write - %property=Indent, read, write - %property=UseTabs, read, write - %property=UseHorizontalScrollBar, read, write - %property=IndentationGuides, read, write - %property=HighlightGuide, read, write - %property=CurrentPos, read, write - %property=SelectionStart, read, write - %property=SelectionEnd, read, write - %property=PrintMagnification, read, write - %property=PrintColourMode, read, write - %property=FirstVisibleLine, read - %property=LineCount, read - %property=MarginLeft, read, write - %property=MarginRight, read, write - %property=Modify, read - %property=SelectedText, read - %property=ReadOnly, read, write - %property=Text, read, write - %property=TextLength, read - %property=Overtype, read, write - %property=CaretWidth, read, write - %property=TargetStart, read, write - %property=TargetEnd, read, write - %property=SearchFlags, read, write - %property=TabIndents, read, write - %property=BackSpaceUnIndents, read, write - %property=MouseDwellTime, read, write - %property=WrapMode, read, write - %property=LayoutCache, read, write - %property=ScrollWidth, read, write - %property=EndAtLastLine, read, write - %property=ViewEOL, read, write - %property=DocPointer, read, write - %property=EdgeColumn, read, write - %property=EdgeMode, read, write - %property=EdgeColour, read, write - %property=Zoom, read, write - %property=ModEventMask, read, write - %property=STCFocus, read, write - %property=Status, read, write - %property=MouseDownCaptures, read, write - %property=STCCursor, read, write - %property=ControlCharSymbol, read, write - %property=XOffset, read, write - %property=Lexer, read, write - %property=CurrentLine, read - %property=LastKeydownProcessed, read, write %endclass --- 3189,3192 ---- *************** *** 3261,3291 **** %class %delete wxStyledTextEvent, wxCommandEvent ! %define %event wxEVT_STC_CHANGE ! %define %event wxEVT_STC_STYLENEEDED ! %define %event wxEVT_STC_CHARADDED ! %define %event wxEVT_STC_SAVEPOINTREACHED ! %define %event wxEVT_STC_SAVEPOINTLEFT ! %define %event wxEVT_STC_ROMODIFYATTEMPT ! %define %event wxEVT_STC_KEY ! %define %event wxEVT_STC_DOUBLECLICK ! %define %event wxEVT_STC_UPDATEUI ! %define %event wxEVT_STC_MODIFIED ! %define %event wxEVT_STC_MACRORECORD ! %define %event wxEVT_STC_MARGINCLICK ! %define %event wxEVT_STC_NEEDSHOWN ! !%wxchkver_2_5 %define %event wxEVT_STC_POSCHANGED ! %define %event wxEVT_STC_PAINTED ! %define %event wxEVT_STC_USERLISTSELECTION ! %define %event wxEVT_STC_URIDROPPED ! %define %event wxEVT_STC_DWELLSTART ! %define %event wxEVT_STC_DWELLEND ! %define %event wxEVT_STC_START_DRAG ! %define %event wxEVT_STC_DRAG_OVER ! %define %event wxEVT_STC_DO_DROP ! %define %event wxEVT_STC_ZOOM ! %define %event wxEVT_STC_HOTSPOT_CLICK, ! %define %event wxEVT_STC_HOTSPOT_DCLICK, ! %define %event wxEVT_STC_CALLTIP_CLICK, ! %define %event wxEVT_STC_AUTOCOMP_SELECTION wxStyledTextEvent(wxEventType commandType = 0, int id = 0) --- 3197,3227 ---- %class %delete wxStyledTextEvent, wxCommandEvent ! %define_event wxEVT_STC_CHANGE ! %define_event wxEVT_STC_STYLENEEDED ! %define_event wxEVT_STC_CHARADDED ! %define_event wxEVT_STC_SAVEPOINTREACHED ! %define_event wxEVT_STC_SAVEPOINTLEFT ! %define_event wxEVT_STC_ROMODIFYATTEMPT ! %define_event wxEVT_STC_KEY ! %define_event wxEVT_STC_DOUBLECLICK ! %define_event wxEVT_STC_UPDATEUI ! %define_event wxEVT_STC_MODIFIED ! %define_event wxEVT_STC_MACRORECORD ! %define_event wxEVT_STC_MARGINCLICK ! %define_event wxEVT_STC_NEEDSHOWN ! !%wxchkver_2_5 %define_event wxEVT_STC_POSCHANGED ! %define_event wxEVT_STC_PAINTED ! %define_event wxEVT_STC_USERLISTSELECTION ! %define_event wxEVT_STC_URIDROPPED ! %define_event wxEVT_STC_DWELLSTART ! %define_event wxEVT_STC_DWELLEND ! %define_event wxEVT_STC_START_DRAG ! %define_event wxEVT_STC_DRAG_OVER ! %define_event wxEVT_STC_DO_DROP ! %define_event wxEVT_STC_ZOOM ! %define_event wxEVT_STC_HOTSPOT_CLICK, ! %define_event wxEVT_STC_HOTSPOT_DCLICK, ! %define_event wxEVT_STC_CALLTIP_CLICK, ! %define_event wxEVT_STC_AUTOCOMP_SELECTION wxStyledTextEvent(wxEventType commandType = 0, int id = 0) *************** *** 3334,3361 **** bool GetControl() const bool GetAlt() const - - %property=Position, read, write - %property=Key, read, write - %property=Modifiers, read, write - %property=ModificationType, read, write - %property=Text, read, write - %property=Length, read, write - %property=LinesAdded, read, write - %property=Line, read, write - %property=FoldLevelNow, read, write - %property=FoldLevelPrev, read, write - %property=Margin, read, write - %property=Message, read, write - %property=WParam, read, write - %property=LParam, read, write - %property=ListType, read, write - %property=X, read, write - %property=Y, read, write - %property=DragText, read, write - %property=DragAllowMove, read, write - %property=DragResult, read, write - %property=Shift, read - %property=Control, read - %property=Alt, read %endclass --- 3270,3273 ---- Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 21 Dec 2006 06:02:02 -0000 1.4 --- Makefile 31 May 2007 17:18:46 -0000 1.5 *************** *** 13,21 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxstc/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: $(DEPFILES) @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc/error.txt) --- 13,21 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! #DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxstc/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc/error.txt) Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** wxstc_datatypes.lua 19 Mar 2007 03:47:17 -0000 1.50 --- wxstc_datatypes.lua 31 May 2007 17:18:46 -0000 1.51 *************** *** 1879,1882 **** --- 1879,1888 ---- Name = "wxKillError", }, + wxKillFlags = { + Condition = "wxLUA_USE_wxProcess", + DefType = "enum", + IsNumber = true, + Name = "wxKillFlags", + }, wxLanguage = { Condition = "wxUSE_INTL", |
