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...> - 2006-05-16 03:32:31
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30482/wxLua/docs Added Files: wxluaref.html Log Message: add generated reference manual based on the .i files --- NEW FILE: wxluaref.html --- <!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 Class Reference</title> <meta content="John Labenski" name="author"> </head> <body> <h1>wxLua Class Reference for wxWidgets 2.6.3</h1> <h2>wxWidgets Classes</h2> <a href="#wxANIHandler">wxANIHandler</a><br> <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a><br> <a href="#wxAcceleratorTable">wxAcceleratorTable</a><br> wxAccessible - NOT WRAPPED<br> <a href="#wxActivateEvent">wxActivateEvent</a><br> <a href="#wxApp">wxApp</a><br> wxArchiveClassFactory - NOT WRAPPED<br> wxArchiveEntry - NOT WRAPPED<br> wxArchiveInputStream - NOT WRAPPED<br> [...11953 lines suppressed...] <font color=#FF0000> <i>%rename</i> LoadDialogCreate bool LoadDialog(<a href="#wxDialog">wxDialog</a>* dlg, <a href="#wxWindow">wxWindow</a> *parent, const <a href="#wxString">wxString</a> &name);</font><br> <a href="#wxDialog">wxDialog</a>* CreateDialog(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& name);<br> bool LoadFrame(<a href="#wxFrame">wxFrame</a>* frame, <a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& name);<br> <a href="#wxFrame">wxFrame</a>* CreateFrame(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& name);<br> <a href="#wxIcon">wxIcon</a> LoadIcon(const <a href="#wxString">wxString</a>& name);<br> <a href="#wxMenu">wxMenu</a>* LoadMenu(const <a href="#wxString">wxString</a>& name);<br> <font color=#FF0000> <i>%rename</i> LoadMenuBarWindow <a href="#wxMenuBar">wxMenuBar</a>* LoadMenuBar(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& name);</font><br> <a href="#wxMenuBar">wxMenuBar</a>* LoadMenuBar(const <a href="#wxString">wxString</a>& name);<br> <a href="#wxPanel">wxPanel</a>* LoadPanel(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a> &name);<br> <font color=#FF0000> <i>%rename</i> LoadPanelCreate bool LoadPanel(<a href="#wxPanel">wxPanel</a> *panel, <a href="#wxWindow">wxWindow</a> *parent, const <a href="#wxString">wxString</a> &name);</font><br> <a href="#wxToolBar">wxToolBar</a>* LoadToolBar(<a href="#wxWindow">wxWindow</a> *parent, const <a href="#wxString">wxString</a>& name);<br> <a href="#wxXmlResource">wxXmlResource</a>* Set(<a href="#wxXmlResource">wxXmlResource</a> *res);<br> int GetFlags();<br> void SetFlags(int flags);<br> <font color=#000088> <i>%property</i>=Flags, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> <i>%endif</i> wxLUA_USE_wxXMLResource<br> </body> </html> |
|
From: John L. <jr...@us...> - 2006-05-15 22:57:33
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4198/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: add back wxWizard in dialogs.i Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxstc_datatypes.lua 14 May 2006 13:11:49 -0000 1.21 --- wxstc_datatypes.lua 15 May 2006 22:57:29 -0000 1.22 *************** *** 2871,2874 **** --- 2871,2902 ---- Name = "wxWindowVariant", }, + wxWizard = { + BaseClass = "wxDialog", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizard", + }, + wxWizardEvent = { + BaseClass = "wxNotifyEvent", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizardEvent", + }, + wxWizardPage = { + BaseClass = "wxPanel", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizardPage", + }, + wxWizardPageSimple = { + BaseClass = "wxWizardPage", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizardPageSimple", + }, wxWord = { DefType = "wxtypedef", |
|
From: John L. <jr...@us...> - 2006-05-15 22:57:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4198/wxLua/modules/wxbind/src Modified Files: dialogs.cpp wx_bind.cpp Log Message: add back wxWizard in dialogs.i Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wx_bind.cpp 13 May 2006 17:20:52 -0000 1.36 --- wx_bind.cpp 15 May 2006 22:57:30 -0000 1.37 *************** *** 388,391 **** --- 388,400 ---- #endif + + #if wxLUA_USE_wxWizard + { &wxEVT_WIZARD_CANCEL, "wxEVT_WIZARD_CANCEL", &s_wxluatag_wxWizardEvent }, + { &wxEVT_WIZARD_FINISHED, "wxEVT_WIZARD_FINISHED", &s_wxluatag_wxWizardEvent }, + { &wxEVT_WIZARD_HELP, "wxEVT_WIZARD_HELP", &s_wxluatag_wxWizardEvent }, + { &wxEVT_WIZARD_PAGE_CHANGED, "wxEVT_WIZARD_PAGE_CHANGED", &s_wxluatag_wxWizardEvent }, + { &wxEVT_WIZARD_PAGE_CHANGING, "wxEVT_WIZARD_PAGE_CHANGING", &s_wxluatag_wxWizardEvent }, + #endif + { 0, 0, 0 }, }; *************** *** 1432,1435 **** --- 1441,1449 ---- #endif + + #if wxLUA_USE_wxWizard + { "wxWIZARD_EX_HELPBUTTON", wxWIZARD_EX_HELPBUTTON }, + #endif + // -------------------------------------------------------------------- // %enum *************** *** 6104,6107 **** --- 6118,6129 ---- + #if wxLUA_USE_wxWizard + { "wxWizard", wxWizard_methods, wxWizard_methodCount, -1, CLASSINFO(wxWizard), &s_wxluatag_wxWizard, "wxDialog" }, + { "wxWizardEvent", wxWizardEvent_methods, wxWizardEvent_methodCount, -1, CLASSINFO(wxWizardEvent), &s_wxluatag_wxWizardEvent, "wxNotifyEvent" }, + { "wxWizardPage", wxWizardPage_methods, wxWizardPage_methodCount, -1, CLASSINFO(wxWizardPage), &s_wxluatag_wxWizardPage, "wxPanel" }, + { "wxWizardPageSimple", wxWizardPageSimple_methods, wxWizardPageSimple_methodCount, -1, CLASSINFO(wxWizardPageSimple), &s_wxluatag_wxWizardPageSimple, "wxWizardPage" }, + #endif + + #if wxLUA_USE_wxXMLResource { "wxXmlDocument", wxXmlDocument_methods, wxXmlDocument_methodCount, -1, NULL, &s_wxluatag_wxXmlDocument, NULL }, Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** dialogs.cpp 14 May 2006 13:11:49 -0000 1.14 --- dialogs.cpp 15 May 2006 22:57:30 -0000 1.15 *************** *** 2448,2449 **** --- 2448,3015 ---- #endif + + #if wxLUA_USE_wxWizard + // ------------------------------------------------------------------------------------------------- + // Bind class wxWizard + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWizard = -1; + + + #if ((wxLUA_USE_wxWizard) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) + // wxWizard(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE) + static int LUACALL wxLua_wxWizard_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWizard *returns; + // get number of arguments + int argCount = lua_gettop(L); + // long style = wxDEFAULT_DIALOG_STYLE + long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDEFAULT_DIALOG_STYLE); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxBitmap bitmap = wxNullBitmap + const wxBitmap * bitmap = (argCount >= 4 ? (const wxBitmap *)wxlState.GetUserDataType(4, s_wxluatag_wxBitmap) : &wxNullBitmap); + // const wxString title = "" + const wxString title = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); + // int id = -1 + int id = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxWizard(parent, id, title, *bitmap, *pos, style); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWizard, returns); + + return 1; + } + + // bool Create(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE) + static int LUACALL wxLua_wxWizard_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // long style = wxDEFAULT_DIALOG_STYLE + long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_DIALOG_STYLE); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxBitmap bitmap = wxNullBitmap + const wxBitmap * bitmap = (argCount >= 5 ? (const wxBitmap *)wxlState.GetUserDataType(5, s_wxluatag_wxBitmap) : &wxNullBitmap); + // const wxString title = "" + const wxString title = (argCount >= 4 ? lua2wx(wxlState.GetStringType(4)) : wxString(wxEmptyString)); + // int id = -1 + int id = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : -1); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call Create + returns = self->Create(parent, id, title, *bitmap, *pos, style); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif + + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxPointSizeRect) + // wxSize GetPageSize() const + static int LUACALL wxLua_wxWizard_GetPageSize(lua_State *L) + { + wxLuaState wxlState(L); + wxSize *returns; + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call GetPageSize + // allocate a new object using the copy constructor + returns = new wxSize(self->GetPageSize()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxSize *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxSize, returns); + + return 1; + } + + // void SetPageSize(const wxSize& sizePage) + static int LUACALL wxLua_wxWizard_SetPageSize(lua_State *L) + { + wxLuaState wxlState(L); + // const wxSize sizePage + const wxSize * sizePage = (const wxSize *)wxlState.GetUserDataType(2, s_wxluatag_wxSize); + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call SetPageSize + self->SetPageSize(*sizePage); + + return 0; + } + + #endif + + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxSizer) + // virtual wxSizer* GetPageAreaSizer() const + static int LUACALL wxLua_wxWizard_GetPageAreaSizer(lua_State *L) + { + wxLuaState wxlState(L); + wxSizer *returns; + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call GetPageAreaSizer + returns = self->GetPageAreaSizer(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxSizer, returns); + + return 1; + } + + #endif + + // %constructor wxWizardDefault() + static int LUACALL wxLua_wxWizardDefault_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWizard *returns; + // call constructor + returns = new wxWizard(); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWizard, returns); + + return 1; + } + + // wxWizardPage* GetCurrentPage() const + static int LUACALL wxLua_wxWizard_GetCurrentPage(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardPage *returns; + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call GetCurrentPage + returns = self->GetCurrentPage(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWizardPage, returns); + + return 1; + } + + // virtual bool HasNextPage(wxWizardPage *page) + static int LUACALL wxLua_wxWizard_HasNextPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxWizardPage page + wxWizardPage * page = (wxWizardPage *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPage); + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call HasNextPage + returns = self->HasNextPage(page); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // virtual bool HasPrevPage(wxWizardPage *page) + static int LUACALL wxLua_wxWizard_HasPrevPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxWizardPage page + wxWizardPage * page = (wxWizardPage *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPage); + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call HasPrevPage + returns = self->HasPrevPage(page); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool RunWizard(wxWizardPage* firstPage) + static int LUACALL wxLua_wxWizard_RunWizard(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxWizardPage firstPage + wxWizardPage * firstPage = (wxWizardPage *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPage); + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call RunWizard + returns = self->RunWizard(firstPage); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // void SetBorder(int border) + static int LUACALL wxLua_wxWizard_SetBorder(lua_State *L) + { + wxLuaState wxlState(L); + // int border + int border = (int)wxlState.GetNumberType(2); + // get this + wxWizard * self = (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard); + // call SetBorder + self->SetBorder(border); + + return 0; + } + + static int LUACALL wxLua_wxWizard_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxWizard_methods[] = { + + #if ((wxLUA_USE_wxWizard) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) + { LuaConstructor, "wxWizard", wxLua_wxWizard_constructor, 6, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxBitmap, &s_wxluatag_wxPoint, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Create", wxLua_wxWizard_Create, 6, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxBitmap, &s_wxluatag_wxPoint, &s_wxluaarg_Number, 0 } }, + #endif + + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, "GetPageSize", wxLua_wxWizard_GetPageSize, 0, 0, { 0 } }, + { LuaMethod, "SetPageSize", wxLua_wxWizard_SetPageSize, 1, 1, { &s_wxluatag_wxSize, 0 } }, + #endif + + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxSizer) + { LuaMethod, "GetPageAreaSizer", wxLua_wxWizard_GetPageAreaSizer, 0, 0, { 0 } }, + #endif + + { LuaConstructor, "wxWizardDefault", wxLua_wxWizardDefault_constructor, 0, 0, { 0 } }, + { LuaMethod, "GetCurrentPage", wxLua_wxWizard_GetCurrentPage, 0, 0, { 0 } }, + { LuaMethod, "HasNextPage", wxLua_wxWizard_HasNextPage, 1, 1, { &s_wxluatag_wxWizardPage, 0 } }, + { LuaMethod, "HasPrevPage", wxLua_wxWizard_HasPrevPage, 1, 1, { &s_wxluatag_wxWizardPage, 0 } }, + { LuaMethod, "RunWizard", wxLua_wxWizard_RunWizard, 1, 1, { &s_wxluatag_wxWizardPage, 0 } }, + { LuaMethod, "SetBorder", wxLua_wxWizard_SetBorder, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaDelete, "wxWizard", wxLua_wxWizard_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWizard_methods = s_wxWizard_methods; + int wxWizard_methodCount = sizeof(s_wxWizard_methods)/sizeof(s_wxWizard_methods[0]); + #endif + + + #if wxLUA_USE_wxWizard + // ------------------------------------------------------------------------------------------------- + // Bind class wxWizardPage + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWizardPage = -1; + + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxBitmap) + // wxBitmap GetBitmap() const + static int LUACALL wxLua_wxWizardPage_GetBitmap(lua_State *L) + { + wxLuaState wxlState(L); + wxBitmap *returns; + // get this + wxWizardPage * self = (wxWizardPage *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardPage); + // call GetBitmap + // allocate a new object using the copy constructor + returns = new wxBitmap(self->GetBitmap()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); + + return 1; + } + + #endif + + static int LUACALL wxLua_wxWizardPage_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxWizardPage_methods[] = { + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxBitmap) + { LuaMethod, "GetBitmap", wxLua_wxWizardPage_GetBitmap, 0, 0, { 0 } }, + #endif + + { LuaDelete, "wxWizardPage", wxLua_wxWizardPage_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWizardPage_methods = s_wxWizardPage_methods; + int wxWizardPage_methodCount = sizeof(s_wxWizardPage_methods)/sizeof(s_wxWizardPage_methods[0]); + #endif + + + #if wxLUA_USE_wxWizard + // ------------------------------------------------------------------------------------------------- + // Bind class wxWizardPageSimple + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWizardPageSimple = -1; + + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxBitmap) + // wxWizardPageSimple(wxWizard* parent = NULL, wxWizardPage* prev = NULL, wxWizardPage* next = NULL, const wxBitmap& bitmap = wxNullBitmap) + static int LUACALL wxLua_wxWizardPageSimple_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardPageSimple *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxBitmap bitmap = wxNullBitmap + const wxBitmap * bitmap = (argCount >= 4 ? (const wxBitmap *)wxlState.GetUserDataType(4, s_wxluatag_wxBitmap) : &wxNullBitmap); + // wxWizardPage next = NULL + wxWizardPage * next = (argCount >= 3 ? (wxWizardPage *)wxlState.GetUserDataType(3, s_wxluatag_wxWizardPage) : NULL); + // wxWizardPage prev = NULL + wxWizardPage * prev = (argCount >= 2 ? (wxWizardPage *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPage) : NULL); + // wxWizard parent = NULL + wxWizard * parent = (argCount >= 1 ? (wxWizard *)wxlState.GetUserDataType(1, s_wxluatag_wxWizard) : NULL); + // call constructor + returns = new wxWizardPageSimple(parent, prev, next, *bitmap); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWizardPageSimple, returns); + + return 1; + } + + #endif + + // virtual wxWizardPage* GetPrev() const + static int LUACALL wxLua_wxWizardPageSimple_GetPrev(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardPage *returns; + // get this + wxWizardPageSimple * self = (wxWizardPageSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardPageSimple); + // call GetPrev + returns = self->GetPrev(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWizardPage, returns); + + return 1; + } + + // virtual wxWizardPage* GetNext() const + static int LUACALL wxLua_wxWizardPageSimple_GetNext(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardPage *returns; + // get this + wxWizardPageSimple * self = (wxWizardPageSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardPageSimple); + // call GetNext + returns = self->GetNext(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWizardPage, returns); + + return 1; + } + + // void SetPrev(wxWizardPage* prev) + static int LUACALL wxLua_wxWizardPageSimple_SetPrev(lua_State *L) + { + wxLuaState wxlState(L); + // wxWizardPage prev + wxWizardPage * prev = (wxWizardPage *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPage); + // get this + wxWizardPageSimple * self = (wxWizardPageSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardPageSimple); + // call SetPrev + self->SetPrev(prev); + + return 0; + } + + // void SetNext(wxWizardPage* next) + static int LUACALL wxLua_wxWizardPageSimple_SetNext(lua_State *L) + { + wxLuaState wxlState(L); + // wxWizardPage next + wxWizardPage * next = (wxWizardPage *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPage); + // get this + wxWizardPageSimple * self = (wxWizardPageSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardPageSimple); + // call SetNext + self->SetNext(next); + + return 0; + } + + // static void Chain(wxWizardPageSimple* first, wxWizardPageSimple* second) + static int LUACALL wxLua_wxWizardPageSimple_Chain(lua_State *L) + { + wxLuaState wxlState(L); + // wxWizardPageSimple second + wxWizardPageSimple * second = (wxWizardPageSimple *)wxlState.GetUserDataType(3, s_wxluatag_wxWizardPageSimple); + // wxWizardPageSimple first + wxWizardPageSimple * first = (wxWizardPageSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxWizardPageSimple); + // call Chain + wxWizardPageSimple::Chain(first, second); + + return 0; + } + + static int LUACALL wxLua_wxWizardPageSimple_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxWizardPageSimple_methods[] = { + + #if (wxLUA_USE_wxWizard) && (wxLUA_USE_wxBitmap) + { LuaConstructor, "wxWizardPageSimple", wxLua_wxWizardPageSimple_constructor, 4, 0, { &s_wxluatag_wxWizard, &s_wxluatag_wxWizardPage, &s_wxluatag_wxWizardPage, &s_wxluatag_wxBitmap, 0 } }, + #endif + + { LuaMethod, "GetPrev", wxLua_wxWizardPageSimple_GetPrev, 0, 0, { 0 } }, + { LuaMethod, "GetNext", wxLua_wxWizardPageSimple_GetNext, 0, 0, { 0 } }, + { LuaMethod, "SetPrev", wxLua_wxWizardPageSimple_SetPrev, 1, 1, { &s_wxluatag_wxWizardPage, 0 } }, + { LuaMethod, "SetNext", wxLua_wxWizardPageSimple_SetNext, 1, 1, { &s_wxluatag_wxWizardPage, 0 } }, + { LuaMethod, "Chain", wxLua_wxWizardPageSimple_Chain, 2, 2, { &s_wxluatag_wxWizardPageSimple, &s_wxluatag_wxWizardPageSimple, 0 } }, + { LuaDelete, "wxWizardPageSimple", wxLua_wxWizardPageSimple_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWizardPageSimple_methods = s_wxWizardPageSimple_methods; + int wxWizardPageSimple_methodCount = sizeof(s_wxWizardPageSimple_methods)/sizeof(s_wxWizardPageSimple_methods[0]); + #endif + + + #if wxLUA_USE_wxWizard + // ------------------------------------------------------------------------------------------------- + // Bind class wxWizardEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWizardEvent = -1; + + // wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true) + static int LUACALL wxLua_wxWizardEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // bool direction = true + bool direction = (argCount >= 3 ? wxlState.GetBooleanType(3) : true); + // int id = -1 + int id = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); + // wxEventType type = wxEVT_NULL + wxEventType type = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL); + // call constructor + returns = new wxWizardEvent(type, id, direction); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxWizardEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWizardEvent, returns); + + return 1; + } + + // bool GetDirection() const + static int LUACALL wxLua_wxWizardEvent_GetDirection(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxWizardEvent * self = (wxWizardEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardEvent); + // call GetDirection + returns = self->GetDirection(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // wxWizardPage* GetPage() const + static int LUACALL wxLua_wxWizardEvent_GetPage(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardPage *returns; + // get this + wxWizardEvent * self = (wxWizardEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardEvent); + // call GetPage + returns = self->GetPage(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWizardPage, returns); + + return 1; + } + + static int LUACALL wxLua_wxWizardEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardEvent * self = (wxWizardEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxWizardEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxWizardEvent * self = (wxWizardEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxWizardEvent); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedMemory(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxWizardEvent_methods[] = { + { LuaConstructor, "wxWizardEvent", wxLua_wxWizardEvent_constructor, 3, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "GetDirection", wxLua_wxWizardEvent_GetDirection, 0, 0, { 0 } }, + { LuaMethod, "GetPage", wxLua_wxWizardEvent_GetPage, 0, 0, { 0 } }, + { LuaGetProp, "Direction", wxLua_wxWizardEvent_GetDirection, 0, 0, {0} }, + { LuaDelete, "wxWizardEvent", wxLua_wxWizardEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxWizardEvent_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWizardEvent_methods = s_wxWizardEvent_methods; + int wxWizardEvent_methodCount = sizeof(s_wxWizardEvent_methods)/sizeof(s_wxWizardEvent_methods[0]); + #endif + |
|
From: John L. <jr...@us...> - 2006-05-15 22:57:32
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4198/wxLua/bindings/wxwidgets Modified Files: dialogs.i wx_datatypes.lua Log Message: add back wxWizard in dialogs.i Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wx_datatypes.lua 13 May 2006 17:20:51 -0000 1.25 --- wx_datatypes.lua 15 May 2006 22:57:29 -0000 1.26 *************** *** 2858,2861 **** --- 2858,2889 ---- Name = "wxWindowVariant", }, + wxWizard = { + BaseClass = "wxDialog", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizard", + }, + wxWizardEvent = { + BaseClass = "wxNotifyEvent", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizardEvent", + }, + wxWizardPage = { + BaseClass = "wxPanel", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizardPage", + }, + wxWizardPageSimple = { + BaseClass = "wxWizardPage", + Condition = "wxLUA_USE_wxWizard", + DefType = "class", + Intrinsic = false, + Name = "wxWizardPageSimple", + }, wxWord = { DefType = "wxtypedef", Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** dialogs.i 14 May 2006 13:11:49 -0000 1.16 --- dialogs.i 15 May 2006 22:57:29 -0000 1.17 *************** *** 431,482 **** // wxWizard - // TODO - wxWizard is not fully implemented or tested - %if wxLUA_USE_wxWizard ! //%include "wx/wizard.h" ! //%define wxWIZARD_EX_HELPBUTTON ! //%class wxWizard, wxDialog ! // static wxWizard* Create(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition) ! // bool RunWizard(wxWizardPage* firstPage) ! // wxWizardPage* GetCurrentPage() const ! // wxSize GetPageSize() const ! // void SetPageSize(const wxSize& sizePage) ! //%endclass /////////////////////////////////////////////////////////////////////////////// // wxWizardPage - this has virtual functions so it can't be used? ! //%class wxWizardPage, wxPanel ! // wxWizardPage(wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap) ! // wxWizardPage* GetPrev() const ! // wxWizardPage* GetNext() const ! // wxBitmap GetBitmap() const ! //%endclass /////////////////////////////////////////////////////////////////////////////// ! // wxWizardPageSimple ! //%class wxWizardPageSimple, wxWizardPage ! // wxWizardPageSimple(wxWizard* parent = NULL, wxWizardPage* prev = NULL, wxWizardPage* next = NULL) ! // void SetPrev(wxWizardPage* prev) ! // void SetNext(wxWizardPage* next) ! // static void Chain(wxWizardPageSimple* first, wxWizardPageSimple* second) ! //%endclass /////////////////////////////////////////////////////////////////////////////// // wxWizardEvent ! //%class %delete wxWizardEvent, wxNotifyEvent ! // %define %event wxEVT_WIZARD_CANCEL ! // %define %event wxEVT_WIZARD_PAGE_CHANGED ! // %define %event wxEVT_WIZARD_PAGE_CHANGING ! // %define %event wxEVT_WIZARD_HELP ! // ! // wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true) ! // bool GetDirection() const ! // %property=Direction, read ! //%endclass %endif wxLUA_USE_wxWizard --- 431,497 ---- // wxWizard %if wxLUA_USE_wxWizard ! %include "wx/wizard.h" ! %define wxWIZARD_EX_HELPBUTTON ! %class wxWizard, wxDialog ! %constructor wxWizardDefault() ! wxWizard(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE) ! ! bool Create(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE) ! wxWizardPage* GetCurrentPage() const ! virtual wxSizer* GetPageAreaSizer() const ! wxSize GetPageSize() const ! virtual bool HasNextPage(wxWizardPage *page) ! virtual bool HasPrevPage(wxWizardPage *page) ! bool RunWizard(wxWizardPage* firstPage) ! void SetPageSize(const wxSize& sizePage) ! void SetBorder(int border) ! %endclass /////////////////////////////////////////////////////////////////////////////// // wxWizardPage - this has virtual functions so it can't be used? ! %class wxWizardPage, wxPanel ! //wxWizardPage(wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap, const wxChar *resource = NULL) ! ! //virtual wxWizardPage* GetPrev() const // FIXME not virtual for wxLua ! //virtual wxWizardPage* GetNext() const ! wxBitmap GetBitmap() const ! %endclass /////////////////////////////////////////////////////////////////////////////// ! // wxWizardPageSimple - use this ! ! %class wxWizardPageSimple, wxWizardPage ! wxWizardPageSimple(wxWizard* parent = NULL, wxWizardPage* prev = NULL, wxWizardPage* next = NULL, const wxBitmap& bitmap = wxNullBitmap) ! ! virtual wxWizardPage* GetPrev() const ! virtual wxWizardPage* GetNext() const ! ! void SetPrev(wxWizardPage* prev) ! void SetNext(wxWizardPage* next) ! static void Chain(wxWizardPageSimple* first, wxWizardPageSimple* second) ! %endclass /////////////////////////////////////////////////////////////////////////////// // wxWizardEvent ! %class %delete wxWizardEvent, wxNotifyEvent ! %define %event wxEVT_WIZARD_CANCEL ! %define %event wxEVT_WIZARD_PAGE_CHANGED ! %define %event wxEVT_WIZARD_PAGE_CHANGING ! %define %event wxEVT_WIZARD_HELP ! %define %event wxEVT_WIZARD_FINISHED ! ! wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true) ! ! bool GetDirection() const ! wxWizardPage* GetPage() const ! ! %property=Direction, read ! %endclass %endif wxLUA_USE_wxWizard |
|
From: John L. <jr...@us...> - 2006-05-15 22:57:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4198/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: add back wxWizard in dialogs.i Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxbind.h 13 May 2006 17:20:51 -0000 1.23 --- wxbind.h 15 May 2006 22:57:30 -0000 1.24 *************** *** 634,637 **** --- 634,642 ---- + #if wxLUA_USE_wxWizard + #include "wx/wizard.h" + #endif + + #if wxLUA_USE_wxXMLResource #include "wx/xrc/xmlres.h" *************** *** 1500,1503 **** --- 1505,1516 ---- + #if wxLUA_USE_wxWizard + extern int s_wxluatag_wxWizard; + extern int s_wxluatag_wxWizardEvent; + extern int s_wxluatag_wxWizardPage; + extern int s_wxluatag_wxWizardPageSimple; + #endif + + #if wxLUA_USE_wxXMLResource extern int s_wxluatag_wxXmlDocument; *************** *** 2689,2692 **** --- 2702,2717 ---- + #if wxLUA_USE_wxWizard + extern WXLUAMETHOD* wxWizard_methods; + extern int wxWizard_methodCount; + extern WXLUAMETHOD* wxWizardEvent_methods; + extern int wxWizardEvent_methodCount; + extern WXLUAMETHOD* wxWizardPage_methods; + extern int wxWizardPage_methodCount; + extern WXLUAMETHOD* wxWizardPageSimple_methods; + extern int wxWizardPageSimple_methodCount; + #endif + + #if wxLUA_USE_wxXMLResource extern WXLUAMETHOD* wxXmlDocument_methods; |
|
From: John L. <jr...@us...> - 2006-05-15 21:57:52
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16071/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: update editor, see samples editor Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** editor.h 15 May 2006 04:48:37 -0000 1.13 --- editor.h 15 May 2006 21:57:49 -0000 1.14 *************** *** 9,1956 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 77502; ! const unsigned char wxLuaEditor[77503] = { ! 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, ! 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, ! 45, 45, 32, 80,117,114,112,111,115,101, 58, 32, 32, 32, 32, 32,119,120, 76,117, 97, 32, 73, 68, 69, 10, ! 45, 45, 32, 65,117,116,104,111,114, 58, 32, 32, 32, 32, 32, 32, 74, 32, 87,105,110,119,111,111,100, 10, ! 45, 45, 32, 67,114,101, 97,116,101,100, 58, 32, 32, 32, 32, 32, 77, 97,114, 99,104, 32, 50, 48, 48, 50, 10, ! 45, 45, 32, 67,111,112,121,114,105,103,104,116, 58, 32, 32, 32, 40, 99, 41, 32, 50, 48, 48, 50, 45, 53, 32, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 46, 32, 65,108,108, 32,114,105,103,104,116,115, 32,114,101,115,101,114,118,101,100, 46, 10, [...3915 lines suppressed...] ! 13, 10, ! 32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 13, 10, ! 32, 32, 32, 32,101,110,100, 13, 10, ! 13, 10, ! 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 13, 10, ! 32, 32, 32, 32,101,108,115,101, 13, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 13, 10, ! 32, 32, 32, 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 13, 10, ! 32, 32, 32, 32,101,110,100, 13, 10, ! 101,108,115,101, 13, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 13, 10, ! 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 13, 10, ! 101,110,100, 13, 10, ! 13, 10, ! 45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 13, 10, 0 }; |
|
From: John L. <jr...@us...> - 2006-05-15 21:55:39
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15038/wxLua/bindings/wxwidgets Modified Files: menutool.i override.hpp Log Message: add ability to use wxItemKind in wxCreateMenu override fix wxConfig:ReadInt to use long not double lots of cleanup in editor.wx.lua, fix autocompletion, update keywords to 5.1, formatting Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** menutool.i 1 May 2006 19:36:30 -0000 1.8 --- menutool.i 15 May 2006 21:55:35 -0000 1.9 *************** *** 28,32 **** %class wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) ! // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "Creates an empty document"}, {}, {item 2}}, const wxString& title, long style) - empty tables are separators %constructor wxCreateMenu(int luatable, const wxString& title = "", long style = 0) --- 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 %constructor wxCreateMenu(int luatable, const wxString& title = "", long style = 0) Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** override.hpp 13 May 2006 17:20:51 -0000 1.37 --- override.hpp 15 May 2006 21:55:35 -0000 1.38 *************** *** 488,492 **** { wxLuaState wxlState(L); ! double returns; // get number of arguments int argCount = lua_gettop(L); --- 488,492 ---- { wxLuaState wxlState(L); ! long returns = 0; // get number of arguments int argCount = lua_gettop(L); *************** *** 513,517 **** { wxLuaState wxlState(L); ! double returns; // get number of arguments int argCount = lua_gettop(L); --- 513,517 ---- { wxLuaState wxlState(L); ! double returns = 0; // get number of arguments int argCount = lua_gettop(L); *************** *** 3168,3171 **** --- 3168,3172 ---- wxString helpText; wxString menuText; + wxItemKind kind = wxITEM_NORMAL; int iValue = (int)lua_tonumber(L, -1); *************** *** 3183,3187 **** lua_pop(L, 1); ! returns->Append(iValue, menuText, helpText); } } --- 3184,3194 ---- lua_pop(L, 1); ! lua_pushnumber(L, 4); ! lua_gettable(L, -2); ! if (lua_isnumber(L, -1)) ! kind = (wxItemKind)wxlState.GetEnumerationType(-1); ! lua_pop(L, 1); ! ! returns->Append(iValue, menuText, helpText, kind); } } |
|
From: John L. <jr...@us...> - 2006-05-15 21:55:39
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15038/wxLua/samples Modified Files: editor.wx.lua Log Message: add ability to use wxItemKind in wxCreateMenu override fix wxConfig:ReadInt to use long not double lots of cleanup in editor.wx.lua, fix autocompletion, update keywords to 5.1, formatting Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** editor.wx.lua 15 May 2006 04:48:38 -0000 1.16 --- editor.wx.lua 15 May 2006 21:55:36 -0000 1.17 *************** *** 8,48 **** -------------------------------------------------------------------------=--- ! local ID_REDO = wx.wxID_HIGHEST + 1 ! local ID_SELECTALL = wx.wxID_HIGHEST + 2 ! local ID_FINDNEXT = wx.wxID_HIGHEST + 3 ! local ID_FINDPREV = wx.wxID_HIGHEST + 4 ! local ID_REPLACE = wx.wxID_HIGHEST + 5 ! local ID_GOTOLINE = wx.wxID_HIGHEST + 6 ! local ID_TOGGLEBREAKPOINT = wx.wxID_HIGHEST + 7 ! local ID_COMPILE = wx.wxID_HIGHEST + 8 [...2284 lines suppressed...] --- 1947,1955 ---- end ! helpMenu = wx.wxCreateMenu{ ! { ID_ABOUT, "&About", "About wxLua IDE" }} ! menuBar:Append(helpMenu, "&Help") ! ! frame:ConnectEvent(ID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, displayAbout) frame:SetStatusWidths{-1, 29, 29, 150} *************** *** 1938,1941 **** --- 1983,1989 ---- setupKeywords(editor, 1) end + else + local editor = createEditor("Untitled") + setupKeywords(editor, 1) end |
|
From: John L. <jr...@us...> - 2006-05-15 21:55:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15038/wxLua/modules/wxbind/src Modified Files: config.cpp menutool.cpp Log Message: add ability to use wxItemKind in wxCreateMenu override fix wxConfig:ReadInt to use long not double lots of cleanup in editor.wx.lua, fix autocompletion, update keywords to 5.1, formatting Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** config.cpp 2 May 2006 05:25:01 -0000 1.16 --- config.cpp 15 May 2006 21:55:35 -0000 1.17 *************** *** 511,515 **** { wxLuaState wxlState(L); ! double returns; // get number of arguments int argCount = lua_gettop(L); --- 511,515 ---- { wxLuaState wxlState(L); ! long returns = 0; // get number of arguments int argCount = lua_gettop(L); *************** *** 535,539 **** { wxLuaState wxlState(L); ! double returns; // get number of arguments int argCount = lua_gettop(L); --- 535,539 ---- { wxLuaState wxlState(L); ! double returns = 0; // get number of arguments int argCount = lua_gettop(L); Index: menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** menutool.cpp 2 May 2006 05:25:02 -0000 1.14 --- menutool.cpp 15 May 2006 21:55:35 -0000 1.15 *************** *** 98,101 **** --- 98,102 ---- wxString helpText; wxString menuText; + wxItemKind kind = wxITEM_NORMAL; int iValue = (int)lua_tonumber(L, -1); *************** *** 113,117 **** lua_pop(L, 1); ! returns->Append(iValue, menuText, helpText); } } --- 114,124 ---- lua_pop(L, 1); ! lua_pushnumber(L, 4); ! lua_gettable(L, -2); ! if (lua_isnumber(L, -1)) ! kind = (wxItemKind)wxlState.GetEnumerationType(-1); ! lua_pop(L, 1); ! ! returns->Append(iValue, menuText, helpText, kind); } } |
|
From: John L. <jr...@us...> - 2006-05-15 05:28:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16623/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp Log Message: fix for splittree in msw not being a wxScrolledWindow Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** splttree.cpp 15 May 2006 04:48:37 -0000 1.10 --- splttree.cpp 15 May 2006 05:28:53 -0000 1.11 *************** *** 172,175 **** --- 172,177 ---- void wxRemotelyScrolledTreeCtrl::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const { + // wxTreeCtrl is not a scrolled window in MSW so don't do anything + #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) int vx = 0, vy = 0; GetViewStart(&vx, &vy); *************** *** 180,186 **** --- 182,193 ---- if (xx) *xx = x - vx*pixelsPerUnitX; if (yy) *yy = y - vy*pixelsPerUnitY; + #else + if (xx) *xx = x; + if (yy) *yy = y; + #endif } void wxRemotelyScrolledTreeCtrl::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const { + #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) int vx = 0, vy = 0; GetViewStart(&vx, &vy); *************** *** 191,194 **** --- 198,205 ---- if (xx) *xx = x + vx*pixelsPerUnitX; if (yy) *yy = y + vy*pixelsPerUnitY; + #else + if (xx) *xx = x; + if (yy) *yy = y; + #endif } |
|
From: John L. <jr...@us...> - 2006-05-15 04:48:41
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3872/wxLua/apps/wxlua/src Modified Files: Makefile editor.h lconsole.cpp lconsole.h wxlua.cpp wxlua.h Log Message: cleanup the app wxlua editor, don't try to run all the notebook pages at once make lconsole available for app wxLua use wxCmdLineParser in app wxlua push full args in app wxlua fix splittree to scroll child for generic treectrl in 2.6.3 Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** editor.h 23 Apr 2006 19:36:48 -0000 1.12 --- editor.h 15 May 2006 04:48:37 -0000 1.13 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 80266; ! const unsigned char wxLuaEditor[80267] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 77502; [...2181 lines suppressed...] ! 10, ! 105,102, 32, 97,114,103, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 45, 45, 32, 97,114,103,117,109,101,110,116,115, 32,112,117,115,104,101,100, 32,105,110,116,111, 32,119,120, 76,117, 97, 32, 97,114,101, 32, 91, 67, 43, 43, 32, 97,112,112, 93, 91,108,117, 97, 32,112,114,111,103, 93, 91, 97,114,103,115, 32,102,111,114, 32,108,117, 97, 32,115,116, 97,114,116, 32, 97,116, 32, 49, 93, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,110, 32, 61, 32, 48, 10, ! 32, 32, 32, 32,119,104,105,108,101, 32, 49, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,110,111,116, 32, 97,114,103, 91,110, 93, 32,116,104,101,110, 32, 98,114,101, 97,107, 32,101,110,100, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 97,114,103, 91,110, 93, 32, 97,110,100, 32,110,111,116, 32, 97,114,103, 91,110, 45, 49, 93, 32,116,104,101,110, 32,112,114,111,103,114, 97,109, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,110, 93, 32,101,110,100, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,110, 32, 61, 32,110, 32, 45, 32, 49, 10, 32, 32, 32, 32,101,110,100, 10, ! 10, ! 32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 10, ! 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10, ! 32, 32, 32, 32,101,108,115,101, 10, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, 32, 32, 32, 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, Index: lconsole.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lconsole.h 1 Mar 2006 05:25:52 -0000 1.4 --- lconsole.h 15 May 2006 04:48:37 -0000 1.5 *************** *** 33,37 **** void OnSizeWindow(wxSizeEvent& event); ! void OnEraseBackground(wxEraseEvent& event); DECLARE_EVENT_TABLE() --- 33,37 ---- void OnSizeWindow(wxSizeEvent& event); ! void OnEraseBackground(wxEraseEvent& WXUNUSED(event)) {} DECLARE_EVENT_TABLE() *************** *** 50,54 **** private: void OnCloseWindow(wxCloseEvent& event); ! void OnEraseBackground(wxEraseEvent& event); void FillListbox(); --- 50,54 ---- private: void OnCloseWindow(wxCloseEvent& event); ! void OnEraseBackground(wxEraseEvent& WXUNUSED(event)) {} void FillListbox(); Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile 13 May 2006 21:05:35 -0000 1.16 --- Makefile 15 May 2006 04:48:37 -0000 1.17 *************** *** 56,60 **** APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) ! OBJECTS=wxlua.o DEPFILES=$(OBJECTS:.o=.d) --- 56,60 ---- APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) ! OBJECTS=wxlua.o lconsole.o DEPFILES=$(OBJECTS:.o=.d) Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxlua.cpp 14 May 2006 01:49:10 -0000 1.30 --- wxlua.cpp 15 May 2006 04:48:37 -0000 1.31 *************** *** 31,41 **** #include "wxlua/include/internal.h" #include "wxluasocket/include/wxldserv.h" #include "wxlua.h" - #if wxCHECK_VERSION(2, 3, 0) - #include "wxluadebug/include/splttree.h" - #include "wxluadebug/include/staktree.h" - #endif // wxCHECK_VERSION(2, 3, 0) - #include "art/wxluasmall.xpm" --- 31,38 ---- #include "wxlua/include/internal.h" #include "wxluasocket/include/wxldserv.h" + #include "wxluasocket/include/wxlhandl.h" + #include "wxluadebug/include/staktree.h" #include "wxlua.h" #include "art/wxluasmall.xpm" *************** *** 56,60 **** int LUACALL wxLua_lua_stackDialog(lua_State *L) { - #if wxCHECK_VERSION(2, 3, 0) wxLuaInterface* li = new wxLuaInterface(L); wxLuaStackDialog *pStackDialog = new wxLuaStackDialog(NULL, --- 53,56 ---- *************** *** 67,71 **** wxGetApp().SetStackDialog(NULL); pStackDialog->Destroy(); ! #endif // wxCHECK_VERSION(2, 3, 0) return 0; } --- 63,67 ---- wxGetApp().SetStackDialog(NULL); pStackDialog->Destroy(); ! return 0; } *************** *** 112,115 **** --- 108,138 ---- // --------------------------------------------------------------------------- + static const wxCmdLineEntryDesc cmdLineDesc[] = + { + { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("help on command line switches"), + wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_OPTION_HELP }, + + { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("show message console"), + wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, + + { wxCMD_LINE_OPTION, wxT("d"), wxT("debuggee"), wxT("run as debuggee, internal use"), + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + + { wxCMD_LINE_OPTION, wxT("e"), wxT("edit"), wxT("open file(s) to edit"), + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE|wxCMD_LINE_NEEDS_SEPARATOR }, + + { wxCMD_LINE_OPTION, wxT("r"), wxT("run"), wxT("run wxLua program w/ command line args"), + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_NEEDS_SEPARATOR }, + + { wxCMD_LINE_PARAM, wxT(""), wxT(""), wxT("run wxLua program w/ command line args"), + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE }, + + { wxCMD_LINE_NONE } + }; + + // --------------------------------------------------------------------------- + // wxLuaStandaloneApp + // --------------------------------------------------------------------------- + IMPLEMENT_APP(wxLuaStandaloneApp) *************** *** 118,124 **** EVT_LUA_ERROR (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaStandaloneApp::OnLua) ! EVT_WXLUA_DEBUG_STACK_ENUM(wxLuaStandaloneApp::OnDebugStackEnum) EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum) ! EVT_WXLUA_DEBUG_TABLE_ENUM(wxLuaStandaloneApp::OnDebugTableEnum) END_EVENT_TABLE() --- 141,148 ---- EVT_LUA_ERROR (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaStandaloneApp::OnLua) ! ! EVT_WXLUA_DEBUG_STACK_ENUM( wxLuaStandaloneApp::OnDebugStackEnum) EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum) ! EVT_WXLUA_DEBUG_TABLE_ENUM( wxLuaStandaloneApp::OnDebugTableEnum) END_EVENT_TABLE() *************** *** 143,154 **** m_fMemoryBitmapAdded = false; - #if wxCHECK_VERSION(2, 3, 0) m_pDebugTarget = NULL; ! #endif // wxCHECK_VERSION(2, 3, 0) ! #ifdef __WXMSW__ m_pConsole = NULL; - #endif // __WXMSW__ wxInitAllImageHandlers(); #ifdef __WXGTK__ --- 167,178 ---- m_fMemoryBitmapAdded = false; m_pDebugTarget = NULL; ! m_pConsole = NULL; wxInitAllImageHandlers(); + wxFileSystem::AddHandler(new wxMemoryFSHandler); + wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM); + m_fMemoryBitmapAdded = true; #ifdef __WXGTK__ *************** *** 175,344 **** m_luaHandler = new LuaHandler(this); ! // add our wxLuaStackDialog and some bitmaps for people to use m_wxlState.RegisterFunction(wxLua_lua_stackDialog, "wxLuaStackDialog"); ! if (argc == 1) ! { ! CreateSimpleArgs(); ! int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! } ! else ! // If there is only one command line argument ! #if wxCHECK_VERSION(2, 3, 0) || defined(__WXMSW__) ! if (argc == 2 && (*argv[1] == wxT('-'))) { ! #if wxCHECK_VERSION(2, 3, 0) ! // Check if we are launched as a debuggee ! if (wxStrlen(argv[1]) > 2 && (argv[1][1] == wxT('d'))) { ! // Set up for debugging ! wxChar *serverPtr = argv[1] + 2; ! wxChar *portPtr = wxStrrchr(serverPtr, wxT(':')); ! ! if (portPtr != NULL) ! { ! *portPtr = 0; ! int portNumber = wxAtoi(portPtr + 1); ! ! m_pDebugTarget = new wxLuaDebugTarget(L, ! serverPtr, ! portNumber); ! if (m_pDebugTarget != NULL) ! return m_pDebugTarget->Run(); ! } return false; } ! #endif // wxCHECK_VERSION(2, 3, 0) ! #ifdef __WXMSW__ ! // Check if we are to display the console ! if ((wxStrlen(argv[1]) == 2) && (argv[1][1] == wxT('c'))) { ! wxLuaConsole *pConsole = new wxLuaConsole(this, m_wxlState); ! if (pConsole != NULL) ! pConsole->Show(true); ! CreateSimpleArgs(); ! int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! } ! else ! #endif // __WXMSW__ ! // See if a file has been specified that we are to edit ! if ((wxStrlen(argv[1]) > 2) && (argv[1][1] == wxT('e'))) ! { ! wxString fileName = argv[1] + 2; ! lua_newtable(L); ! lua_pushstring(L, wx2lua(fileName)); ! lua_rawseti(L, -2, 1); ! lua_pushstring(L, wx2lua(m_programName)); ! lua_rawseti(L, -2, 0); ! lua_setglobal(L, "args"); ! int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! } ! else ! // Otherwise just run the file ! { ! CreateSimpleArgs(); ! int rc = m_wxlState.RunFile(argv[1]); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! } ! } ! else ! #endif // wxCHECK_VERSION(2, 3, 0) || defined(__WXMSW__) ! // execute the program using argc, argv; ! for (int idx = 1; idx < argc; ++idx) ! { ! #ifdef __WXMSW__ ! if ((m_pConsole == NULL) && (wxStrlen(argv[idx]) == 2) && (argv[idx][0] == wxT('-')) && (argv[idx][1] == wxT('c'))) ! { ! wxLuaConsole *pConsole = new wxLuaConsole(this, m_wxlState); ! if (pConsole != NULL) ! pConsole->Show(true); ! } ! else ! #endif // __WXMSW__ ! // See if we are to run the specified file with command-line arguments. ! if ((wxStrlen(argv[idx]) > 2) && (argv[idx][0] == wxT('-')) && (argv[idx][1] == wxT('f'))) ! { ! wxString fileName = argv[idx] + 2; ! lua_newtable(L); ! // accumulate the arguments into the 'args' table ! for (++idx; idx < argc; ++idx) ! { ! lua_pushstring(L, wx2lua(argv[idx])); ! lua_rawseti(L, -2, ++argCount); } ! lua_pushstring(L, wx2lua(fileName)); ! lua_rawseti(L, -2, 0); ! ! lua_setglobal(L, "args"); ! ! int rc = m_wxlState.RunFile(fileName); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! break; ! } ! else ! // See if a file has been specified that we are to edit ! if ((wxStrlen(argv[idx]) > 2) && (argv[idx][0] == wxT('-')) && (argv[idx][1] == wxT('e'))) ! { ! wxString fileName = argv[idx] + 2; ! lua_newtable(L); ! lua_pushstring(L, wx2lua(fileName)); ! lua_rawseti(L, -2, 1); ! lua_pushstring(L, wx2lua(m_programName)); ! lua_rawseti(L, -2, 0); ! lua_setglobal(L, "args"); ! int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); break; } ! else { ! CreateSimpleArgs(); ! int rc = m_wxlState.RunFile(argv[idx]); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); } } - #ifdef __WXMSW__ return (m_pConsole != NULL) || fOk; - #else - return fOk; - #endif // __WXMSW__ } int wxLuaStandaloneApp::OnExit() { - #if wxCHECK_VERSION(2, 3, 0) // If acting as a debuggee, we're done - disconnect from the debugger. if (m_pDebugTarget != NULL) --- 199,301 ---- m_luaHandler = new LuaHandler(this); ! // add our wxLuaStackDialog function m_wxlState.RegisterFunction(wxLua_lua_stackDialog, "wxLuaStackDialog"); ! wxCmdLineParser parser(cmdLineDesc, argc, argv); ! switch ( parser.Parse() ) { ! case -1 : { ! // help should be given by the wxCmdLineParser, exit program return false; } ! case 0: { ! argCount = 0; ! wxString value; ! if (parser.Found(wxT("d"), &value)) ! { ! // wxLuaDebugServer::StartClient() runs wxExecute(m_programName -d[host]:[port], ...) ! // Set up for debugging ! wxString serverName(value.BeforeFirst(wxT(':'))); ! long portNumber = 0; ! if (value.AfterFirst(wxT(':')).ToLong(&portNumber)) ! { ! m_pDebugTarget = new wxLuaDebugTarget(L, serverName, (int)portNumber); ! if (m_pDebugTarget != NULL) ! return m_pDebugTarget->Run(); ! } ! return false; ! } ! // Check if we are to display the console ! if (parser.Found(wxT("c"))) ! { ! argCount++; ! wxLuaConsole *pConsole = new wxLuaConsole(this, m_wxlState); ! if (pConsole != NULL) ! pConsole->Show(true); ! } ! // See if a file has been specified that we are to edit ! if (parser.Found(wxT("e"), &value)) ! { ! argCount++; ! wxString fileName = value; ! PushArgs(argv, argc, argCount); ! int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! break; } ! if (parser.GetParamCount() == 0) ! { ! PushArgs(argv, argc, argCount); ! int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! break; ! } ! // See if we are to run the specified file with command-line arguments. ! //if (parser.Found(wxT("r"), &value)) ! { ! argCount++; // skip the program we're running ! wxString fileName = parser.GetParam(0); // already handled 0 params ! PushArgs(argv, argc, argCount); ! int rc = m_wxlState.RunFile(fileName); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); ! if (!fOk) ! DisplayError(errorStr); ! break; ! } break; } ! default: { ! wxLogMessage(wxT("Unknown command line option, aborting.")); ! return false; } } return (m_pConsole != NULL) || fOk; } int wxLuaStandaloneApp::OnExit() { // If acting as a debuggee, we're done - disconnect from the debugger. if (m_pDebugTarget != NULL) *************** *** 348,352 **** m_pDebugTarget = NULL; } - #endif // wxCHECK_VERSION(2, 3, 0) if (m_fMemoryBitmapAdded) --- 305,308 ---- *************** *** 372,382 **** if (event.GetEventType() == wxEVT_LUA_PRINT) { - #ifdef __WXMSW__ if (m_pConsole != NULL) m_pConsole->DisplayText(event.GetString()); else wxMessageBox(event.GetString(), wxT("wxLua")); #else ! wxPrintf(wxT("%s\n"), event.GetString().c_str()); #endif // __WXMSW__ } --- 328,338 ---- if (event.GetEventType() == wxEVT_LUA_PRINT) { if (m_pConsole != NULL) m_pConsole->DisplayText(event.GetString()); else + #ifdef __WXMSW__ wxMessageBox(event.GetString(), wxT("wxLua")); #else ! fprintf(stderr, wx2lua(event.GetString() + wxT("\n"))); #endif // __WXMSW__ } *************** *** 391,398 **** int wxLuaStandaloneApp::RunEditor() { - wxFileSystem::AddHandler(new wxMemoryFSHandler); - wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM); - m_fMemoryBitmapAdded = true; - return m_wxlState.RunBuffer(wxLuaEditor, wxLuaEditor_len, m_programName); } --- 347,350 ---- *************** *** 404,415 **** else { - #ifdef __WXMSW__ if (m_pConsole != NULL) m_pConsole->DisplayText(errorStr, true); else wxMessageBox(errorStr, wxT("wxLua")); #else ! fprintf(stderr, wx2lua(errorStr)); #endif // __WXMSW__ } } --- 356,368 ---- else { if (m_pConsole != NULL) m_pConsole->DisplayText(errorStr, true); else + #ifdef __WXMSW__ wxMessageBox(errorStr, wxT("wxLua")); #else ! fprintf(stderr, wx2lua(errorStr + wxT("\n"))); #endif // __WXMSW__ + } } *************** *** 421,425 **** lua_pushstring(L, wx2lua(m_programName)); lua_rawseti(L, -2, 0); ! lua_setglobal(L, "args"); } --- 374,414 ---- lua_pushstring(L, wx2lua(m_programName)); lua_rawseti(L, -2, 0); ! lua_setglobal(L, "arg"); ! } ! ! // Push the program args into lua, see lua.c function ! // static int getargs (lua_State *L, char **argv, int n) ! int wxLuaStandaloneApp::PushArgs(wxChar **argv, int argc, int start_n) ! { ! lua_State* L = m_wxlState.GetLuaState(); ! ! int i = 0; ! int narg = argc - (start_n + 1); // number of arguments to the script ! if (narg < 1) ! { ! // no real args, just stick in the name of this program ! lua_newtable(L); ! lua_pushstring(L, wx2lua(m_programName)); ! lua_rawseti(L, -2, 0); ! lua_setglobal(L, "arg"); ! ! return narg; ! } ! ! luaL_checkstack(L, narg + 3, "too many arguments to script"); ! for (i = start_n+1; i < argc; i++) ! lua_pushstring(L, wx2lua(argv[i])); ! ! lua_createtable(L, narg, start_n + 1); ! ! for (i = 0; i < argc; i++) ! { ! lua_pushstring(L, wx2lua(argv[i])); ! lua_rawseti(L, -2, i - start_n); ! } ! ! lua_setglobal(L, "arg"); ! ! return narg; } Index: wxlua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlua.h 8 Mar 2006 02:46:37 -0000 1.15 --- wxlua.h 15 May 2006 04:48:37 -0000 1.16 *************** *** 17,34 **** #endif ! #include "wxluasocket/include/wxlhandl.h" ! ! #ifdef __WXMSW__ ! #include "lconsole.h" ! #endif ! ! #if wxCHECK_VERSION(2, 3, 0) ! #include "wxluasocket/include/wxldtarg.h" ! #endif ! #include "wx/app.h" class WXDLLIMPEXP_WXLUA wxLuaEvent; class LuaHandler; // ---------------------------------------------------------------------------- --- 17,28 ---- #endif ! #include "lconsole.h" ! #include "wxluasocket/include/wxldtarg.h" #include "wx/app.h" class WXDLLIMPEXP_WXLUA wxLuaEvent; class LuaHandler; + class WXDLLIMPEXP_WXLUA wxLuaStackDialog; + class WXDLLIMPEXP_WXLUA wxLuaDebugEvent; // ---------------------------------------------------------------------------- *************** *** 45,51 **** // set the lua console - #ifdef __WXMSW__ void SetLuaConsole(wxLuaConsole *pConsole) { m_pConsole = pConsole; } - #endif // __WXMSW__ void SetStackDialog(wxLuaStackDialog *pStackDialog) { m_pStackDialog = pStackDialog; } --- 39,43 ---- *************** *** 54,59 **** int RunEditor(); - private: void CreateSimpleArgs(); void OnDebugStackEnum(wxLuaDebugEvent &event); --- 46,51 ---- int RunEditor(); void CreateSimpleArgs(); + int PushArgs(wxChar **argv, int argc, int start_n); void OnDebugStackEnum(wxLuaDebugEvent &event); *************** *** 65,76 **** LuaHandler *m_luaHandler; wxLuaState m_wxlState; - #ifdef __WXMSW__ wxLuaConsole *m_pConsole; - #endif // __WXMSW__ bool m_fMemoryBitmapAdded; - #if wxCHECK_VERSION(2, 3, 0) wxLuaDebugTarget *m_pDebugTarget; - #endif // wxCHECK_VERSION(2, 3, 0) DECLARE_EVENT_TABLE(); }; --- 57,66 ---- LuaHandler *m_luaHandler; wxLuaState m_wxlState; wxLuaConsole *m_pConsole; bool m_fMemoryBitmapAdded; wxLuaDebugTarget *m_pDebugTarget; + + private: DECLARE_EVENT_TABLE(); }; Index: lconsole.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lconsole.cpp 7 Mar 2006 11:53:42 -0000 1.9 --- lconsole.cpp 15 May 2006 04:48:37 -0000 1.10 *************** *** 46,55 **** { m_wxlState = wxlState; ! m_listBox = new wxListBox( this, ! wxID_ANY, ! wxPoint(0, 20), ! wxSize(0, 130), ! 0, NULL, ! wxLB_SINGLE); } --- 46,51 ---- { m_wxlState = wxlState; ! m_listBox = new wxListBox( this, wxID_ANY, wxPoint(0, 20), wxSize(0, 130), ! 0, NULL, wxLB_SINGLE); } *************** *** 103,110 **** } - void wxLuaDebugPanel::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) - { - } - // ---------------------------------------------------------------------------- // wxLuaConsole --- 99,102 ---- *************** *** 117,139 **** wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, const wxLuaState& wxlState) ! : wxFrame(0, wxID_ANY, wxT("wxLua Console"), wxPoint(0, 0), wxSize(250, 340)), m_pApp(pApp), m_fError(false) { - #ifdef __WXMSW__ - pApp->SetLuaConsole(this); - #endif - SetIcon(wxICON(LUA)); ! m_splitter = new wxSplitterWindow(this, ! wxID_ANY, ! wxPoint(0, 0), ! wxSize(0, 0), ! wxSP_3DSASH); ! m_textCtrl = new wxTextCtrl( m_splitter, ! wxID_ANY, ! wxT(""), ! wxPoint(0, 0), ! wxSize(0, 0), wxTE_MULTILINE | wxTE_READONLY #ifdef __WXMSW__ --- 109,121 ---- wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, const wxLuaState& wxlState) ! : wxFrame(0, wxID_ANY, wxT("wxLua Console"), wxDefaultPosition, wxSize(250, 340)), m_pApp(pApp), m_fError(false) { SetIcon(wxICON(LUA)); ! m_splitter = new wxSplitterWindow(this, wxID_ANY, ! wxPoint(0, 0), wxSize(0, 0), wxSP_3DSASH); ! m_textCtrl = new wxTextCtrl( m_splitter, wxID_ANY, wxT(""), ! wxPoint(0, 0), wxSize(0, 0), wxTE_MULTILINE | wxTE_READONLY #ifdef __WXMSW__ *************** *** 144,158 **** m_splitter->SplitHorizontally( m_textCtrl, m_panel, 150); m_splitter->SetMinimumPaneSize(50); - } ! void wxLuaConsole::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) ! { } void wxLuaConsole::OnCloseWindow(wxCloseEvent&) { - #ifdef __WXMSW__ m_pApp->SetLuaConsole(NULL); ! #endif Destroy(); if (m_fError) --- 126,137 ---- m_splitter->SplitHorizontally( m_textCtrl, m_panel, 150); m_splitter->SetMinimumPaneSize(50); ! pApp->SetLuaConsole(this); } void wxLuaConsole::OnCloseWindow(wxCloseEvent&) { m_pApp->SetLuaConsole(NULL); ! Destroy(); if (m_fError) |
|
From: John L. <jr...@us...> - 2006-05-15 04:48:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3872/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp staktree.cpp Log Message: cleanup the app wxlua editor, don't try to run all the notebook pages at once make lconsole available for app wxLua use wxCmdLineParser in app wxlua push full args in app wxlua fix splittree to scroll child for generic treectrl in 2.6.3 Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** splttree.cpp 7 Mar 2006 11:53:42 -0000 1.9 --- splttree.cpp 15 May 2006 04:48:37 -0000 1.10 *************** *** 170,173 **** --- 170,196 ---- } + void wxRemotelyScrolledTreeCtrl::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const + { + int vx = 0, vy = 0; + GetViewStart(&vx, &vy); + + int pixelsPerUnitX = 0, pixelsPerUnitY = 0; + GetScrollPixelsPerUnit(&pixelsPerUnitX, &pixelsPerUnitY); + + if (xx) *xx = x - vx*pixelsPerUnitX; + if (yy) *yy = y - vy*pixelsPerUnitY; + } + void wxRemotelyScrolledTreeCtrl::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const + { + int vx = 0, vy = 0; + GetViewStart(&vx, &vy); + + int pixelsPerUnitX = 0, pixelsPerUnitY = 0; + GetScrollPixelsPerUnit(&pixelsPerUnitX, &pixelsPerUnitY); + + if (xx) *xx = x + vx*pixelsPerUnitX; + if (yy) *yy = y + vy*pixelsPerUnitY; + } + // In case we're using the generic tree control. *************** *** 180,186 **** if (IsKindOf(CLASSINFO(wxGenericTreeCtrl))) { - wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this; ! int x1, y1, x2, y2; win->wxGenericTreeCtrl::GetViewStart(& x1, & y1); * x = x1; * y = y1; --- 203,208 ---- if (IsKindOf(CLASSINFO(wxGenericTreeCtrl))) { wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this; ! int x1 = 0, y1 = 0, x2 = 0, y2 = 0; win->wxGenericTreeCtrl::GetViewStart(& x1, & y1); * x = x1; * y = y1; *************** *** 234,238 **** #if USE_GENERIC_TREECTRL if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl))) ! #endif { UINT sbCode = SB_THUMBPOSITION; --- 256,260 ---- #if USE_GENERIC_TREECTRL if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl))) ! #endif // USE_GENERIC_TREECTRL { UINT sbCode = SB_THUMBPOSITION; *************** *** 240,244 **** #if !wxCHECK_VERSION(2,5,0) MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar); ! #else MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar); #endif // wxCHECK_VERSION(2,5,0) --- 262,266 ---- #if !wxCHECK_VERSION(2,5,0) MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar); ! #else // wxCHECK_VERSION(2,5,0) MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar); #endif // wxCHECK_VERSION(2,5,0) *************** *** 246,251 **** #if USE_GENERIC_TREECTRL else ! #endif ! #endif #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) { --- 268,274 ---- #if USE_GENERIC_TREECTRL else ! #endif // USE_GENERIC_TREECTRL ! #endif // __WXMSW__ ! #if USE_GENERIC_TREECTRL || !defined(__WXMSW__) { *************** *** 357,361 **** } else ! #endif { // This is for the wxMSW tree control --- 380,384 ---- } else ! #endif // USE_GENERIC_TREECTRL || !defined(__WXMSW__) { // This is for the wxMSW tree control *************** *** 597,601 **** dc.Blit(0, 0, clientSize.x, clientSize.y, &tempDC, 0, 0); tempDC.SelectObject(wxNullBitmap); - } --- 620,623 ---- Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** staktree.cpp 14 May 2006 17:45:05 -0000 1.24 --- staktree.cpp 15 May 2006 04:48:37 -0000 1.25 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - // ---------------------------------------------------------------------------- - // headers - // ---------------------------------------------------------------------------- - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "staktree.h" --- 8,11 ---- *************** *** 27,30 **** --- 23,27 ---- #include "wx/imaglist.h" + #include "wx/artprov.h" #include "wxluadebug/include/staktree.h" #include "wxlua/include/internal.h" *************** *** 42,106 **** #endif // !wxCHECK_VERSION(2, 3, 0) - #if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW - /* Closed folder */ - static char * icon1_xpm[] = - { - /* width height ncolors chars_per_pixel */ - "16 16 6 1", - /* colors */ - " s None c None", - ". c #000000", - "+ c #c0c0c0", - "@ c #808080", - "# c #ffff00", - "$ c #ffffff", - /* pixels */ - " ", - " @@@@@ ", - " @#+#+#@ ", - " @#+#+#+#@@@@@@ ", - " @$$$$$$$$$$$$@.", - " @$#+#+#+#+#+#@.", - " @$+#+#+#+#+#+@.", - " @$#+#+#+#+#+#@.", - " @$+#+#+#+#+#+@.", - " @$#+#+#+#+#+#@.", - " @$+#+#+#+#+#+@.", - " @$#+#+#+#+#+#@.", - " @@@@@@@@@@@@@@.", - " ..............", - " ", - " " - }; - - /* File */ - static char * icon2_xpm[] = - { - /* width height ncolors chars_per_pixel */ - "16 16 3 1", - /* colors */ - " s None c None", - ". c #000000", - "+ c #ffffff", - /* pixels */ - " ", - " ........ ", - " .++++++.. ", - " .+.+.++.+. ", - " .++++++.... ", - " .+.+.+++++. ", - " .+++++++++. ", - " .+.+.+.+.+. ", - " .+++++++++. ", - " .+.+.+.+.+. ", - " .+++++++++. ", - " .+.+.+.+.+. ", - " .+++++++++. ", - " ........... ", - " ", - " " - }; - #endif - // ---------------------------------------------------------------------------- // wxLuaStackDialog --- 39,42 ---- *************** *** 110,116 **** BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog) EVT_SIZE(wxLuaStackDialog::OnSizeWindow) ! EVT_COMBOBOX(ID_WXLUA_STACKDIALOG_COMBO, wxLuaStackDialog::OnSelectStack) ! EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKDIALOG_STACKTREE, wxLuaStackDialog::OnItemExpanding) ! EVT_BUTTON(ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, wxLuaStackDialog::OnCloseDialog) END_EVENT_TABLE() --- 46,53 ---- BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog) EVT_SIZE(wxLuaStackDialog::OnSizeWindow) ! ! EVT_COMBOBOX( ID_WXLUA_STACKDIALOG_COMBO, wxLuaStackDialog::OnSelectStack) ! EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKDIALOG_STACKTREE, wxLuaStackDialog::OnItemExpanding) ! EVT_BUTTON( ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, wxLuaStackDialog::OnCloseDialog) END_EVENT_TABLE() *************** *** 135,175 **** if (!wxDialog::Create(parent, ID_WXLUA_STACKDIALOG, title, pos, size, ! wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxRESIZE_BORDER)) return false; ! m_stackComboBox = new wxComboBox( this, ! ID_WXLUA_STACKDIALOG_COMBO, wxEmptyString, ! wxPoint(0, 0), ! wxDefaultSize, ! 0, ! NULL, wxCB_DROPDOWN | wxCB_READONLY); m_scrolledWindow = new wxSplitterScrolledWindow(this, ID_WXLUA_STACKDIALOG_SCRWIN, ! wxDefaultPosition, ! wxDefaultSize, wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL); ! #if wxCHECK_VERSION(2, 3, 0) ! m_dismissButton = new wxButton(this, ! ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, _("Cancel"), ! wxDefaultPosition, ! wxDefaultSize, ! wxBU_EXACTFIT); #else ! m_dismissButton = new wxButton(this, ! ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, ! _("Cancel"), ! wxDefaultPosition, ! wxDefaultSize); #endif m_dismissButton->SetDefault(); m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow, ID_WXLUA_STACKDIALOG_SPLITWIN, ! wxDefaultPosition, ! wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN); m_treeSplitter->SetSashSize(2); --- 72,102 ---- if (!wxDialog::Create(parent, ID_WXLUA_STACKDIALOG, title, pos, size, ! wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxMAXIMIZE_BOX | wxRESIZE_BORDER)) return false; ! m_stackComboBox = new wxComboBox( this, ID_WXLUA_STACKDIALOG_COMBO, wxEmptyString, ! wxPoint(0, 0), wxDefaultSize, ! 0, NULL, wxCB_DROPDOWN | wxCB_READONLY); m_scrolledWindow = new wxSplitterScrolledWindow(this, ID_WXLUA_STACKDIALOG_SCRWIN, ! wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL); ! m_dismissButton = new wxButton(this, ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, _("Cancel"), ! wxDefaultPosition, wxDefaultSize ! #if wxCHECK_VERSION(2, 3, 0) ! ,wxBU_EXACTFIT); #else ! ); #endif m_dismissButton->SetDefault(); + m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow, ID_WXLUA_STACKDIALOG_SPLITWIN, ! wxDefaultPosition, wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN); m_treeSplitter->SetSashSize(2); *************** *** 177,188 **** m_treeControl = new wxLuaStackTree(m_treeSplitter, ID_WXLUA_STACKDIALOG_STACKTREE, ! wxDefaultPosition, ! wxDefaultSize, ! wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES ); m_valueSplitter = new wxThinSplitterWindow(m_treeSplitter, ID_WXLUA_STACKDIALOG_VALUE_SPLITWIN, ! wxDefaultPosition, ! wxDefaultSize, wxSP_NOBORDER | wxCLIP_CHILDREN); m_valueSplitter->SetSashSize(2); --- 104,113 ---- m_treeControl = new wxLuaStackTree(m_treeSplitter, ID_WXLUA_STACKDIALOG_STACKTREE, ! wxDefaultPosition, wxDefaultSize, ! wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES); // | wxTR_HIDE_ROOT ); m_valueSplitter = new wxThinSplitterWindow(m_treeSplitter, ID_WXLUA_STACKDIALOG_VALUE_SPLITWIN, ! wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxCLIP_CHILDREN); m_valueSplitter->SetSashSize(2); *************** *** 190,202 **** m_firstValueWindow = new wxLuaStackDataWindow(m_valueSplitter, ID_WXLUA_STACKDIALOG_VALUE_WIN1, ! wxDefaultPosition, ! wxDefaultSize, wxNO_BORDER); m_secondValueWindow = new wxLuaStackDataWindow(m_valueSplitter, ID_WXLUA_STACKDIALOG_VALUE_WIN2, ! wxDefaultPosition, ! wxDefaultSize, ! wxNO_BORDER, ! false); m_treeSplitter->SetSashPosition(25); --- 115,124 ---- m_firstValueWindow = new wxLuaStackDataWindow(m_valueSplitter, ID_WXLUA_STACKDIALOG_VALUE_WIN1, ! wxDefaultPosition, wxDefaultSize, wxNO_BORDER); m_secondValueWindow = new wxLuaStackDataWindow(m_valueSplitter, ID_WXLUA_STACKDIALOG_VALUE_WIN2, ! wxDefaultPosition, wxDefaultSize, ! wxNO_BORDER, false); m_treeSplitter->SetSashPosition(25); *************** *** 254,258 **** const wxLuaDebugDataItem *item = pSortedList->Item(idx); #if defined(__WXMAC__) ! // Mac is dying on the two parameter version...don't know how to fix. m_stackComboBox->Append(item->GetName()); #else --- 176,180 ---- const wxLuaDebugDataItem *item = pSortedList->Item(idx); #if defined(__WXMAC__) ! // FIXME Mac is dying on the two parameter version...don't know how to fix. m_stackComboBox->Append(item->GetName()); #else *************** *** 328,335 **** { const wxLuaDebugDataItem *item = pSortedList->Item(idx); ! ! int nOffset = 1; ! if (item->GetReference() != LUA_NOREF) ! nOffset = 0; wxTreeItemId treeNode = m_treeControl->AppendItem(rootItem, --- 250,254 ---- { const wxLuaDebugDataItem *item = pSortedList->Item(idx); ! int nOffset = (item->GetReference() != LUA_NOREF) ? 0 : 1; wxTreeItemId treeNode = m_treeControl->AppendItem(rootItem, *************** *** 368,372 **** } ! m_treeControl->Expand(rootItem); } --- 287,291 ---- } ! m_treeControl->Expand(rootItem); //not if wxTR_HIDE_ROOT } *************** *** 435,439 **** } } ! else if (m_luaInterface->GetwxLuaState().Ok() && ((pDebugData->GetName() == _("Tracked List")) || (pDebugData->GetName() == _("Event Handler List")) || --- 354,359 ---- } } ! else if (!m_luaInterface->IsDebugServer() && ! m_luaInterface->GetwxLuaState().Ok() && ((pDebugData->GetName() == _("Tracked List")) || (pDebugData->GetName() == _("Event Handler List")) || *************** *** 536,543 **** { const wxLuaDebugDataItem *item = pSortedList->Item(n); ! ! int nOffset = 1; ! if (item->GetReference() != LUA_NOREF) ! nOffset = 0; wxTreeItemId treeNode = m_treeControl->AppendItem(itemNode, --- 456,460 ---- { const wxLuaDebugDataItem *item = pSortedList->Item(n); ! int nOffset = (item->GetReference() != LUA_NOREF) ? 0 : 1; wxTreeItemId treeNode = m_treeControl->AppendItem(itemNode, *************** *** 550,554 **** } } ! m_treeControl->Expand(itemNode); } --- 467,473 ---- } } ! ! //if (itemNode != m_treeControl->GetRootItem()) not if wxTR_HIDE_ROOT ! m_treeControl->Expand(itemNode); } *************** *** 566,586 **** END_EVENT_TABLE() ! wxLuaStackTree::wxLuaStackTree( wxWindow *parent, ! wxWindowID id, ! const wxPoint &pt, ! const wxSize &sz, ! long style) : wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style) { m_imageList = new wxImageList(16, 16, true); ! #if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW ! m_imageList->Add(wxIcon(icon1_xpm)); ! m_imageList->Add(wxIcon(icon2_xpm)); ! #elif defined(__WXMSW__) ! m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE)); ! m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE)); ! #else ! #error "Sorry, we don't have icons available for this platform." ! #endif SetImageList(m_imageList); } --- 485,497 ---- END_EVENT_TABLE() ! wxLuaStackTree::wxLuaStackTree( wxWindow *parent, wxWindowID id, ! const wxPoint &pt, const wxSize &sz, ! long style) : wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style) { m_imageList = new wxImageList(16, 16, true); ! m_imageList->Add(wxArtProvider::GetIcon(wxART_FOLDER, wxART_TOOLBAR, wxSize(16,16))); ! m_imageList->Add(wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_TOOLBAR, wxSize(16,16))); ! //m_imageList->Add(wxArtProvider::GetIcon(wxART_FOLDER_OPEN, wxART_TOOLBAR, wxSize(16,16))); SetImageList(m_imageList); } *************** *** 600,611 **** END_EVENT_TABLE() ! wxLuaStackDataWindow::wxLuaStackDataWindow(wxWindow *parent, ! wxWindowID id, ! const wxPoint &pos, ! const wxSize &sz, ! long style, ! bool fFirst): ! wxTreeCompanionWindow(parent, id, pos, sz, style), ! m_fFirst(fFirst) { SetBackgroundColour(*wxWHITE); --- 511,518 ---- END_EVENT_TABLE() ! wxLuaStackDataWindow::wxLuaStackDataWindow(wxWindow *parent, wxWindowID id, ! const wxPoint &pos, const wxSize &sz, ! long style, bool fFirst) ! :wxTreeCompanionWindow(parent, id, pos, sz, style), m_fFirst(fFirst) { SetBackgroundColour(*wxWHITE); *************** *** 618,638 **** wxLuaDebugDataItem *itemData = (wxLuaDebugDataItem *) m_treeControl->GetItemData(id); - dc.SetTextForeground(*wxBLACK); - dc.SetBackgroundMode(wxTRANSPARENT); - - int textWidth, textHeight = 0; if (itemData != NULL) { if (m_fFirst) dc.GetTextExtent(itemData->GetType(), &textWidth, &textHeight); else dc.GetTextExtent(itemData->GetValue(), &textWidth, &textHeight); - } ! int x = 5; ! int y = rect.GetY() + wxMax(0, (rect.GetHeight() - textHeight) / 2); - if (itemData != NULL) - { if (m_fFirst) dc.DrawText(itemData->GetType(), x, y); --- 525,544 ---- wxLuaDebugDataItem *itemData = (wxLuaDebugDataItem *) m_treeControl->GetItemData(id); if (itemData != NULL) { + dc.SetTextForeground(*wxBLACK); + dc.SetBackgroundMode(wxTRANSPARENT); + + int textWidth, textHeight = 0; + if (m_fFirst) dc.GetTextExtent(itemData->GetType(), &textWidth, &textHeight); else dc.GetTextExtent(itemData->GetValue(), &textWidth, &textHeight); ! int x = 5; ! int y = (rect.GetHeight() - textHeight) / 2; // try to center it, else pin to top ! y = rect.GetY() + wxMax(0, y); if (m_fFirst) dc.DrawText(itemData->GetType(), x, y); |
|
From: John L. <jr...@us...> - 2006-05-15 04:48:40
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3872/wxLua/samples Modified Files: editor.wx.lua unittest.wx.lua Log Message: cleanup the app wxlua editor, don't try to run all the notebook pages at once make lconsole available for app wxLua use wxCmdLineParser in app wxlua push full args in app wxlua fix splittree to scroll child for generic treectrl in 2.6.3 Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** editor.wx.lua 2 May 2006 05:25:06 -0000 1.15 --- editor.wx.lua 15 May 2006 04:48:38 -0000 1.16 *************** *** 35,46 **** local ID_CLEAROUTPUT = wx.wxID_HIGHEST + 26 local ID_AUTOCOMPLETE = wx.wxID_HIGHEST + 27 ! local wxBREAKPOINT_MARKER = 1 ! local wxBREAKPOINT_MARKER_VALUE = 2 ! local wxCURRENT_LINE_MARKER = 2 ! local wxCURRENT_LINE_MARKER_VALUE = 4 - local wxIDWatchWindow = 100 [...2008 lines suppressed...] ! ! if arg then ! -- arguments pushed into wxLua are [C++ app][lua prog][args for lua start at 1] ! local n = 0 ! while 1 do ! if not arg[n] then break end ! if arg[n] and not arg[n-1] then programName = arg[n] end ! n = n - 1 end ! ! for index = 1, #arg do ! fileName = arg[index] ! loadFile(fileName, fileName) ! end ! ! if notebook:GetPageCount() > 0 then ! notebook:SetSelection(0) ! else local editor = createEditor("Untitled") setupKeywords(editor, 1) Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** unittest.wx.lua 28 Apr 2006 04:12:43 -0000 1.3 --- unittest.wx.lua 15 May 2006 04:48:38 -0000 1.4 *************** *** 24,30 **** print("No args passed to the program") else print(string.format("Program arg count %d", #arg)) ! for n = 1, #arg do ! print(string.format("Program arg #%2d of %2d '%s'", n, #arg, arg[n])) end end --- 24,35 ---- print("No args passed to the program") else + local start_n = 1 + while arg[start_n-1] do start_n = start_n - 1 end + print(string.format("Program arg count %d", #arg)) ! for n = start_n, 10000 do ! if arg[n] then ! print(string.format("Program arg #%2d of %2d '%s'", n, #arg, arg[n])) ! end end end |
|
From: John L. <jr...@us...> - 2006-05-15 04:48:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3872/wxLua/modules/wxluadebug/include Modified Files: splttree.h staktree.h Log Message: cleanup the app wxlua editor, don't try to run all the notebook pages at once make lconsole available for app wxLua use wxCmdLineParser in app wxlua push full args in app wxlua fix splittree to scroll child for generic treectrl in 2.6.3 Index: staktree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** staktree.h 8 Mar 2006 02:46:37 -0000 1.6 --- staktree.h 15 May 2006 04:48:37 -0000 1.7 *************** *** 49,53 **** wxLuaStackDialog(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, ! wxLuaInterface* luaInterface) { Init(); --- 49,53 ---- wxLuaStackDialog(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, ! wxLuaInterface* luaInterface) : wxDialog() { Init(); *************** *** 102,110 **** { public: ! wxLuaStackTree( wxWindow *parent, ! wxWindowID id = wxID_ANY, ! const wxPoint &pt = wxDefaultPosition, ! const wxSize &sz = wxDefaultSize, ! long style = wxTR_HAS_BUTTONS); virtual ~wxLuaStackTree(); --- 102,109 ---- { public: ! wxLuaStackTree( wxWindow *parent, wxWindowID id = wxID_ANY, ! const wxPoint &pt = wxDefaultPosition, ! const wxSize &sz = wxDefaultSize, ! long style = wxTR_HAS_BUTTONS); virtual ~wxLuaStackTree(); *************** *** 123,132 **** { public: ! wxLuaStackDataWindow( wxWindow *parent, ! wxWindowID id = wxID_ANY, ! const wxPoint &pos = wxDefaultPosition, ! const wxSize &sz = wxDefaultSize, ! long style = 0, ! bool fFirst = true); // Overrides --- 122,129 ---- { public: ! wxLuaStackDataWindow( wxWindow *parent, wxWindowID id = wxID_ANY, ! const wxPoint &pos = wxDefaultPosition, ! const wxSize &sz = wxDefaultSize, ! long style = 0, bool fFirst = true); // Overrides Index: splttree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** splttree.h 29 Jan 2006 15:45:40 -0000 1.6 --- splttree.h 15 May 2006 04:48:37 -0000 1.7 *************** *** 72,75 **** --- 72,78 ---- bool noRefresh = false ); + virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const; + virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const; + // In case we're using the generic tree control. // Get the view start |
|
From: John L. <jr...@us...> - 2006-05-14 17:45:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/modules/wxluadebug/src Modified Files: staktree.cpp Log Message: init all image handlers in luamodule to make things easy simplify wxLuaSmartXXX by adding operator type*() so it can be used as is fix lua callback to clear the correct wxluastate and some formatting add destroy handler list to things shown in the stacktree and show items for them Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** staktree.cpp 14 May 2006 07:48:09 -0000 1.23 --- staktree.cpp 14 May 2006 17:45:05 -0000 1.24 *************** *** 30,33 **** --- 30,34 ---- #include "wxlua/include/internal.h" #include "wxlua/include/wxlua.h" + #include "wxlua/include/wxlcallb.h" #include "wxluadebug/include/wxldebug.h" *************** *** 375,395 **** wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); ! int derivedCount = wxlState.GetLuaStateData()->m_pDerivedList.size(); ! int trackedCount = wxlState.GetLuaStateData()->m_pTrackedList.size(); ! int eventHandlerCount = wxlState.GetLuaStateData()->m_eventHandlerList.GetCount(); ! int windowCount = wxlState.GetLuaStateData()->m_windowList.GetCount(); ! wxLuaDebugDataItem* derivedItem = new wxLuaDebugDataItem(_("Derived List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), derivedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* trackedItem = new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), trackedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* eventHandlerItem = new wxLuaDebugDataItem(_("Event Handler List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), eventHandlerCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* windowItem = new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), windowCount), wxT(""), LUA_NOREF, 0); treeControl->AppendItem(rootItem, wxT("Derived List"), 1, 1, derivedItem); ! wxTreeItemId treeNode = treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, trackedItem); if (trackedCount > 0) m_treeControl->SetItemHasChildren(treeNode); ! ! treeControl->AppendItem(rootItem, wxT("Event Handler List"), 1, 1, eventHandlerItem); ! treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, windowItem); } --- 376,402 ---- wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); ! int derivedCount = wxlState.GetLuaStateData()->m_pDerivedList.size(); ! int trackedCount = wxlState.GetLuaStateData()->m_pTrackedList.size(); ! int evtHandlerCount = wxlState.GetTrackedEventHandlerList()->GetCount(); ! int windowCount = wxlState.GetLuaStateData()->m_windowList.GetCount(); ! int destroyCount = wxlState.GetLuaStateData()->m_destroyHandlerList.GetCount(); ! wxLuaDebugDataItem* derivedItem = new wxLuaDebugDataItem(_("Derived List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), derivedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* trackedItem = new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), trackedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* evtHandlerItem = new wxLuaDebugDataItem(_("Event Handler List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), evtHandlerCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* windowItem = new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), windowCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* destroyItem = new wxLuaDebugDataItem(_("wxWindow Destroy List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), destroyCount), wxT(""), LUA_NOREF, 0); ! ! wxTreeItemId treeNode; treeControl->AppendItem(rootItem, wxT("Derived List"), 1, 1, derivedItem); ! treeNode = treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, trackedItem); if (trackedCount > 0) m_treeControl->SetItemHasChildren(treeNode); ! treeNode = treeControl->AppendItem(rootItem, wxT("Event Handler List"), 1, 1, evtHandlerItem); ! if (evtHandlerCount > 0) m_treeControl->SetItemHasChildren(treeNode); ! treeNode = treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, windowItem); ! if (windowCount > 0) m_treeControl->SetItemHasChildren(treeNode); ! treeNode = treeControl->AppendItem(rootItem, wxT("wxWindow Destroy List"), 1, 1, destroyItem); } *************** *** 428,446 **** } } ! else if (m_luaInterface->GetwxLuaState().Ok() && ! (pDebugData->GetName() == _("Tracked List"))) { wxLuaState wxlState(m_luaInterface->GetwxLuaState()); ! ! wxLongToLongHashMap::iterator it; ! wxLongToLongHashMap* hashMap = &wxlState.GetLuaStateRefData()->m_wxlStateData->m_pTrackedList; wxArrayString names; wxArrayInt counts; ! for (it = hashMap->begin(); it != hashMap->end(); ++it) { ! wxObject* obj = (wxObject*)it->second; ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) { ! wxString name(obj->GetClassInfo()->GetClassName()); int idx = names.Index(name); if (idx == wxNOT_FOUND) --- 435,478 ---- } } ! else if (m_luaInterface->GetwxLuaState().Ok() && ! ((pDebugData->GetName() == _("Tracked List")) || ! (pDebugData->GetName() == _("Event Handler List")) || ! (pDebugData->GetName() == _("wxWindow List")))) { wxLuaState wxlState(m_luaInterface->GetwxLuaState()); ! wxArrayString names; wxArrayInt counts; ! ! if (pDebugData->GetName() == _("Tracked List")) { ! wxLongToLongHashMap::iterator it; ! wxLongToLongHashMap* hashMap = &wxlState.GetLuaStateRefData()->m_wxlStateData->m_pTrackedList; ! ! for (it = hashMap->begin(); it != hashMap->end(); ++it) { ! wxObject* obj = (wxObject*)it->second; ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) ! { ! wxString name(obj->GetClassInfo()->GetClassName()); ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) ! { ! names.Add(name); ! counts.Add(1); ! } ! else ! counts[idx]++; ! } ! } ! } ! else if (pDebugData->GetName() == _("Event Handler List")) ! { ! wxNode* node = wxlState.GetTrackedEventHandlerList()->GetFirst(); ! while (node) ! { ! wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData(); ! wxCHECK_RET(pCallback, wxT("Invalid wxLuaCallback")); ! wxString name = wxString::Format(wxT("Evt type %d"), (int)pCallback->GetEventType()); int idx = names.Index(name); if (idx == wxNOT_FOUND) *************** *** 451,457 **** else counts[idx]++; } } ! wxLuaDebugData* dataArr = new wxLuaDebugData; size_t n, count = names.GetCount(); --- 483,514 ---- else counts[idx]++; + + node = node->GetNext(); } } ! else ! { ! wxNode* node = wxlState.GetLuaStateData()->m_windowList.GetFirst(); ! while (node) ! { ! wxWindow *win= (wxWindow*)node->GetData(); ! wxCHECK_RET(win, wxT("Invalid wxLuaCallback")); ! if (win && win->GetClassInfo() && win->GetClassInfo()->GetClassName()) ! { ! wxString name(win->GetClassInfo()->GetClassName()); ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) ! { ! names.Add(name); ! counts.Add(1); ! } ! else ! counts[idx]++; ! } ! ! node = node->GetNext(); ! } ! } ! wxLuaDebugData* dataArr = new wxLuaDebugData; size_t n, count = names.GetCount(); *************** *** 461,468 **** dataArr->Add(item); } ! FillTableEntry(itemNode, dataArr); delete dataArr; ! } } } --- 518,525 ---- dataArr->Add(item); } ! FillTableEntry(itemNode, dataArr); delete dataArr; ! } } } |
|
From: John L. <jr...@us...> - 2006-05-14 17:45:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/modules/wxlua/src Modified Files: wxlcallb.cpp Log Message: init all image handlers in luamodule to make things easy simplify wxLuaSmartXXX by adding operator type*() so it can be used as is fix lua callback to clear the correct wxluastate and some formatting add destroy handler list to things shown in the stacktree and show items for them Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlcallb.cpp 2 May 2006 05:25:06 -0000 1.16 --- wxlcallb.cpp 14 May 2006 17:45:05 -0000 1.17 *************** *** 34,45 **** IMPLEMENT_ABSTRACT_CLASS(wxLuaCallback, wxEvtHandler) ! wxLuaCallback::wxLuaCallback( const wxLuaState& state, ! int theRoutine, ! wxWindowID id, ! wxEventType eventType, wxEvtHandler *pEvtHandler ) ! : m_wxlState(state), ! m_pHandler(pEvtHandler), ! m_id(id), m_eventType(eventType) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); --- 34,43 ---- IMPLEMENT_ABSTRACT_CLASS(wxLuaCallback, wxEvtHandler) ! wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID id, wxEventType eventType, wxEvtHandler *pEvtHandler ) ! : wxEvtHandler(), m_wxlState(state), ! m_pHandler(pEvtHandler), m_id(id), ! m_eventType(eventType) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); *************** *** 47,52 **** m_routine = m_wxlState.tinsert(theRoutine); ! pEvtHandler->Connect( id, ! eventType, (wxObjectEventFunction)&wxLuaCallback::EventHandler, this); --- 45,49 ---- m_routine = m_wxlState.tinsert(theRoutine); ! pEvtHandler->Connect( id, eventType, (wxObjectEventFunction)&wxLuaCallback::EventHandler, this); *************** *** 71,75 **** wxLuaCallback *theCallback = (wxLuaCallback *) event.m_callbackUserData; ! wxCHECK_RET(theCallback != NULL, wxT("Invalid wxLuaCallback in user data")); if (!theCallback || !theCallback->GetwxLuaState().Ok()) return; --- 68,72 ---- wxLuaCallback *theCallback = (wxLuaCallback *) event.m_callbackUserData; ! wxCHECK_RET(theCallback != NULL, wxT("Invalid wxLuaCallback in wxEvent user data")); if (!theCallback || !theCallback->GetwxLuaState().Ok()) return; *************** *** 83,87 **** wxlState.RemoveTrackedWindow((wxWindow*)event.GetEventObject()); // delete the reference to this handler since we're clearing it ! wxlState.RemoveTrackedEventHandler(this); // Disconnect all callbacks associated with this window's evthandler --- 80,84 ---- wxlState.RemoveTrackedWindow((wxWindow*)event.GetEventObject()); // delete the reference to this handler since we're clearing it ! wxlState.RemoveTrackedEventHandler(theCallback); // Disconnect all callbacks associated with this window's evthandler *************** *** 157,164 **** wxLuaDestroyCallback::wxLuaDestroyCallback(const wxLuaState& state, ! wxWindowID id, ! wxEvtHandler *pHandler, int iTag) ! : m_wxlState(state), m_pHandler(pHandler), m_id(id) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); --- 154,161 ---- wxLuaDestroyCallback::wxLuaDestroyCallback(const wxLuaState& state, ! wxWindowID id, wxEvtHandler *pHandler, int iTag) ! : wxEvtHandler(), m_wxlState(state), ! m_pHandler(pHandler), m_id(id) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); *************** *** 195,200 **** // connect the event handler ! pHandler->Connect(id, ! wxEVT_DESTROY, (wxObjectEventFunction)&wxLuaDestroyCallback::EventHandler, this); --- 192,196 ---- // connect the event handler ! pHandler->Connect(id, wxEVT_DESTROY, (wxObjectEventFunction)&wxLuaDestroyCallback::EventHandler, this); |
|
From: John L. <jr...@us...> - 2006-05-14 17:45:10
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/bindings Modified Files: genwxbind.lua Log Message: init all image handlers in luamodule to make things easy simplify wxLuaSmartXXX by adding operator type*() so it can be used as is fix lua callback to clear the correct wxluastate and some formatting add destroy handler list to things shown in the stacktree and show items for them Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** genwxbind.lua 3 May 2006 22:52:17 -0000 1.60 --- genwxbind.lua 14 May 2006 17:45:05 -0000 1.61 *************** *** 3113,3117 **** argItem = "wxlState.GetStringArray("..argNum..", count)" ! declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " elseif argType == "int" then -- Un 'const' ints --- 3113,3118 ---- argItem = "wxlState.GetStringArray("..argNum..", count)" ! --declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " ! declare = "int count = 0; wxLuaSmartStringArray " elseif argType == "int" then -- Un 'const' ints *************** *** 3121,3125 **** argItem = "wxlState.GetIntArray("..argNum..", count)" ! declare = "int count = 0; wxLuaSmartIntArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " elseif not intrinsic then argItem = "("..argTypeWithAttrib..") wxlState.GetUserDataType("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" --- 3122,3127 ---- argItem = "wxlState.GetIntArray("..argNum..", count)" ! --declare = "int count = 0; wxLuaSmartIntArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " ! declare = "int count = 0; wxLuaSmartIntArray " elseif not intrinsic then argItem = "("..argTypeWithAttrib..") wxlState.GetUserDataType("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" |
|
From: John L. <jr...@us...> - 2006-05-14 17:45:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/modules/wxbind/src Modified Files: gdi.cpp Log Message: init all image handlers in luamodule to make things easy simplify wxLuaSmartXXX by adding operator type*() so it can be used as is fix lua callback to clear the correct wxluastate and some formatting add destroy handler list to things shown in the stacktree and show items for them Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** gdi.cpp 3 May 2006 22:52:18 -0000 1.22 --- gdi.cpp 14 May 2006 17:45:05 -0000 1.23 *************** *** 8738,8742 **** const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); // int attribList = 0 ! int count = 0; wxLuaSmartIntArray ptr; int * attribList; ptr = attribList = (argCount >= 7 ? wxlState.GetIntArray(7, count) : 0); // const wxString name = "wxGLCanvas" const wxString name = (argCount >= 6 ? lua2wx(wxlState.GetStringType(6)) : wxString(wxT("wxGLCanvas"))); --- 8738,8742 ---- const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 7 ? wxlState.GetIntArray(7, count) : 0); // const wxString name = "wxGLCanvas" const wxString name = (argCount >= 6 ? lua2wx(wxlState.GetStringType(6)) : wxString(wxT("wxGLCanvas"))); *************** *** 8772,8776 **** const wxPalette * palette = (argCount >= 9 ? (const wxPalette *)wxlState.GetUserDataType(9, s_wxluatag_wxPalette) : &wxNullPalette); // int attribList = 0 ! int count = 0; wxLuaSmartIntArray ptr; int * attribList; ptr = attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); // const wxString name = "wxGLCanvas" const wxString name = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxT("wxGLCanvas"))); --- 8772,8776 ---- const wxPalette * palette = (argCount >= 9 ? (const wxPalette *)wxlState.GetUserDataType(9, s_wxluatag_wxPalette) : &wxNullPalette); // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); // const wxString name = "wxGLCanvas" const wxString name = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxT("wxGLCanvas"))); *************** *** 8808,8812 **** const wxPalette * palette = (argCount >= 9 ? (const wxPalette *)wxlState.GetUserDataType(9, s_wxluatag_wxPalette) : &wxNullPalette); // int attribList = 0 ! int count = 0; wxLuaSmartIntArray ptr; int * attribList; ptr = attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); // const wxString name = "wxGLCanvas" const wxString name = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxT("wxGLCanvas"))); --- 8808,8812 ---- const wxPalette * palette = (argCount >= 9 ? (const wxPalette *)wxlState.GetUserDataType(9, s_wxluatag_wxPalette) : &wxNullPalette); // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); // const wxString name = "wxGLCanvas" const wxString name = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxT("wxGLCanvas"))); |
|
From: John L. <jr...@us...> - 2006-05-14 17:45:09
|
Update of /cvsroot/wxlua/wxLua/apps/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/apps/luamodule/src Modified Files: luamodule.cpp Log Message: init all image handlers in luamodule to make things easy simplify wxLuaSmartXXX by adding operator type*() so it can be used as is fix lua callback to clear the correct wxluastate and some formatting add destroy handler list to things shown in the stacktree and show items for them Index: luamodule.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/luamodule.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** luamodule.cpp 14 May 2006 01:49:10 -0000 1.2 --- luamodule.cpp 14 May 2006 17:45:05 -0000 1.3 *************** *** 111,114 **** --- 111,115 ---- wxTheApp->SetExitOnFrameDelete(true); + wxInitAllImageHandlers(); wxLuaBinding_wx_init(); |
|
From: John L. <jr...@us...> - 2006-05-14 17:45:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21439/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h Log Message: init all image handlers in luamodule to make things easy simplify wxLuaSmartXXX by adding operator type*() so it can be used as is fix lua callback to clear the correct wxluastate and some formatting add destroy handler list to things shown in the stacktree and show items for them Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxlcallb.h 23 Apr 2006 19:36:50 -0000 1.9 --- wxlcallb.h 14 May 2006 17:45:05 -0000 1.10 *************** *** 25,37 **** { public: ! wxLuaCallback( const wxLuaState& state, ! int theRoutine, ! wxWindowID id, ! wxEventType eventType, wxEvtHandler *pHandler ); virtual ~wxLuaCallback(); ! void ClearLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } --- 25,35 ---- { public: ! wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID id, wxEventType eventType, wxEvtHandler *pHandler ); virtual ~wxLuaCallback(); ! void ClearLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } *************** *** 53,63 **** // reference to the lua routine to call ! int m_routine; // store the wxLuaState since we're added to a list of it's callbacks. ! wxLuaState m_wxlState; ! wxEvtHandler *m_pHandler; ! wxWindowID m_id; ! wxEventType m_eventType; private: --- 51,61 ---- // reference to the lua routine to call ! int m_routine; // store the wxLuaState since we're added to a list of it's callbacks. ! wxLuaState m_wxlState; ! wxEvtHandler* m_pHandler; ! wxWindowID m_id; ! wxEventType m_eventType; private: *************** *** 74,84 **** public: wxLuaDestroyCallback( const wxLuaState& state, ! wxWindowID id, ! wxEvtHandler *pHandler, ! int iTag); virtual ~wxLuaDestroyCallback(); ! void ClearLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } --- 72,81 ---- public: wxLuaDestroyCallback( const wxLuaState& state, ! wxWindowID id, wxEvtHandler *pHandler, ! int iTag ); virtual ~wxLuaDestroyCallback(); ! void ClearLuaState() { m_wxlState.UnRef(); } wxLuaState GetwxLuaState() const { return m_wxlState; } *************** *** 93,97 **** // store the wxLuaState since we're added to a list of it's callbacks. wxLuaState m_wxlState; ! wxEvtHandler *m_pHandler; int m_id; --- 90,94 ---- // store the wxLuaState since we're added to a list of it's callbacks. wxLuaState m_wxlState; ! wxEvtHandler* m_pHandler; int m_id; Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlbind.h 14 May 2006 07:48:09 -0000 1.16 --- wxlbind.h 14 May 2006 17:45:05 -0000 1.17 *************** *** 39,43 **** // ---------------------------------------------------------------------------- ! enum LuaType // The type of a Lua method { LuaDelete = 1, // gc routine --- 39,43 ---- // ---------------------------------------------------------------------------- ! enum LuaType // The type of a Lua method { LuaDelete = 1, // gc routine *************** *** 62,66 **** }; ! // wxlua arg tags for common lua types extern int s_wxluaarg_String; extern int s_wxluaarg_Boolean; --- 62,66 ---- }; ! // wxlua arg tags for common lua types extern int s_wxluaarg_String; extern int s_wxluaarg_Boolean; *************** *** 199,202 **** --- 199,203 ---- void operator = (wxString *strArr) { m_strArr = strArr; } + operator const wxString *() const { return m_strArr; } private: *************** *** 215,218 **** --- 216,220 ---- void operator = (int *intArr) { m_intArr = intArr; } + operator const int *() const { return m_intArr; } private: |
|
From: Francesco M. <fr...@us...> - 2006-05-14 13:11:52
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1208/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: removed Set/GetStyle for wx >= 2.7 from wxDir|FileDialog Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxstc_datatypes.lua 13 May 2006 17:20:51 -0000 1.20 --- wxstc_datatypes.lua 14 May 2006 13:11:49 -0000 1.21 *************** *** 18,22 **** wxInt32 = "int", wxNotebookPage = "wxWindow", - wxPageSetupDialog = "wxPageSetupDialogBase", wxPreviewWindow = "wxScrolledWindow", wxTextCoord = "long", --- 18,21 ---- |
|
From: Francesco M. <fr...@us...> - 2006-05-14 13:11:52
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1208/bindings/wxwidgets Modified Files: dialogs.i Log Message: removed Set/GetStyle for wx >= 2.7 from wxDir|FileDialog Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** dialogs.i 1 May 2006 19:36:30 -0000 1.15 --- dialogs.i 14 May 2006 13:11:49 -0000 1.16 *************** *** 157,161 **** // %override [lua string table] wxFileDialog::GetPaths() void GetPaths(wxArrayString& paths) const ! long GetStyle() const wxString GetWildcard() const void SetDirectory(const wxString& directory) --- 157,161 ---- // %override [lua string table] wxFileDialog::GetPaths() void GetPaths(wxArrayString& paths) const ! !%wxchkver27 long GetStyle() const wxString GetWildcard() const void SetDirectory(const wxString& directory) *************** *** 164,168 **** void SetMessage(const wxString& message) void SetPath(const wxString& path) ! void SetStyle(long style) void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog --- 164,168 ---- void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver27 void SetStyle(long style) void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog *************** *** 173,177 **** %property=Message, read, write %property=Path, read, write ! %property=Style, read, write %property=Wildcard, read, write %endclass --- 173,177 ---- %property=Message, read, write %property=Path, read, write ! !%wxchkver27 %property=Style, read, write %property=Wildcard, read, write %endclass *************** *** 192,204 **** wxString GetPath() const wxString GetMessage() const ! long GetStyle() const void SetMessage(const wxString& message) void SetPath(const wxString& path) ! void SetStyle(long style) // int ShowModal() - in wxDialog %property=Message, read, write %property=Path, read, write ! %property=Style, read, write %endclass --- 192,204 ---- wxString GetPath() const wxString GetMessage() const ! !%wxchkver27 long GetStyle() const void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver27 void SetStyle(long style) // int ShowModal() - in wxDialog %property=Message, read, write %property=Path, read, write ! !%wxchkver27 %property=Style, read, write %endclass |
|
From: Francesco M. <fr...@us...> - 2006-05-14 13:11:52
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1208/apps/build/bakefiles Modified Files: apps.bkl Log Message: removed Set/GetStyle for wx >= 2.7 from wxDir|FileDialog Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** apps.bkl 8 May 2006 15:50:47 -0000 1.37 --- apps.bkl 14 May 2006 13:11:49 -0000 1.38 *************** *** 150,152 **** --- 150,167 ---- </exe> + <!-- ================================================================== --> + <!-- The WXLUAFREEZE application target --> + <!-- ================================================================== --> + + <exe id="app_wxluafreeze" template="wxluaapp" cond="USE_WXLUAFREEZEAPP=='1'"> + <sources>$(WXLUAFREEZEAPP_SRC)</sources> + <headers>$(WXLUAFREEZEAPP_HDR)</headers> + + <exename>wxluafreeze</exename> + <win32-res>wxluafreeze/src/wxluafreeze.rc</win32-res> + + <wxlua-allstdlibs/> + <wx-alllibs-req-bywxlua/> + </exe> + </makefile> |
|
From: Francesco M. <fr...@us...> - 2006-05-14 13:11:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1208/modules/wxbind/src Modified Files: dialogs.cpp Log Message: removed Set/GetStyle for wx >= 2.7 from wxDir|FileDialog Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** dialogs.cpp 2 May 2006 05:25:02 -0000 1.13 --- dialogs.cpp 14 May 2006 13:11:49 -0000 1.14 *************** *** 580,583 **** --- 580,616 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog) + // !%wxchkver27 long GetStyle() const + static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxFileDialog * self = (wxFileDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDialog); + // call GetStyle + returns = self->GetStyle(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // !%wxchkver27 void SetStyle(long style) + static int LUACALL wxLua_wxFileDialog_SetStyle(lua_State *L) + { + wxLuaState wxlState(L); + // long style + long style = (long)wxlState.GetNumberType(2); + // get this + wxFileDialog * self = (wxFileDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDialog); + // call SetStyle + self->SetStyle(style); + + return 0; + } + + #endif + + #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString) // %override wxLua_wxFileDialog_GetFilenames *************** *** 724,742 **** } - // long GetStyle() const - static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L) - { - wxLuaState wxlState(L); - long returns; - // get this - wxFileDialog * self = (wxFileDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDialog); - // call GetStyle - returns = self->GetStyle(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // wxString GetWildcard() const static int LUACALL wxLua_wxFileDialog_GetWildcard(lua_State *L) --- 757,760 ---- *************** *** 824,841 **** } - // void SetStyle(long style) - static int LUACALL wxLua_wxFileDialog_SetStyle(lua_State *L) - { - wxLuaState wxlState(L); - // long style - long style = (long)wxlState.GetNumberType(2); - // get this - wxFileDialog * self = (wxFileDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDialog); - // call SetStyle - self->SetStyle(style); - - return 0; - } - // void SetWildcard(const wxString& wildCard) static int LUACALL wxLua_wxFileDialog_SetWildcard(lua_State *L) --- 842,845 ---- *************** *** 864,867 **** --- 868,879 ---- static WXLUAMETHOD s_wxFileDialog_methods[] = { + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog) + { LuaMethod, "GetStyle", wxLua_wxFileDialog_GetStyle, 0, 0, { 0 } }, + { LuaMethod, "SetStyle", wxLua_wxFileDialog_SetStyle, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaGetProp, "Style", wxLua_wxFileDialog_GetStyle, 0, 0, {0} }, + { LuaSetProp, "Style", wxLua_wxFileDialog_SetStyle, 1, 1, {0} }, + #endif + + #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString) { LuaMethod, "GetFilenames", wxLua_wxFileDialog_GetFilenames, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, *************** *** 879,883 **** { LuaMethod, "GetMessage", wxLua_wxFileDialog_GetMessage, 0, 0, { 0 } }, { LuaMethod, "GetPath", wxLua_wxFileDialog_GetPath, 0, 0, { 0 } }, - { LuaMethod, "GetStyle", wxLua_wxFileDialog_GetStyle, 0, 0, { 0 } }, { LuaMethod, "GetWildcard", wxLua_wxFileDialog_GetWildcard, 0, 0, { 0 } }, { LuaMethod, "SetDirectory", wxLua_wxFileDialog_SetDirectory, 1, 1, { &s_wxluaarg_String, 0 } }, --- 891,894 ---- *************** *** 886,890 **** { LuaMethod, "SetMessage", wxLua_wxFileDialog_SetMessage, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetPath", wxLua_wxFileDialog_SetPath, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetStyle", wxLua_wxFileDialog_SetStyle, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetWildcard", wxLua_wxFileDialog_SetWildcard, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaGetProp, "Directory", wxLua_wxFileDialog_GetDirectory, 0, 0, {0} }, --- 897,900 ---- *************** *** 898,903 **** { LuaGetProp, "Path", wxLua_wxFileDialog_GetPath, 0, 0, {0} }, { LuaSetProp, "Path", wxLua_wxFileDialog_SetPath, 1, 1, {0} }, - { LuaGetProp, "Style", wxLua_wxFileDialog_GetStyle, 0, 0, {0} }, - { LuaSetProp, "Style", wxLua_wxFileDialog_SetStyle, 1, 1, {0} }, { LuaGetProp, "Wildcard", wxLua_wxFileDialog_GetWildcard, 0, 0, {0} }, { LuaSetProp, "Wildcard", wxLua_wxFileDialog_SetWildcard, 1, 1, {0} }, --- 908,911 ---- *************** *** 920,923 **** --- 928,964 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog) + // !%wxchkver27 long GetStyle() const + static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxDirDialog * self = (wxDirDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDirDialog); + // call GetStyle + returns = self->GetStyle(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // !%wxchkver27 void SetStyle(long style) + static int LUACALL wxLua_wxDirDialog_SetStyle(lua_State *L) + { + wxLuaState wxlState(L); + // long style + long style = (long)wxlState.GetNumberType(2); + // get this + wxDirDialog * self = (wxDirDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDirDialog); + // call SetStyle + self->SetStyle(style); + + return 0; + } + + #endif + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog) // wxDirDialog(wxWindow* parent, const wxString& message = "Choose a directory", const wxString& defaultPath = "", long style = 0, const wxPoint& pos = wxDefaultPosition) *************** *** 978,996 **** } - // long GetStyle() const - static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L) - { - wxLuaState wxlState(L); - long returns; - // get this - wxDirDialog * self = (wxDirDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDirDialog); - // call GetStyle - returns = self->GetStyle(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // void SetMessage(const wxString& message) static int LUACALL wxLua_wxDirDialog_SetMessage(lua_State *L) --- 1019,1022 ---- *************** *** 1021,1038 **** } - // void SetStyle(long style) - static int LUACALL wxLua_wxDirDialog_SetStyle(lua_State *L) - { - wxLuaState wxlState(L); - // long style - long style = (long)wxlState.GetNumberType(2); - // get this - wxDirDialog * self = (wxDirDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDirDialog); - // call SetStyle - self->SetStyle(style); - - return 0; - } - static int LUACALL wxLua_wxDirDialog_destructor(lua_State *) { --- 1047,1050 ---- *************** *** 1047,1050 **** --- 1059,1070 ---- static WXLUAMETHOD s_wxDirDialog_methods[] = { + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog) + { LuaMethod, "GetStyle", wxLua_wxDirDialog_GetStyle, 0, 0, { 0 } }, + { LuaMethod, "SetStyle", wxLua_wxDirDialog_SetStyle, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaGetProp, "Style", wxLua_wxDirDialog_GetStyle, 0, 0, {0} }, + { LuaSetProp, "Style", wxLua_wxDirDialog_SetStyle, 1, 1, {0} }, + #endif + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog) { LuaConstructor, "wxDirDialog", wxLua_wxDirDialog_constructor, 5, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, *************** *** 1053,1066 **** { LuaMethod, "GetPath", wxLua_wxDirDialog_GetPath, 0, 0, { 0 } }, { LuaMethod, "GetMessage", wxLua_wxDirDialog_GetMessage, 0, 0, { 0 } }, - { LuaMethod, "GetStyle", wxLua_wxDirDialog_GetStyle, 0, 0, { 0 } }, { LuaMethod, "SetMessage", wxLua_wxDirDialog_SetMessage, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetPath", wxLua_wxDirDialog_SetPath, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetStyle", wxLua_wxDirDialog_SetStyle, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaGetProp, "Message", wxLua_wxDirDialog_GetMessage, 0, 0, {0} }, { LuaSetProp, "Message", wxLua_wxDirDialog_SetMessage, 1, 1, {0} }, { LuaGetProp, "Path", wxLua_wxDirDialog_GetPath, 0, 0, {0} }, { LuaSetProp, "Path", wxLua_wxDirDialog_SetPath, 1, 1, {0} }, - { LuaGetProp, "Style", wxLua_wxDirDialog_GetStyle, 0, 0, {0} }, - { LuaSetProp, "Style", wxLua_wxDirDialog_SetStyle, 1, 1, {0} }, { LuaDelete, "wxDirDialog", wxLua_wxDirDialog_destructor, 0, 0, {0} }, }; --- 1073,1082 ---- |
|
From: Francesco M. <fr...@us...> - 2006-05-14 12:58:35
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28721 Modified Files: configure Log Message: added LUA checks to configure script Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** configure 8 May 2006 15:50:47 -0000 1.34 --- configure 14 May 2006 12:55:55 -0000 1.35 *************** *** 274,278 **** PACKAGE_BUGREPORT='fr...@us...' ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLIBS_REQUIRED WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_UNICODE_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_INSTALL_CUSTOM_WXBIND_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_WXBINDSTC_1 COND_SHARED_0_USE_WXLUADEBUG_1 COND_SHARED_0_USE_WXLUASOCKET_1 COND_SHARED_1 COND_SHARED_1_USE_WXBINDSTC_1 COND_SHARED_1_USE_WXLUADEBUG_1 COND_SHARED_1_USE_WXLUASOCKET_1 COND_UNICODE_0 COND_UNICODE_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 COND_USE_WXLUACANAPP_1 COND_USE_WXLUAFREEZEAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_PORT_GTK COND_WX_PORT_MAC COND_WX_PORT_MGL COND_WX_PORT_MOTIF COND_WX_PORT_MSW COND_WX_PORT_X11 LIBOBJS LTLIBOBJS' ac_subst_files='' --- 274,315 ---- PACKAGE_BUGREPORT='fr...@us...' ! # Factoring default headers for most tests. ! ac_includes_default="\ [...2163 lines suppressed...] --- 10007,10025 ---- # applications ! if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then echo " - wxLua application: yes" ! elif [ "x$USE_WXLUAAPP" = "x0" -o "x$USE_WXBINDSTC" = "x0" -o "x$USE_WXLUADEBUG" = "x0" ]; then echo " - wxLua application: no" else ! echo "USE_WXLUAAPP is $USE_WXLUAAPP; USE_WXBINDSTC is $USE_WXBINDSTC; USE_WXLUADEBUG is $USE_WXLUADEBUG" fi ! if [ "x$USE_WXLUACANAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" ]; then echo " - wxLuaCan application: yes" ! elif [ "x$USE_WXLUACANAPP" = "x0" -o "x$USE_WXBINDSTC" = "x0" ]; then echo " - wxLuaCan application: no" else ! echo "USE_WXLUACANAPP is $USE_WXLUACANAPP; USE_WXBINDSTC is $USE_WXBINDSTC" fi |
