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 22:47:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2550/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: add more classes for 2.6.3, wxMediaCtrl, wxURL, wxURI, update grid.i Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxbind.h 16 May 2006 04:55:33 -0000 1.25 --- wxbind.h 16 May 2006 22:47:09 -0000 1.26 *************** *** 117,120 **** --- 117,125 ---- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + #include "wx/mediactrl.h" + #endif + + #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) #include "wx/minifram.h" *************** *** 541,544 **** --- 546,551 ---- #include "wx/protocol/protocol.h" #include "wx/socket.h" + #include "wx/uri.h" + #include "wx/url.h" #endif *************** *** 753,756 **** --- 760,769 ---- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + extern int s_wxluatag_wxMediaCtrl; + extern int s_wxluatag_wxMediaEvent; + #endif + + #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) extern int s_wxluatag_wxMiniFrame; *************** *** 1404,1407 **** --- 1417,1422 ---- extern int s_wxluatag_wxSocketEvent; extern int s_wxluatag_wxSocketServer; + extern int s_wxluatag_wxURI; + extern int s_wxluatag_wxURL; #endif *************** *** 1672,1675 **** --- 1687,1698 ---- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + extern WXLUAMETHOD* wxMediaCtrl_methods; + extern int wxMediaCtrl_methodCount; + extern WXLUAMETHOD* wxMediaEvent_methods; + extern int wxMediaEvent_methodCount; + #endif + + #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) extern WXLUAMETHOD* wxMiniFrame_methods; *************** *** 2593,2596 **** --- 2616,2623 ---- extern WXLUAMETHOD* wxSocketServer_methods; extern int wxSocketServer_methodCount; + extern WXLUAMETHOD* wxURI_methods; + extern int wxURI_methodCount; + extern WXLUAMETHOD* wxURL_methods; + extern int wxURL_methodCount; #endif *************** *** 2877,2880 **** --- 2904,2912 ---- + #if wxLUA_USE_wxGrid + wxLUA_DECLARE_ENCAPSULATION(wxGridCellCoords) + #endif + + #if wxLUA_USE_wxListCtrl wxLUA_DECLARE_ENCAPSULATION(wxListItemAttr) |
|
From: John L. <jr...@us...> - 2006-05-16 22:47:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2550/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: add more classes for 2.6.3, wxMediaCtrl, wxURL, wxURI, update grid.i Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxluasetup.h 22 Apr 2006 22:45:01 -0000 1.3 --- wxluasetup.h 16 May 2006 22:47:09 -0000 1.4 *************** *** 70,73 **** --- 70,74 ---- #define wxLUA_USE_wxLuaPrintout 1 #define wxLUA_USE_wxMask 1 + #define wxLUA_USE_wxMediaCtrl 0 // must link to lib #define wxLUA_USE_wxMenu 1 #define wxLUA_USE_wxMessageDialog 1 |
|
From: John L. <jr...@us...> - 2006-05-16 22:47:14
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2550/wxLua/bindings/wxwidgets Modified Files: defsutil.i grid.i override.hpp socket.i wave.i wx_datatypes.lua Log Message: add more classes for 2.6.3, wxMediaCtrl, wxURL, wxURI, update grid.i Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wave.i 8 May 2006 05:46:58 -0000 1.6 --- wave.i 16 May 2006 22:47:09 -0000 1.7 *************** *** 61,65 **** %endif // %msw&!%wxchkver25 ! %endif wxLUA_USE_wxWave --- 61,124 ---- %endif // %msw&!%wxchkver25 + /////////////////////////////////////////////////////////////////////////////// + // wxMediaCtrl ! %if wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL ! ! %include "wx/mediactrl.h" ! ! %enum wxMediaState ! wxMEDIASTATE_STOPPED ! wxMEDIASTATE_PAUSED ! wxMEDIASTATE_PLAYING ! %endenum ! ! %enum wxMediaCtrlPlayerControls ! wxMEDIACTRLPLAYERCONTROLS_NONE ! wxMEDIACTRLPLAYERCONTROLS_STEP ! wxMEDIACTRLPLAYERCONTROLS_VOLUME ! wxMEDIACTRLPLAYERCONTROLS_DEFAULT ! %endenum ! ! %define %string wxMEDIABACKEND_DIRECTSHOW ! %define %string wxMEDIABACKEND_MCI ! %define %string wxMEDIABACKEND_QUICKTIME ! %define %string wxMEDIABACKEND_GSTREAMER ! ! %class wxMediaCtrl, wxControl ! %constructor wxMediaCtrlDefault() ! wxMediaCtrl( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) ! ! bool Create( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) ! wxFileOffset GetDownloadProgress() ! wxFileOffset GetDownloadTotal() ! wxMediaState GetState() ! bool Load(const wxString& fileName) ! %rename LoadFromURI bool Load(const wxURI& location) ! bool Pause() ! bool Play() ! wxFileOffset Seek(wxFileOffset where, wxSeekMode mode) ! bool Stop() ! bool SetVolume(double dVolume) ! double GetVolume() ! bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) ! %endclass ! ! /////////////////////////////////////////////////////////////////////////////// ! // wxMediaEvent ! ! %define wxMEDIA_FINISHED_ID ! %define wxMEDIA_STOP_ID ! %define wxMEDIA_LOADED_ID ! ! %class %delete wxMediaEvent, wxNotifyEvent ! %define %event wxEVT_MEDIA_FINISHED ! %define %event wxEVT_MEDIA_STOP ! %define %event wxEVT_MEDIA_LOADED ! ! wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) ! ! %endclass ! ! %endif //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wx_datatypes.lua 16 May 2006 04:55:32 -0000 1.27 --- wx_datatypes.lua 16 May 2006 22:47:09 -0000 1.28 *************** *** 1124,1127 **** --- 1124,1128 ---- }, wxGridCellAttr = { + BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid", DefType = "class", *************** *** 1136,1139 **** --- 1137,1141 ---- }, wxGridCellAttrProvider = { + BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid", DefType = "class", *************** *** 1321,1324 **** --- 1323,1332 ---- Name = "wxGridTableMessage", }, + wxGridTableRequest = { + Condition = "wxLUA_USE_wxGrid", + DefType = "enum", + Intrinsic = true, + Name = "wxGridTableRequest", + }, wxHTTP = { BaseClass = "wxProtocol", *************** *** 1782,1785 **** --- 1790,1819 ---- Name = "wxMaximizeEvent", }, + wxMediaCtrl = { + BaseClass = "wxControl", + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "class", + Intrinsic = false, + Name = "wxMediaCtrl", + }, + wxMediaCtrlPlayerControls = { + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "enum", + Intrinsic = true, + Name = "wxMediaCtrlPlayerControls", + }, + wxMediaEvent = { + BaseClass = "wxNotifyEvent", + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "class", + Intrinsic = false, + Name = "wxMediaEvent", + }, + wxMediaState = { + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "enum", + Intrinsic = true, + Name = "wxMediaState", + }, wxMemoryDC = { BaseClass = "wxDC", *************** *** 2824,2827 **** --- 2858,2899 ---- Name = "wxTreeItemIdValue", }, + wxURI = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxSocket", + DefType = "class", + Intrinsic = false, + Name = "wxURI", + }, + wxURIFieldType = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURIFieldType", + }, + wxURIFlags = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURIFlags", + }, + wxURIHostType = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURIHostType", + }, + wxURL = { + BaseClass = "wxURI", + Condition = "wxLUA_USE_wxSocket", + DefType = "class", + Intrinsic = false, + Name = "wxURL", + }, + wxURLError = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURLError", + }, wxUint16 = { DefType = "wxtypedef", *************** *** 3151,3154 **** --- 3223,3227 ---- wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout", wxLUA_USE_wxMask = "wxLUA_USE_wxMask", + wxLUA_USE_wxMediaCtrl = "wxLUA_USE_wxMediaCtrl", wxLUA_USE_wxMenu = "wxLUA_USE_wxMenu", wxLUA_USE_wxMessageDialog = "wxLUA_USE_wxMessageDialog", *************** *** 3280,3283 **** --- 3353,3357 ---- wxUSE_MDI = "wxUSE_MDI", wxUSE_MDI_ARCHITECTURE = "wxUSE_MDI_ARCHITECTURE", + wxUSE_MEDIACTRL = "wxUSE_MEDIACTRL", wxUSE_MEMORY_TRACING = "wxUSE_MEMORY_TRACING", wxUSE_MENUS = "wxUSE_MENUS", Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** override.hpp 15 May 2006 21:55:35 -0000 1.38 --- override.hpp 16 May 2006 22:47:09 -0000 1.39 *************** *** 1361,1364 **** --- 1361,1387 ---- %end + %override wxLua_wxBusyCursor_constructor + // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) + static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursor *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxCursor cursor = wxHOURGLASS_CURSOR + + // NOTE: gcc complains that wxHOURGLASS_CURSOR is const, if changed to const MSVC complains wxBusyCursor takes non const + wxCursor * cursor = (argCount >= 1 ? (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor) : (wxCursor*)wxHOURGLASS_CURSOR); + // call constructor + returns = new wxBusyCursor(cursor); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBusyCursor *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); + + return 1; + } + %end + // ---------------------------------------------------------------------------- // Overrides for dialogs.i *************** *** 2427,2430 **** --- 2450,2493 ---- // ---------------------------------------------------------------------------- + %override wxLua_wxGridCellAttr_GetAlignment + // void GetAlignment(int *horz, int *vert) const + static int LUACALL wxLua_wxGridCellAttr_GetAlignment(lua_State *L) + { + wxLuaState wxlState(L); + int horz; + int vert; + + // get this + wxGridCellAttr *self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); + // call GetAlignment + self->GetAlignment(&horz, &vert); + + lua_pushnumber(L, horz); + lua_pushnumber(L, vert); + // return the number of parameters + return 2; + } + %end + + %override wxLua_wxGridCellAttr_GetSize + // void GetSize(int *num_rows, int *num_cols) const + static int LUACALL wxLua_wxGridCellAttr_GetSize(lua_State *L) + { + wxLuaState wxlState(L); + int num_rows; + int num_cols; + + // get this + wxGridCellAttr *self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); + // call GetAlignment + self->GetSize(&num_rows, &num_cols); + + lua_pushnumber(L, num_rows); + lua_pushnumber(L, num_cols); + // return the number of parameters + return 2; + } + %end + %override wxLua_wxGrid_GetRowLabelAlignment // void GetRowLabelAlignment( int *horz, int *vert ) *************** *** 2507,2525 **** %end ! %override wxLua_wxGridCellAttr_GetAlignment ! // void GetAlignment(int *horz, int *vert) const ! static int LUACALL wxLua_wxGridCellAttr_GetAlignment(lua_State *L) { wxLuaState wxlState(L); ! int horz; ! int vert; ! // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); ! // call GetAlignment ! self->GetAlignment(&horz, &vert); ! ! lua_pushnumber(L, horz); ! lua_pushnumber(L, vert); // return the number of parameters return 2; --- 2570,2591 ---- %end ! %override wxLua_wxGrid_GetCellSize ! // void GetCellSize( int row, int col, int *num_rows, int *num_cols ) ! static int LUACALL wxLua_wxGrid_GetCellSize(lua_State *L) { wxLuaState wxlState(L); ! int num_rows; ! int num_cols; ! // int col ! int col = (int)lua_tonumber(L, 3); ! // int row ! int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); ! // call GetCellAlignment ! self->GetCellAlignment(row, col, &num_rows, &num_cols); ! // push results ! lua_pushnumber(L, num_rows); ! lua_pushnumber(L, num_cols); // return the number of parameters return 2; Index: socket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/socket.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** socket.i 13 May 2006 17:20:51 -0000 1.6 --- socket.i 16 May 2006 22:47:09 -0000 1.7 *************** *** 270,272 **** --- 270,419 ---- %endclass + /////////////////////////////////////////////////////////////////////////////// + // wxURI + + %include "wx/uri.h" + + %enum wxURIHostType + wxURI_REGNAME + wxURI_IPV4ADDRESS + wxURI_IPV6ADDRESS + wxURI_IPVFUTURE + %endenum + + %enum wxURIFieldType + wxURI_SCHEME + wxURI_USERINFO + wxURI_SERVER + wxURI_PORT + wxURI_PATH + wxURI_QUERY + wxURI_FRAGMENT + %endenum + + %enum wxURIFlags + wxURI_STRICT + %endenum + + %class wxURI, wxObject + //%constructor wxURIDefault() + wxURI(const wxString& uri) + %constructor wxURICopy(const wxURI& uri) + + wxString Create(const wxString& uri) + bool HasScheme() const + bool HasUserInfo() const + bool HasServer() const + bool HasPort() const + bool HasPath() const + bool HasQuery() const + bool HasFragment() const + wxString GetScheme() const + wxString GetPath() const + wxString GetQuery() const + wxString GetFragment() const + wxString GetPort() const + wxString GetUserInfo() const + wxString GetServer() const + wxURIHostType GetHostType() const + wxString GetUser() const + wxString GetPassword() const + wxString BuildURI() const + wxString BuildUnescapedURI() const + void Resolve(const wxURI& base, int flags = wxURI_STRICT) + bool IsReference() const + static wxString Unescape (const wxString& szEscapedURI) + + %operator wxURI& operator = (const wxURI& uri); + //wxURI& operator = (const wxString& string); + %operator bool operator == (const wxURI& uri) const + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxURL + + %include "wx/url.h" + + %enum wxURLError + wxURL_NOERR + wxURL_SNTXERR + wxURL_NOPROTO + wxURL_NOHOST + wxURL_NOPATH + wxURL_CONNERR + wxURL_PROTOERR + %endenum + + %class wxURL, wxURI + wxURL(const wxString& sUrl) + %constructor wxURLFromURI(const wxURI& url) + + wxProtocol& GetProtocol() + wxURLError GetError() const + wxString GetURL() const + + wxInputStream *GetInputStream() + + %if wxUSE_PROTOCOL_HTTP + static void SetDefaultProxy(const wxString& url_proxy) + void SetProxy(const wxString& url_proxy) + %endif // wxUSE_PROTOCOL_HTTP + + //wxURL& operator = (const wxString& url); + //wxURL& operator = (const wxURI& url); + %endclass + + ///////////////////////////////////////////////////////////////////////////////// + //// wxConnectionBase + // + //%include "wx/ipcbase.h" + // + //%enum wxIPCFormat + // wxIPC_INVALID + // wxIPC_TEXT + // wxIPC_BITMAP + // wxIPC_METAFILE + // wxIPC_SYLK + // wxIPC_DIF + // wxIPC_TIFF + // wxIPC_OEMTEXT + // wxIPC_DIB + // wxIPC_PALETTE + // wxIPC_PENDATA + // wxIPC_RIFF + // wxIPC_WAVE + // wxIPC_UNICODETEXT + // wxIPC_ENHMETAFILE + // wxIPC_FILENAME + // wxIPC_LOCALE + // wxIPC_PRIVATE + //%endenum + // + //%class wxConnectionBase, wxObject + // // no constructor virtual base class + // + // bool Advise(const wxString& item, char* data, int size = -1, wxIPCFormat format = wxCF_TEXT) + // + //%endclass + // + ///////////////////////////////////////////////////////////////////////////////// + //// wxConnection + // + //%class wxConnection, wxConnectionBase + // wxConnection() + //%endclass + // + ///////////////////////////////////////////////////////////////////////////////// + //// wxClient + // + //%class wxClient, wxObject + // wxClient() + // wxConnectionBase * MakeConnection(const wxString& host, const wxString& service, const wxString& topic) + // + // //virtual wxConnectionBase * OnMakeConnection() + // bool ValidHost(const wxString& host) + // + //%endclass + // + %endif wxLUA_USE_wxSocket Index: grid.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/grid.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** grid.i 6 May 2006 16:58:29 -0000 1.7 --- grid.i 16 May 2006 22:47:09 -0000 1.8 *************** *** 1,8 **** ///////////////////////////////////////////////////////////////////////////// ! // Purpose: wxGrid and related classes // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// --- 1,9 ---- ///////////////////////////////////////////////////////////////////////////// ! // Purpose: wxGrid and related classes (Updated using grid.h NOT docs) // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence + // wxWidgets: Updated to 2.6.3 ///////////////////////////////////////////////////////////////////////////// *************** *** 12,39 **** %include "wx/generic/gridctrl.h" - %enum wxGridCellAttr::wxAttrKind - Any - Default - Cell - Row - Col - Merged - %endenum - - %enum wxGrid::wxGridSelectionModes - wxGridSelectCells - wxGridSelectRows - wxGridSelectColumns - %endenum - - %define wxGRIDTABLE_REQUEST_VIEW_GET_VALUES - %define wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES - %define wxGRIDTABLE_NOTIFY_ROWS_INSERTED - %define wxGRIDTABLE_NOTIFY_ROWS_APPENDED - %define wxGRIDTABLE_NOTIFY_ROWS_DELETED - %define wxGRIDTABLE_NOTIFY_COLS_INSERTED - %define wxGRIDTABLE_NOTIFY_COLS_APPENDED - %define wxGRIDTABLE_NOTIFY_COLS_DELETED - %define WXGRID_DEFAULT_NUMBER_ROWS %define WXGRID_DEFAULT_NUMBER_COLS --- 13,16 ---- *************** *** 212,224 **** %endclass - - // FIXME - update grid.i for 2.6.3 - /////////////////////////////////////////////////////////////////////////////// // wxGridCellAttr ! %class %noclassinfo wxGridCellAttr ! wxGridCellAttr() void IncRef() void DecRef() --- 189,209 ---- %endclass /////////////////////////////////////////////////////////////////////////////// // wxGridCellAttr ! %enum wxGridCellAttr::wxAttrKind ! Any ! Default ! Cell ! Row ! Col ! Merged ! %endenum ! ! %class %noclassinfo wxGridCellAttr, wxClientDataContainer ! %constructor wxGridCellAttrDefault() ! wxGridCellAttr(const wxColour& colText, const wxColour& colBack, const wxFont& font, int hAlign, int vAlign) + void MergeWith(wxGridCellAttr *mergefrom) void IncRef() void DecRef() *************** *** 227,233 **** --- 212,221 ---- void SetFont(const wxFont& font) void SetAlignment(int hAlign, int vAlign) + void SetSize(int num_rows, int num_cols) + void SetOverflow(bool allow = true) void SetReadOnly(bool isReadOnly = true) void SetRenderer(wxGridCellRenderer *renderer) void SetEditor(wxGridCellEditor* editor) + void SetKind(wxGridCellAttr::wxAttrKind kind) bool HasTextColour() const bool HasBackgroundColour() const *************** *** 236,250 **** bool HasRenderer() const bool HasEditor() const wxColour GetTextColour() const wxColour GetBackgroundColour() const wxFont GetFont() const void GetAlignment(int *horz, int *vert) const wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const bool IsReadOnly() const void SetDefAttr(wxGridCellAttr* defAttr) - %wxchkver23 void SetKind(wxGridCellAttr::wxAttrKind kind) - %wxchkver23 bool HasReadWriteMode() const - %wxchkver23 void MergeWith(wxGridCellAttr *mergefrom) %property=BackgroundColour, read, write --- 224,243 ---- bool HasRenderer() const bool HasEditor() const + bool HasReadWriteMode() const + bool HasOverflowMode() const + bool HasSize() const wxColour GetTextColour() const wxColour GetBackgroundColour() const wxFont GetFont() const + // %override [int horiz, int vert] wxGridCellAttr::GetAlignment() const void GetAlignment(int *horz, int *vert) const + // %override [int num_rows, int num_cols] wxGridCellAttr::GetSize() const + void GetSize(int *num_rows, int *num_cols) const + bool GetOverflow() const wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const bool IsReadOnly() const + wxGridCellAttr::wxAttrKind GetKind() void SetDefAttr(wxGridCellAttr* defAttr) %property=BackgroundColour, read, write *************** *** 256,263 **** // wxGridCellAttrProvider ! %class %noclassinfo wxGridCellAttrProvider wxGridCellAttrProvider() ! %wxchkver23 wxGridCellAttr *GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) const void SetAttr(wxGridCellAttr *attr, int row, int col) void SetRowAttr(wxGridCellAttr *attr, int row) --- 249,256 ---- // wxGridCellAttrProvider ! %class %noclassinfo wxGridCellAttrProvider, wxClientDataContainer wxGridCellAttrProvider() ! wxGridCellAttr *GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) const void SetAttr(wxGridCellAttr *attr, int row, int col) void SetRowAttr(wxGridCellAttr *attr, int row) *************** *** 270,284 **** // wxGridTableBase ! %class wxGridTableBase, wxObject ! void SetAttrProvider(wxGridCellAttrProvider *attrProvider) int GetNumberRows() - %property=NumberRows, read int GetNumberCols() - %property=NumberCols, read bool IsEmptyCell( int row, int col ) wxString GetValue( int row, int col ) void SetValue( int row, int col, const wxString& value ) wxString GetTypeName( int row, int col ) - wxGridCellAttrProvider *GetAttrProvider() const bool CanGetValueAs( int row, int col, const wxString& typeName ) bool CanSetValueAs( int row, int col, const wxString& typeName ) --- 263,275 ---- // wxGridTableBase ! %class wxGridTableBase, wxObject //, wxClientDataContainer ! // no constructor pure virtual base class ! int GetNumberRows() int GetNumberCols() bool IsEmptyCell( int row, int col ) wxString GetValue( int row, int col ) void SetValue( int row, int col, const wxString& value ) wxString GetTypeName( int row, int col ) bool CanGetValueAs( int row, int col, const wxString& typeName ) bool CanSetValueAs( int row, int col, const wxString& typeName ) *************** *** 289,295 **** void SetValueAsLong( int row, int col, long value ) void SetValueAsDouble( int row, int col, double value ) void SetView( wxGrid *grid ) wxGrid * GetView() const - %property=View, read, write void Clear() bool InsertRows( size_t pos = 0, size_t numRows = 1 ) --- 280,287 ---- void SetValueAsLong( int row, int col, long value ) void SetValueAsDouble( int row, int col, double value ) + //virtual void* GetValueAsCustom( int row, int col, const wxString& typeName ) + //virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ) void SetView( wxGrid *grid ) wxGrid * GetView() const void Clear() bool InsertRows( size_t pos = 0, size_t numRows = 1 ) *************** *** 303,311 **** void SetRowLabelValue( int row, const wxString& value ) void SetColLabelValue( int col, const wxString& value ) ! %wxchkver23 wxGridCellAttr * GetAttr( int row, int col, wxGridCellAttr::wxAttrKind kind) void SetAttr(wxGridCellAttr* attr, int row, int col) void SetRowAttr(wxGridCellAttr *attr, int row) void SetColAttr(wxGridCellAttr *attr, int col) ! bool CanHaveAttributes() %endclass --- 295,309 ---- void SetRowLabelValue( int row, const wxString& value ) void SetColLabelValue( int col, const wxString& value ) ! void SetAttrProvider(wxGridCellAttrProvider *attrProvider) ! wxGridCellAttrProvider *GetAttrProvider() const ! bool CanHaveAttributes() ! wxGridCellAttr* GetAttr( int row, int col, wxGridCellAttr::wxAttrKind kind) void SetAttr(wxGridCellAttr* attr, int row, int col) void SetRowAttr(wxGridCellAttr *attr, int row) void SetColAttr(wxGridCellAttr *attr, int col) ! ! %property=NumberCols, read ! %property=NumberRows, read ! %property=View, read, write %endclass *************** *** 320,337 **** // wxGridTableMessage %class %noclassinfo wxGridTableMessage wxGridTableMessage( wxGridTableBase *table, int id, int comInt1 = -1, int comInt2 = -1 ) void SetTableObject( wxGridTableBase *table ) wxGridTableBase * GetTableObject() const - %property=TableObject, read, write void SetId( int id ) int GetId() - %property=Id, read, write void SetCommandInt( int comInt1 ) int GetCommandInt() - %property=CommandInt, read, write void SetCommandInt2( int comInt2 ) int GetCommandInt2() %property=CommandInt2, read, write %endclass --- 318,349 ---- // wxGridTableMessage + %enum wxGridTableRequest + wxGRIDTABLE_REQUEST_VIEW_GET_VALUES + wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES + wxGRIDTABLE_NOTIFY_ROWS_INSERTED + wxGRIDTABLE_NOTIFY_ROWS_APPENDED + wxGRIDTABLE_NOTIFY_ROWS_DELETED + wxGRIDTABLE_NOTIFY_COLS_INSERTED + wxGRIDTABLE_NOTIFY_COLS_APPENDED + wxGRIDTABLE_NOTIFY_COLS_DELETED + %endenum + + %class %noclassinfo wxGridTableMessage wxGridTableMessage( wxGridTableBase *table, int id, int comInt1 = -1, int comInt2 = -1 ) + void SetTableObject( wxGridTableBase *table ) wxGridTableBase * GetTableObject() const void SetId( int id ) int GetId() void SetCommandInt( int comInt1 ) int GetCommandInt() void SetCommandInt2( int comInt2 ) int GetCommandInt2() + + %property=CommandInt, read, write %property=CommandInt2, read, write + %property=Id, read, write + %property=TableObject, read, write %endclass *************** *** 339,353 **** // wxGridCellCoords ! %class %noclassinfo wxGridCellCoords %define %object wxGridNoCellRect wxGridCellCoords( int r = -1, int c = -1 ) int GetRow() const void SetRow( int n ) - %property=Row, read, write int GetCol() const void SetCol( int n ) - %property=Col, read, write void Set(int row, int col) %endclass --- 351,370 ---- // wxGridCellCoords ! %class %noclassinfo %encapsulate wxGridCellCoords %define %object wxGridNoCellRect wxGridCellCoords( int r = -1, int c = -1 ) + int GetRow() const void SetRow( int n ) int GetCol() const void SetCol( int n ) void Set(int row, int col) + + %operator wxGridCellCoords& operator=( const wxGridCellCoords& other ) + %operator bool operator==( const wxGridCellCoords& other ) const + + %property=Row, read, write + %property=Col, read, write %endclass *************** *** 355,361 **** // wxGrid %class wxGrid, wxScrolledWindow ! wxGrid( wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS, const wxString &name = "grid" ) bool CreateGrid( int numRows, int numCols, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells ) bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=true ) bool AppendRows( int numRows = 1, bool updateLabels=true ) --- 372,406 ---- // wxGrid + %enum wxGrid::wxGridSelectionModes + wxGridSelectCells + wxGridSelectRows + wxGridSelectColumns + %endenum + %class wxGrid, wxScrolledWindow ! wxGrid( wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS, const wxString &name = "wxGrid" ) ! bool CreateGrid( int numRows, int numCols, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells ) + + void SetSelectionMode(wxGrid::wxGridSelectionModes selmode) + wxGrid::wxGridSelectionModes GetSelectionMode() const + int GetNumberRows() + int GetNumberCols() + + //wxArrayInt CalcRowLabelsExposed( const wxRegion& reg ) + //wxArrayInt CalcColLabelsExposed( const wxRegion& reg ) + //wxGridCellCoordsArray CalcCellsExposed( const wxRegion& reg ) + //void ProcessRowLabelMouseEvent( wxMouseEvent& event ); + //void ProcessColLabelMouseEvent( wxMouseEvent& event ); + //void ProcessCornerLabelMouseEvent( wxMouseEvent& event ); + //void ProcessGridCellMouseEvent( wxMouseEvent& event ); + bool ProcessTableMessage( wxGridTableMessage& msg ) + //void DoEndDragResizeRow(); + //void DoEndDragResizeCol(); + + wxGridTableBase * GetTable() const + bool SetTable( wxGridTableBase * table, bool takeOwnership = false, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells ) + + void ClearGrid() bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=true ) bool AppendRows( int numRows = 1, bool updateLabels=true ) *************** *** 364,398 **** bool AppendCols( int numCols = 1, bool updateLabels=true ) bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=true ) ! void SetSelectionMode(wxGrid::wxGridSelectionModes selmode) ! void AutoSize() ! void AutoSizeRow( int row, bool setAsMin = true ) ! void AutoSizeColumn( int col, bool setAsMin = true ) ! void AutoSizeRows( bool setAsMin = true ) ! void AutoSizeColumns( bool setAsMin = true ) void BeginBatch() void EndBatch() - bool CanDragRowSize() - void EnableDragRowSize( bool enable = true ) - void DisableDragRowSize() - bool CanDragColSize() - void EnableDragColSize( bool enable = true ) - void DisableDragColSize() - bool CanDragGridSize() - void EnableDragGridSize(bool enable = true) - void DisableDragGridSize() - int GetNumberRows() - %property=NumberRows, read - int GetNumberCols() - %property=NumberCols, read - bool ProcessTableMessage( wxGridTableMessage& msg) - wxGridTableBase * GetTable() const - bool SetTable( wxGridTableBase * table, bool takeOwnership = false, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells ) - void ClearGrid() - void DrawCellHighlight( wxDC& dc, const wxGridCellAttr * attr ) - void DrawTextRectangle( wxDC& dc, const wxString& text, const wxRect& rect, int horizontalAlignment = wxLEFT, int verticalAlignment = wxTOP ) - void StringToLines( const wxString& value, wxArrayString& lines ) - void GetTextBoxSize( wxDC& dc, wxArrayString& lines, long * width, long * height) int GetBatchCount() ! %wxchkver23 void ForceRefresh() bool IsEditable() void EnableEditing( bool edit ) --- 409,434 ---- bool AppendCols( int numCols = 1, bool updateLabels=true ) bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=true ) ! ! //void DrawGridCellArea( wxDC& dc , const wxGridCellCoordsArray& cells ); ! //void DrawGridSpace( wxDC& dc ); ! //void DrawCellBorder( wxDC& dc, const wxGridCellCoords& ); ! //void DrawAllGridLines( wxDC& dc, const wxRegion & reg ); ! //void DrawCell( wxDC& dc, const wxGridCellCoords& ); ! //void DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells); ! //virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ); ! //virtual void DrawRowLabels( wxDC& dc, const wxArrayInt& rows ); ! //virtual void DrawRowLabel( wxDC& dc, int row ); ! //virtual void DrawColLabels( wxDC& dc, const wxArrayInt& cols ); ! //virtual void DrawColLabel( wxDC& dc, int col ); ! void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&, int horizontalAlignment = wxALIGN_LEFT, int verticalAlignment = wxALIGN_TOP, int textOrientation = wxHORIZONTAL ) ! //void DrawTextRectangle( wxDC& dc, const wxArrayString& lines, const wxRect&, int horizontalAlignment = wxALIGN_LEFT, int verticalAlignment = wxALIGN_TOP, int textOrientation = wxHORIZONTAL ) ! void StringToLines( const wxString& value, wxArrayString& lines ) ! // %override [long width, long height] wxGrid::GetTextBoxSize(wxDC& dc, const wxArrayString& lines) ! void GetTextBoxSize( wxDC& dc, const wxArrayString& lines, long *width, long *height ) void BeginBatch() void EndBatch() int GetBatchCount() ! void ForceRefresh() ! bool IsEditable() void EnableEditing( bool edit ) *************** *** 406,409 **** --- 442,446 ---- void HideCellEditControl() void SaveEditControlValue() + void XYToCell( int x, int y, wxGridCellCoords& coords) int XToCol( int x ) *************** *** 412,429 **** int YToEdgeOfRow( int y ) wxRect CellToRect( int row, int col ) int GetGridCursorRow() - %property=GridCursorRow, read int GetGridCursorCol() - %property=GridCursorCol, read bool IsVisible( int row, int col, bool wholeCellVisible = true ) ! // bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = true ) void MakeCellVisible( int row, int col ) ! // void MakeCellVisible( const wxGridCellCoords& coords ) void SetGridCursor( int row, int col ) int GetDefaultRowLabelSize() - %property=DefaultRowLabelSize, read int GetRowLabelSize() int GetDefaultColLabelSize() - %property=DefaultColLabelSize, read int GetColLabelSize() wxColour GetLabelBackgroundColour() --- 449,475 ---- int YToEdgeOfRow( int y ) wxRect CellToRect( int row, int col ) + //wxRect CellToRect( const wxGridCellCoords& coords ) int GetGridCursorRow() int GetGridCursorCol() bool IsVisible( int row, int col, bool wholeCellVisible = true ) ! //bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = true ) void MakeCellVisible( int row, int col ) ! //void MakeCellVisible( const wxGridCellCoords& coords ) ! void SetGridCursor( int row, int col ) + bool MoveCursorUp( bool expandSelection ) + bool MoveCursorDown( bool expandSelection ) + bool MoveCursorLeft( bool expandSelection ) + bool MoveCursorRight( bool expandSelection ) + bool MovePageDown() + bool MovePageUp() + bool MoveCursorUpBlock( bool expandSelection ) + bool MoveCursorDownBlock( bool expandSelection ) + bool MoveCursorLeftBlock( bool expandSelection ) + bool MoveCursorRightBlock( bool expandSelection ) + int GetDefaultRowLabelSize() int GetRowLabelSize() int GetDefaultColLabelSize() int GetColLabelSize() wxColour GetLabelBackgroundColour() *************** *** 432,451 **** void GetRowLabelAlignment( int *horz, int *vert ) void GetColLabelAlignment( int *horz, int *vert ) wxString GetRowLabelValue( int row ) wxString GetColLabelValue( int col ) wxColour GetGridLineColour() wxColour GetCellHighlightColour() ! %wxchkver23 int GetCellHighlightPenWidth() ! %wxchkver23 int GetCellHighlightROPenWidth() void SetRowLabelSize( int width ) - %property=RowLabelSize, read, write void SetColLabelSize( int height ) - %property=ColLabelSize, read, write void SetLabelBackgroundColour( const wxColour& backColour ) - %property=LabelBackgroundColour, read, write void SetLabelTextColour( const wxColour& textColour) - %property=LabelTextColour, read, write void SetLabelFont( const wxFont& labelFont) - %property=LabelFont, read, write void SetRowLabelAlignment( int horiz, int vert ) void SetColLabelAlignment( int horiz, int vert ) --- 478,493 ---- void GetRowLabelAlignment( int *horz, int *vert ) void GetColLabelAlignment( int *horz, int *vert ) + int GetColLabelTextOrientation() wxString GetRowLabelValue( int row ) wxString GetColLabelValue( int col ) wxColour GetGridLineColour() wxColour GetCellHighlightColour() ! int GetCellHighlightPenWidth() ! int GetCellHighlightROPenWidth() void SetRowLabelSize( int width ) void SetColLabelSize( int height ) void SetLabelBackgroundColour( const wxColour& backColour ) void SetLabelTextColour( const wxColour& textColour) void SetLabelFont( const wxFont& labelFont) void SetRowLabelAlignment( int horiz, int vert ) void SetColLabelAlignment( int horiz, int vert ) *************** *** 454,517 **** void SetGridLineColour( const wxColour& lineColour) void SetCellHighlightColour( const wxColour& highlightColour) ! %property=CellHighlightColour, read, write ! %wxchkver23 void SetCellHighlightPenWidth(int width) ! %wxchkver23 %property=CellHighlightPenWidth, read, write ! %wxchkver23 void SetCellHighlightROPenWidth(int width) ! %wxchkver23 %property=CellHighlightROPenWidth, read, write void SetRowAttr(int row, wxGridCellAttr *attr) void SetColAttr(int col, wxGridCellAttr *attr) void SetColFormatBool(int col) void SetColFormatNumber(int col) void SetColFormatFloat(int col, int width = -1, int precision = -1) void SetColFormatCustom(int col, const wxString& typeName) void EnableGridLines( bool enable = true ) bool GridLinesEnabled() ! int GetDefaultRowSize() ! int GetRowSize( int row ) ! int GetDefaultColSize() ! int GetColSize( int col ) ! wxColour GetSelectionBackground() const ! wxColour GetSelectionForeground() const ! void SetSelectionBackground(const wxColour& c) ! %property=SelectionBackground, read, write ! void SetSelectionForeground(const wxColour& c) ! %property=SelectionForeground, read, write wxColour GetDefaultCellBackgroundColour() wxColour GetCellBackgroundColour( int row, int col ) wxColour GetDefaultCellTextColour() wxColour GetCellTextColour( int row, int col ) ! wxFont GetDefaultCellFont() ! void SetDefaultCellFont( const wxFont& cellFont) ! wxFont GetCellFont( int row, int col ) ! void SetCellFont( int row, int col, const wxFont& cellFont) ! void GetDefaultCellAlignment( int *horiz, int *vert ) ! void SetDefaultCellAlignment( int horiz, int vert ) ! void GetCellAlignment( int row, int col, int *horiz, int *vert ) ! void SetCellAlignment( int row, int col, int horiz, int vert ) void SetDefaultColSize( int width, bool resizeExistingCols = false ) void SetColSize( int col, int width ) void SetColMinimalWidth( int col, int width ) - void SetDefaultRowSize( int height, bool resizeExistingRows = false ) - void SetRowSize( int row, int height ) void SetRowMinimalHeight( int row, int width ) void SetDefaultCellBackgroundColour( const wxColour& backColour) void SetCellBackgroundColour( int row, int col, const wxColour& backColour) void SetDefaultCellTextColour( const wxColour& textColour) void SetCellTextColour( int row, int col, const wxColour& textColour) void SetDefaultRenderer(wxGridCellRenderer *renderer) void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) wxGridCellRenderer* GetDefaultRenderer() const wxGridCellRenderer* GetCellRenderer(int row, int col) void SetDefaultEditor(wxGridCellEditor *editor) void SetCellEditor(int row, int col, wxGridCellEditor *editor) wxGridCellEditor* GetDefaultEditor() const - %property=DefaultEditor, read, write wxGridCellEditor* GetCellEditor(int row, int col) wxString GetCellValue( int row, int col ) // wxString GetCellValue( const wxGridCellCoords& coords ) void SetCellValue( int row, int col, const wxString& s ) // void SetCellValue( const wxGridCellCoords& coords, const wxString& s ) bool IsReadOnly(int row, int col) const void SetReadOnly(int row, int col, bool isReadOnly = true) void SelectRow( int row, bool addToSelected = false ) void SelectCol( int col, bool addToSelected = false ) --- 496,595 ---- void SetGridLineColour( const wxColour& lineColour) void SetCellHighlightColour( const wxColour& highlightColour) ! void SetCellHighlightPenWidth(int width) ! void SetCellHighlightROPenWidth(int width) ! ! void EnableDragRowSize( bool enable = true ) ! void DisableDragRowSize() ! bool CanDragRowSize() ! void EnableDragColSize( bool enable = true ) ! void DisableDragColSize() ! bool CanDragColSize() ! void EnableDragGridSize(bool enable = true) ! void DisableDragGridSize() ! bool CanDragGridSize() ! void EnableDragCell( bool enable = true ) ! void DisableDragCell() ! bool CanDragCell() ! ! void SetAttr(int row, int col, wxGridCellAttr *attr) void SetRowAttr(int row, wxGridCellAttr *attr) void SetColAttr(int col, wxGridCellAttr *attr) + wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const + void SetColFormatBool(int col) void SetColFormatNumber(int col) void SetColFormatFloat(int col, int width = -1, int precision = -1) void SetColFormatCustom(int col, const wxString& typeName) + void EnableGridLines( bool enable = true ) bool GridLinesEnabled() ! ! int GetDefaultRowSize() ! int GetRowSize( int row ) ! int GetDefaultColSize() ! int GetColSize( int col ) wxColour GetDefaultCellBackgroundColour() wxColour GetCellBackgroundColour( int row, int col ) wxColour GetDefaultCellTextColour() wxColour GetCellTextColour( int row, int col ) ! wxFont GetDefaultCellFont() ! wxFont GetCellFont( int row, int col ) ! void GetDefaultCellAlignment( int *horiz, int *vert ) ! // %override [int horiz, int vert] wxGrid::GetCellAlignment( int row, int col) ! void GetCellAlignment( int row, int col, int *horiz, int *vert ) ! bool GetDefaultCellOverflow() ! bool GetCellOverflow( int row, int col ) ! // %override [int num_rows, int num_cols] wxGrid::GetCellSize( int row, int col) ! void GetCellSize( int row, int col, int *num_rows, int *num_cols ) ! ! void SetDefaultRowSize( int height, bool resizeExistingRows = false ) ! void SetRowSize( int row, int height ) void SetDefaultColSize( int width, bool resizeExistingCols = false ) void SetColSize( int col, int width ) + void AutoSize() + void AutoSizeRow( int row, bool setAsMin = true ) + void AutoSizeColumn( int col, bool setAsMin = true ) + void AutoSizeRows( bool setAsMin = true ) + void AutoSizeColumns( bool setAsMin = true ) + void AutoSizeRowLabelSize( int row ) + void AutoSizeColLabelSize( int col ) + void SetColMinimalWidth( int col, int width ) void SetRowMinimalHeight( int row, int width ) + void SetColMinimalAcceptableWidth( int width ) + void SetRowMinimalAcceptableHeight( int width ) + int GetColMinimalAcceptableWidth() const + int GetRowMinimalAcceptableHeight() const + void SetDefaultCellBackgroundColour( const wxColour& backColour) void SetCellBackgroundColour( int row, int col, const wxColour& backColour) void SetDefaultCellTextColour( const wxColour& textColour) void SetCellTextColour( int row, int col, const wxColour& textColour) + void SetDefaultCellFont( const wxFont& cellFont) + void SetCellFont( int row, int col, const wxFont& cellFont) + void SetDefaultCellAlignment( int horiz, int vert ) + void SetCellAlignment( int row, int col, int horiz, int vert ) + void SetDefaultCellOverflow( bool allow ) + void SetCellOverflow( int row, int col, bool allow ) + void SetCellSize( int row, int col, int num_rows, int num_cols ) + void SetDefaultRenderer(wxGridCellRenderer *renderer) void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) wxGridCellRenderer* GetDefaultRenderer() const wxGridCellRenderer* GetCellRenderer(int row, int col) + void SetDefaultEditor(wxGridCellEditor *editor) void SetCellEditor(int row, int col, wxGridCellEditor *editor) wxGridCellEditor* GetDefaultEditor() const wxGridCellEditor* GetCellEditor(int row, int col) + wxString GetCellValue( int row, int col ) // wxString GetCellValue( const wxGridCellCoords& coords ) void SetCellValue( int row, int col, const wxString& s ) // void SetCellValue( const wxGridCellCoords& coords, const wxString& s ) + bool IsReadOnly(int row, int col) const void SetReadOnly(int row, int col, bool isReadOnly = true) + void SelectRow( int row, bool addToSelected = false ) void SelectCol( int col, bool addToSelected = false ) *************** *** 520,527 **** --- 598,621 ---- void SelectAll() bool IsSelection() + void DeselectRow( int row ) + void DeselectCol( int col ) + void DeselectCell( int row, int col ) void ClearSelection() bool IsInSelection( int row, int col ) // bool IsInSelection( const wxGridCellCoords& coords ) + + //wxGridCellCoordsArray GetSelectedCells() const + //wxGridCellCoordsArray GetSelectionBlockTopLeft() const + //wxGridCellCoordsArray GetSelectionBlockBottomRight() const + //wxArrayInt GetSelectedRows() const + //wxArrayInt GetSelectedCols() const + wxRect BlockToDeviceRect( const wxGridCellCoords & topLeft, const wxGridCellCoords & bottomRight ) + + wxColour GetSelectionBackground() const + wxColour GetSelectionForeground() const + void SetSelectionBackground(const wxColour& c) + void SetSelectionForeground(const wxColour& c) + void RegisterDataType(const wxString& typeName, wxGridCellRenderer* renderer, wxGridCellEditor* editor) wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const *************** *** 531,552 **** wxGridCellRenderer* GetDefaultRendererForType(const wxString& typeName) const void SetMargins(int extraWidth, int extraHeight) ! %wxchkver23 wxWindow* GetGridWindow() ! %wxchkver23 %property=GridWindow, read ! %wxchkver23 wxWindow* GetGridRowLabelWindow() ! %wxchkver23 %property=GridRowLabelWindow, read ! %wxchkver23 wxWindow* GetGridColLabelWindow() ! %wxchkver23 %property=GridColLabelWindow, read ! %wxchkver23 wxWindow* GetGridCornerLabelWindow() ! %wxchkver23 %property=GridCornerLabelWindow, read ! bool MoveCursorUp( bool expandSelection ) ! bool MoveCursorDown( bool expandSelection ) ! bool MoveCursorLeft( bool expandSelection ) ! bool MoveCursorRight( bool expandSelection ) ! bool MovePageDown() ! bool MovePageUp() ! bool MoveCursorUpBlock( bool expandSelection ) ! bool MoveCursorDownBlock( bool expandSelection ) ! bool MoveCursorLeftBlock( bool expandSelection ) ! bool MoveCursorRightBlock( bool expandSelection ) %endclass --- 625,666 ---- wxGridCellRenderer* GetDefaultRendererForType(const wxString& typeName) const void SetMargins(int extraWidth, int extraHeight) ! ! wxWindow* GetGridWindow() ! wxWindow* GetGridRowLabelWindow() ! wxWindow* GetGridColLabelWindow() ! wxWindow* GetGridCornerLabelWindow() ! ! //void SetScrollLineX(int x) ! //void SetScrollLineY(int y) ! //int GetScrollLineX() const ! //int GetScrollLineY() const ! //int GetScrollX(int x) const ! //int GetScrollY(int y) const ! ! %property=NumberRows, read ! %property=NumberCols, read ! ! %property=CellHighlightColour, read, write ! %property=CellHighlightPenWidth, read, write ! %property=CellHighlightROPenWidth, read, write ! ! %property=GridCursorRow, read ! %property=GridCursorCol, read ! %property=DefaultRowLabelSize, read ! %property=DefaultColLabelSize, read ! ! %property=DefaultEditor, read, write ! %property=ColLabelSize, read, write ! %property=RowLabelSize, read, write ! %property=LabelBackgroundColour, read, write ! %property=LabelTextColour, read, write ! %property=LabelFont, read, write ! %property=SelectionBackground, read, write ! %property=SelectionForeground, read, write ! ! %property=GridWindow, read ! %property=GridRowLabelWindow, read ! %property=GridColLabelWindow, read ! %property=GridCornerLabelWindow, read %endclass *************** *** 563,574 **** %define %event wxEVT_GRID_LABEL_LEFT_DCLICK %define %event wxEVT_GRID_LABEL_RIGHT_DCLICK - wxGridEvent(int id, wxEventType type, wxGrid* obj, int row = -1, int col = -1, int x = -1, int y = -1, bool sel = true, bool control = false, bool shift = false, bool alt = false, bool meta = false) virtual int GetRow() - %property=Row, read virtual int GetCol() - %property=Col, read wxPoint GetPosition() - %property=Position, read bool Selecting() bool ControlDown() --- 677,691 ---- %define %event wxEVT_GRID_LABEL_LEFT_DCLICK %define %event wxEVT_GRID_LABEL_RIGHT_DCLICK + %define %event wxEVT_GRID_CELL_CHANGE + %define %event wxEVT_GRID_SELECT_CELL + %define %event wxEVT_GRID_EDITOR_SHOWN + %define %event wxEVT_GRID_EDITOR_HIDDEN + %define %event wxEVT_GRID_CELL_BEGIN_DRAG + + wxGridEvent(int id, wxEventType type, wxObject* obj, int row = -1, int col = -1, int x = -1, int y = -1, bool sel = true, bool control = false, bool shift = false, bool alt = false, bool meta = false) virtual int GetRow() virtual int GetCol() wxPoint GetPosition() bool Selecting() bool ControlDown() *************** *** 576,579 **** --- 693,700 ---- bool ShiftDown() bool AltDown() + + %property=Col, read + %property=Position, read + %property=Row, read %endclass *************** *** 585,597 **** %define %event wxEVT_GRID_COL_SIZE ! wxGridSizeEvent(int id, wxEventType type, wxGrid* obj, int rowOrCol = -1, int x = -1, int y = -1, bool control = false, bool shift = false, bool alt = false, bool meta = false) int GetRowOrCol() - %property=RowOrCol, read wxPoint GetPosition() - %property=Position, read bool ShiftDown() bool ControlDown() bool AltDown() bool MetaDown() %endclass --- 706,720 ---- %define %event wxEVT_GRID_COL_SIZE ! wxGridSizeEvent(int id, wxEventType type, wxObject* obj, int rowOrCol = -1, int x = -1, int y = -1, bool control = false, bool shift = false, bool alt = false, bool meta = false) ! int GetRowOrCol() wxPoint GetPosition() bool ShiftDown() bool ControlDown() bool AltDown() bool MetaDown() + + %property=Position, read + %property=RowOrCol, read %endclass *************** *** 601,623 **** %class %delete wxGridRangeSelectEvent, wxNotifyEvent %define %event wxEVT_GRID_RANGE_SELECT - %define %event wxEVT_GRID_SELECT_CELL - %define %event wxEVT_GRID_CELL_CHANGE ! wxGridRangeSelectEvent(int id, wxEventType type, wxGrid* obj, const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight, bool sel = true, bool control = false, bool shift = false, bool alt = false, bool meta = false) ! int GetLeftCol() ! %property=LeftCol, read int GetTopRow() - %property=TopRow, read int GetBottomRow() ! %property=BottomRow, read int GetRightCol() - %property=RightCol, read bool Selecting() - bool ShiftDown() bool ControlDown() ! bool AltDown() bool MetaDown() ! // wxGridCellCoords GetTopLeftCoords() ! // wxGridCellCoords GetBottomRightCoords() %endclass --- 724,746 ---- %class %delete wxGridRangeSelectEvent, wxNotifyEvent %define %event wxEVT_GRID_RANGE_SELECT ! wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj, const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight, bool sel = true, bool control = false, bool shift = false, bool alt = false, bool meta = false) ! ! wxGridCellCoords GetTopLeftCoords() ! wxGridCellCoords GetBottomRightCoords() int GetTopRow() int GetBottomRow() ! int GetLeftCol() int GetRightCol() bool Selecting() bool ControlDown() ! bool ShiftDown() bool MetaDown() ! bool AltDown() ! ! %property=BottomRow, read ! %property=LeftCol, read ! %property=RightCol, read ! %property=TopRow, read %endclass *************** *** 628,644 **** %class %delete wxGridEditorCreatedEvent, wxCommandEvent %define %event wxEVT_GRID_EDITOR_CREATED - %define %event wxEVT_GRID_EDITOR_SHOWN - %define %event wxEVT_GRID_EDITOR_HIDDEN wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj, int row, int col, wxControl* ctrl) int GetRow() int GetCol() ! wxControl * GetControl() void SetRow(int row) - %property=Row, read, write void SetCol(int col) - %property=Col, read, write void SetControl(wxControl * ctrl) %property=Control, read, write %endclass %endif --- 751,767 ---- %class %delete wxGridEditorCreatedEvent, wxCommandEvent %define %event wxEVT_GRID_EDITOR_CREATED wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj, int row, int col, wxControl* ctrl) + int GetRow() int GetCol() ! wxControl* GetControl() void SetRow(int row) void SetCol(int col) void SetControl(wxControl * ctrl) + + %property=Col, read, write %property=Control, read, write + %property=Row, read, write %endclass %endif Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** defsutil.i 16 May 2006 04:55:32 -0000 1.21 --- defsutil.i 16 May 2006 22:47:09 -0000 1.22 *************** *** 567,570 **** %class %delete %noclassinfo %encapsulate wxBusyCursor // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough ! wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) %endclass --- 567,570 ---- %class %delete %noclassinfo %encapsulate wxBusyCursor // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough ! wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) %endclass |
|
From: John L. <jr...@us...> - 2006-05-16 22:47:14
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2550/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: add more classes for 2.6.3, wxMediaCtrl, wxURL, wxURI, update grid.i Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxstc_datatypes.lua 16 May 2006 04:55:32 -0000 1.23 --- wxstc_datatypes.lua 16 May 2006 22:47:09 -0000 1.24 *************** *** 1124,1127 **** --- 1124,1128 ---- }, wxGridCellAttr = { + BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid", DefType = "class", *************** *** 1136,1139 **** --- 1137,1141 ---- }, wxGridCellAttrProvider = { + BaseClass = "wxClientDataContainer", Condition = "wxLUA_USE_wxGrid", DefType = "class", *************** *** 1321,1324 **** --- 1323,1332 ---- Name = "wxGridTableMessage", }, + wxGridTableRequest = { + Condition = "wxLUA_USE_wxGrid", + DefType = "enum", + Intrinsic = true, + Name = "wxGridTableRequest", + }, wxHTTP = { BaseClass = "wxProtocol", *************** *** 1782,1785 **** --- 1790,1819 ---- Name = "wxMaximizeEvent", }, + wxMediaCtrl = { + BaseClass = "wxControl", + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "class", + Intrinsic = false, + Name = "wxMediaCtrl", + }, + wxMediaCtrlPlayerControls = { + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "enum", + Intrinsic = true, + Name = "wxMediaCtrlPlayerControls", + }, + wxMediaEvent = { + BaseClass = "wxNotifyEvent", + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "class", + Intrinsic = false, + Name = "wxMediaEvent", + }, + wxMediaState = { + Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", + DefType = "enum", + Intrinsic = true, + Name = "wxMediaState", + }, wxMemoryDC = { BaseClass = "wxDC", *************** *** 2837,2840 **** --- 2871,2912 ---- Name = "wxTreeItemIdValue", }, + wxURI = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxSocket", + DefType = "class", + Intrinsic = false, + Name = "wxURI", + }, + wxURIFieldType = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURIFieldType", + }, + wxURIFlags = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURIFlags", + }, + wxURIHostType = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURIHostType", + }, + wxURL = { + BaseClass = "wxURI", + Condition = "wxLUA_USE_wxSocket", + DefType = "class", + Intrinsic = false, + Name = "wxURL", + }, + wxURLError = { + Condition = "wxLUA_USE_wxSocket", + DefType = "enum", + Intrinsic = true, + Name = "wxURLError", + }, wxUint16 = { DefType = "wxtypedef", *************** *** 3164,3167 **** --- 3236,3240 ---- wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout", wxLUA_USE_wxMask = "wxLUA_USE_wxMask", + wxLUA_USE_wxMediaCtrl = "wxLUA_USE_wxMediaCtrl", wxLUA_USE_wxMenu = "wxLUA_USE_wxMenu", wxLUA_USE_wxMessageDialog = "wxLUA_USE_wxMessageDialog", *************** *** 3293,3296 **** --- 3366,3370 ---- wxUSE_MDI = "wxUSE_MDI", wxUSE_MDI_ARCHITECTURE = "wxUSE_MDI_ARCHITECTURE", + wxUSE_MEDIACTRL = "wxUSE_MEDIACTRL", wxUSE_MEMORY_TRACING = "wxUSE_MEMORY_TRACING", wxUSE_MENUS = "wxUSE_MENUS", |
|
From: John L. <jr...@us...> - 2006-05-16 22:47:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2550/wxLua/modules/wxbind/src Modified Files: defsutil.cpp grid.cpp socket.cpp wave.cpp wx_bind.cpp Log Message: add more classes for 2.6.3, wxMediaCtrl, wxURL, wxURI, update grid.i Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** grid.cpp 6 May 2006 19:54:31 -0000 1.13 --- grid.cpp 16 May 2006 22:47:09 -0000 1.14 *************** *** 1177,1224 **** ! #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)) && (wxLUA_USE_wxGrid) ! // %wxchkver23 void SetKind(wxGridCellAttr::wxAttrKind kind) ! static int LUACALL wxLua_wxGridCellAttr_SetKind(lua_State *L) ! { ! wxLuaState wxlState(L); ! // wxGridCellAttr::wxAttrKind kind ! wxGridCellAttr::wxAttrKind kind = (wxGridCellAttr::wxAttrKind)wxlState.GetEnumerationType(2); ! // get this [...3873 lines suppressed...] { LuaGetProp, "Col", wxLua_wxGridEditorCreatedEvent_GetCol, 0, 0, {0} }, { LuaSetProp, "Col", wxLua_wxGridEditorCreatedEvent_SetCol, 1, 1, {0} }, - { LuaMethod, "SetControl", wxLua_wxGridEditorCreatedEvent_SetControl, 1, 1, { &s_wxluatag_wxControl, 0 } }, { LuaGetProp, "Control", wxLua_wxGridEditorCreatedEvent_GetControl, 0, 0, {0} }, { LuaSetProp, "Control", wxLua_wxGridEditorCreatedEvent_SetControl, 1, 1, {0} }, { LuaDelete, "wxGridEditorCreatedEvent", wxLua_wxGridEditorCreatedEvent_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxGridEditorCreatedEvent_Delete, 0, 0, {0} }, --- 7281,7292 ---- { LuaMethod, "GetControl", wxLua_wxGridEditorCreatedEvent_GetControl, 0, 0, { 0 } }, { LuaMethod, "SetRow", wxLua_wxGridEditorCreatedEvent_SetRow, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetCol", wxLua_wxGridEditorCreatedEvent_SetCol, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "SetControl", wxLua_wxGridEditorCreatedEvent_SetControl, 1, 1, { &s_wxluatag_wxControl, 0 } }, { LuaGetProp, "Col", wxLua_wxGridEditorCreatedEvent_GetCol, 0, 0, {0} }, { LuaSetProp, "Col", wxLua_wxGridEditorCreatedEvent_SetCol, 1, 1, {0} }, { LuaGetProp, "Control", wxLua_wxGridEditorCreatedEvent_GetControl, 0, 0, {0} }, { LuaSetProp, "Control", wxLua_wxGridEditorCreatedEvent_SetControl, 1, 1, {0} }, + { LuaGetProp, "Row", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, {0} }, + { LuaSetProp, "Row", wxLua_wxGridEditorCreatedEvent_SetRow, 1, 1, {0} }, { LuaDelete, "wxGridEditorCreatedEvent", wxLua_wxGridEditorCreatedEvent_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxGridEditorCreatedEvent_Delete, 0, 0, {0} }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wx_bind.cpp 16 May 2006 04:55:33 -0000 1.38 --- wx_bind.cpp 16 May 2006 22:47:09 -0000 1.39 *************** *** 92,97 **** #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid) { &wxEVT_GRID_EDITOR_CREATED, "wxEVT_GRID_EDITOR_CREATED", &s_wxluatag_wxGridEditorCreatedEvent }, - { &wxEVT_GRID_EDITOR_HIDDEN, "wxEVT_GRID_EDITOR_HIDDEN", &s_wxluatag_wxGridEditorCreatedEvent }, - { &wxEVT_GRID_EDITOR_SHOWN, "wxEVT_GRID_EDITOR_SHOWN", &s_wxluatag_wxGridEditorCreatedEvent }, #endif --- 92,95 ---- *************** *** 112,115 **** --- 110,120 ---- #endif + + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + { &wxEVT_MEDIA_FINISHED, "wxEVT_MEDIA_FINISHED", &s_wxluatag_wxMediaEvent }, + { &wxEVT_MEDIA_LOADED, "wxEVT_MEDIA_LOADED", &s_wxluatag_wxMediaEvent }, + { &wxEVT_MEDIA_STOP, "wxEVT_MEDIA_STOP", &s_wxluatag_wxMediaEvent }, + #endif + { &wxEVT_ACTIVATE, "wxEVT_ACTIVATE", &s_wxluatag_wxActivateEvent }, { &wxEVT_ACTIVATE_APP, "wxEVT_ACTIVATE_APP", &s_wxluatag_wxActivateEvent }, *************** *** 255,259 **** #if wxLUA_USE_wxGrid ! { &wxEVT_GRID_CELL_CHANGE, "wxEVT_GRID_CELL_CHANGE", &s_wxluatag_wxGridRangeSelectEvent }, { &wxEVT_GRID_CELL_LEFT_CLICK, "wxEVT_GRID_CELL_LEFT_CLICK", &s_wxluatag_wxGridEvent }, { &wxEVT_GRID_CELL_LEFT_DCLICK, "wxEVT_GRID_CELL_LEFT_DCLICK", &s_wxluatag_wxGridEvent }, --- 260,265 ---- #if wxLUA_USE_wxGrid ! { &wxEVT_GRID_CELL_BEGIN_DRAG, "wxEVT_GRID_CELL_BEGIN_DRAG", &s_wxluatag_wxGridEvent }, ! { &wxEVT_GRID_CELL_CHANGE, "wxEVT_GRID_CELL_CHANGE", &s_wxluatag_wxGridEvent }, { &wxEVT_GRID_CELL_LEFT_CLICK, "wxEVT_GRID_CELL_LEFT_CLICK", &s_wxluatag_wxGridEvent }, { &wxEVT_GRID_CELL_LEFT_DCLICK, "wxEVT_GRID_CELL_LEFT_DCLICK", &s_wxluatag_wxGridEvent }, *************** *** 261,264 **** --- 267,272 ---- { &wxEVT_GRID_CELL_RIGHT_DCLICK, "wxEVT_GRID_CELL_RIGHT_DCLICK", &s_wxluatag_wxGridEvent }, { &wxEVT_GRID_COL_SIZE, "wxEVT_GRID_COL_SIZE", &s_wxluatag_wxGridSizeEvent }, + { &wxEVT_GRID_EDITOR_HIDDEN, "wxEVT_GRID_EDITOR_HIDDEN", &s_wxluatag_wxGridEvent }, + { &wxEVT_GRID_EDITOR_SHOWN, "wxEVT_GRID_EDITOR_SHOWN", &s_wxluatag_wxGridEvent }, { &wxEVT_GRID_LABEL_LEFT_CLICK, "wxEVT_GRID_LABEL_LEFT_CLICK", &s_wxluatag_wxGridEvent }, { &wxEVT_GRID_LABEL_LEFT_DCLICK, "wxEVT_GRID_LABEL_LEFT_DCLICK", &s_wxluatag_wxGridEvent }, *************** *** 267,271 **** { &wxEVT_GRID_RANGE_SELECT, "wxEVT_GRID_RANGE_SELECT", &s_wxluatag_wxGridRangeSelectEvent }, { &wxEVT_GRID_ROW_SIZE, "wxEVT_GRID_ROW_SIZE", &s_wxluatag_wxGridSizeEvent }, ! { &wxEVT_GRID_SELECT_CELL, "wxEVT_GRID_SELECT_CELL", &s_wxluatag_wxGridRangeSelectEvent }, #endif --- 275,279 ---- { &wxEVT_GRID_RANGE_SELECT, "wxEVT_GRID_RANGE_SELECT", &s_wxluatag_wxGridRangeSelectEvent }, { &wxEVT_GRID_ROW_SIZE, "wxEVT_GRID_ROW_SIZE", &s_wxluatag_wxGridSizeEvent }, ! { &wxEVT_GRID_SELECT_CELL, "wxEVT_GRID_SELECT_CELL", &s_wxluatag_wxGridEvent }, #endif *************** *** 566,569 **** --- 574,584 ---- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + { "wxMEDIA_FINISHED_ID", wxMEDIA_FINISHED_ID }, + { "wxMEDIA_LOADED_ID", wxMEDIA_LOADED_ID }, + { "wxMEDIA_STOP_ID", wxMEDIA_STOP_ID }, + #endif + + #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) { "wxTINY_CAPTION_HORIZ", wxTINY_CAPTION_HORIZ }, *************** *** 1001,1012 **** { "WXGRID_MIN_COL_WIDTH", WXGRID_MIN_COL_WIDTH }, { "WXGRID_MIN_ROW_HEIGHT", WXGRID_MIN_ROW_HEIGHT }, - { "wxGRIDTABLE_NOTIFY_COLS_APPENDED", wxGRIDTABLE_NOTIFY_COLS_APPENDED }, - { "wxGRIDTABLE_NOTIFY_COLS_DELETED", wxGRIDTABLE_NOTIFY_COLS_DELETED }, - { "wxGRIDTABLE_NOTIFY_COLS_INSERTED", wxGRIDTABLE_NOTIFY_COLS_INSERTED }, - { "wxGRIDTABLE_NOTIFY_ROWS_APPENDED", wxGRIDTABLE_NOTIFY_ROWS_APPENDED }, - { "wxGRIDTABLE_NOTIFY_ROWS_DELETED", wxGRIDTABLE_NOTIFY_ROWS_DELETED }, - { "wxGRIDTABLE_NOTIFY_ROWS_INSERTED", wxGRIDTABLE_NOTIFY_ROWS_INSERTED }, - { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, - { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, #endif --- 1016,1019 ---- *************** *** 1539,1542 **** --- 1546,1560 ---- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + { "wxMEDIACTRLPLAYERCONTROLS_DEFAULT", wxMEDIACTRLPLAYERCONTROLS_DEFAULT }, + { "wxMEDIACTRLPLAYERCONTROLS_NONE", wxMEDIACTRLPLAYERCONTROLS_NONE }, + { "wxMEDIACTRLPLAYERCONTROLS_STEP", wxMEDIACTRLPLAYERCONTROLS_STEP }, + { "wxMEDIACTRLPLAYERCONTROLS_VOLUME", wxMEDIACTRLPLAYERCONTROLS_VOLUME }, + { "wxMEDIASTATE_PAUSED", wxMEDIASTATE_PAUSED }, + { "wxMEDIASTATE_PLAYING", wxMEDIASTATE_PLAYING }, + { "wxMEDIASTATE_STOPPED", wxMEDIASTATE_STOPPED }, + #endif + + #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) { "wxPNG_TYPE_COLOUR", wxPNG_TYPE_COLOUR }, *************** *** 2218,2221 **** --- 2236,2247 ---- { "Merged", wxGridCellAttr::Merged }, { "Row", wxGridCellAttr::Row }, + { "wxGRIDTABLE_NOTIFY_COLS_APPENDED", wxGRIDTABLE_NOTIFY_COLS_APPENDED }, + { "wxGRIDTABLE_NOTIFY_COLS_DELETED", wxGRIDTABLE_NOTIFY_COLS_DELETED }, + { "wxGRIDTABLE_NOTIFY_COLS_INSERTED", wxGRIDTABLE_NOTIFY_COLS_INSERTED }, + { "wxGRIDTABLE_NOTIFY_ROWS_APPENDED", wxGRIDTABLE_NOTIFY_ROWS_APPENDED }, + { "wxGRIDTABLE_NOTIFY_ROWS_DELETED", wxGRIDTABLE_NOTIFY_ROWS_DELETED }, + { "wxGRIDTABLE_NOTIFY_ROWS_INSERTED", wxGRIDTABLE_NOTIFY_ROWS_INSERTED }, + { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, + { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, { "wxGridSelectCells", wxGrid::wxGridSelectCells }, { "wxGridSelectColumns", wxGrid::wxGridSelectColumns }, *************** *** 2460,2463 **** --- 2486,2508 ---- { "wxSOCKET_WAITALL", wxSOCKET_WAITALL }, { "wxSOCKET_WOULDBLOCK", wxSOCKET_WOULDBLOCK }, + { "wxURI_FRAGMENT", wxURI_FRAGMENT }, + { "wxURI_IPV4ADDRESS", wxURI_IPV4ADDRESS }, + { "wxURI_IPV6ADDRESS", wxURI_IPV6ADDRESS }, + { "wxURI_IPVFUTURE", wxURI_IPVFUTURE }, + { "wxURI_PATH", wxURI_PATH }, + { "wxURI_PORT", wxURI_PORT }, + { "wxURI_QUERY", wxURI_QUERY }, + { "wxURI_REGNAME", wxURI_REGNAME }, + { "wxURI_SCHEME", wxURI_SCHEME }, + { "wxURI_SERVER", wxURI_SERVER }, + { "wxURI_STRICT", wxURI_STRICT }, + { "wxURI_USERINFO", wxURI_USERINFO }, + { "wxURL_CONNERR", wxURL_CONNERR }, + { "wxURL_NOERR", wxURL_NOERR }, + { "wxURL_NOHOST", wxURL_NOHOST }, + { "wxURL_NOPATH", wxURL_NOPATH }, + { "wxURL_NOPROTO", wxURL_NOPROTO }, + { "wxURL_PROTOERR", wxURL_PROTOERR }, + { "wxURL_SNTXERR", wxURL_SNTXERR }, #endif *************** *** 2624,2627 **** --- 2669,2680 ---- // -------------------------------------------------------------------- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + { "wxMEDIABACKEND_DIRECTSHOW", wxMEDIABACKEND_DIRECTSHOW }, + { "wxMEDIABACKEND_GSTREAMER", wxMEDIABACKEND_GSTREAMER }, + { "wxMEDIABACKEND_MCI", wxMEDIABACKEND_MCI }, + { "wxMEDIABACKEND_QUICKTIME", wxMEDIABACKEND_QUICKTIME }, + #endif + + #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) { "wxIMAGE_OPTION_BITSPERSAMPLE", _T("BitsPerSample") }, *************** *** 5224,5227 **** --- 5277,5285 ---- + #if wxLUA_USE_wxGrid + wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellCoords) + #endif + + #if wxLUA_USE_wxListCtrl wxLUA_IMPLEMENT_ENCAPSULATION(wxListItemAttr) *************** *** 5371,5374 **** --- 5429,5438 ---- + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + { "wxMediaCtrl", wxMediaCtrl_methods, wxMediaCtrl_methodCount, -1, CLASSINFO(wxMediaCtrl), &s_wxluatag_wxMediaCtrl, "wxControl" }, + { "wxMediaEvent", wxMediaEvent_methods, wxMediaEvent_methodCount, -1, CLASSINFO(wxMediaEvent), &s_wxluatag_wxMediaEvent, "wxNotifyEvent" }, + #endif + + #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) { "wxMiniFrame", wxMiniFrame_methods, wxMiniFrame_methodCount, -1, CLASSINFO(wxMiniFrame), &s_wxluatag_wxMiniFrame, "wxFrame" }, *************** *** 5767,5772 **** #if wxLUA_USE_wxGrid { "wxGrid", wxGrid_methods, wxGrid_methodCount, -1, CLASSINFO(wxGrid), &s_wxluatag_wxGrid, "wxScrolledWindow" }, ! { "wxGridCellAttr", wxGridCellAttr_methods, wxGridCellAttr_methodCount, -1, NULL, &s_wxluatag_wxGridCellAttr, NULL }, ! { "wxGridCellAttrProvider", wxGridCellAttrProvider_methods, wxGridCellAttrProvider_methodCount, -1, NULL, &s_wxluatag_wxGridCellAttrProvider, NULL }, { "wxGridCellAutoWrapStringEditor", wxGridCellAutoWrapStringEditor_methods, wxGridCellAutoWrapStringEditor_methodCount, -1, NULL, &s_wxluatag_wxGridCellAutoWrapStringEditor, "wxGridCellTextEditor" }, { "wxGridCellAutoWrapStringRenderer", wxGridCellAutoWrapStringRenderer_methods, wxGridCellAutoWrapStringRenderer_methodCount, -1, NULL, &s_wxluatag_wxGridCellAutoWrapStringRenderer, "wxGridCellStringRenderer" }, --- 5831,5836 ---- #if wxLUA_USE_wxGrid { "wxGrid", wxGrid_methods, wxGrid_methodCount, -1, CLASSINFO(wxGrid), &s_wxluatag_wxGrid, "wxScrolledWindow" }, ! { "wxGridCellAttr", wxGridCellAttr_methods, wxGridCellAttr_methodCount, -1, NULL, &s_wxluatag_wxGridCellAttr, "wxClientDataContainer" }, ! { "wxGridCellAttrProvider", wxGridCellAttrProvider_methods, wxGridCellAttrProvider_methodCount, -1, NULL, &s_wxluatag_wxGridCellAttrProvider, "wxClientDataContainer" }, { "wxGridCellAutoWrapStringEditor", wxGridCellAutoWrapStringEditor_methods, wxGridCellAutoWrapStringEditor_methodCount, -1, NULL, &s_wxluatag_wxGridCellAutoWrapStringEditor, "wxGridCellTextEditor" }, { "wxGridCellAutoWrapStringRenderer", wxGridCellAutoWrapStringRenderer_methods, wxGridCellAutoWrapStringRenderer_methodCount, -1, NULL, &s_wxluatag_wxGridCellAutoWrapStringRenderer, "wxGridCellStringRenderer" }, *************** *** 6022,6025 **** --- 6086,6091 ---- { "wxSocketEvent", wxSocketEvent_methods, wxSocketEvent_methodCount, -1, CLASSINFO(wxSocketEvent), &s_wxluatag_wxSocketEvent, "wxEvent" }, { "wxSocketServer", wxSocketServer_methods, wxSocketServer_methodCount, -1, CLASSINFO(wxSocketServer), &s_wxluatag_wxSocketServer, "wxSocketBase" }, + { "wxURI", wxURI_methods, wxURI_methodCount, -1, CLASSINFO(wxURI), &s_wxluatag_wxURI, "wxObject" }, + { "wxURL", wxURL_methods, wxURL_methodCount, -1, CLASSINFO(wxURL), &s_wxluatag_wxURL, "wxURI" }, #endif Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** socket.cpp 13 May 2006 17:20:52 -0000 1.14 --- socket.cpp 16 May 2006 22:47:09 -0000 1.15 *************** *** 2018,2019 **** --- 2018,2669 ---- #endif + + #if wxLUA_USE_wxSocket + // ------------------------------------------------------------------------------------------------- + // Bind class wxURI + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxURI = -1; + + // wxURI(const wxString& uri) + static int LUACALL wxLua_wxURI_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxURI *returns; + // const wxString uri + const wxString uri = lua2wx(wxlState.GetStringType(1)); + // call constructor + returns = new wxURI(uri); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxURI, returns); + + return 1; + } + + // %constructor wxURICopy(const wxURI& uri) + static int LUACALL wxLua_wxURICopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxURI *returns; + // const wxURI uri + const wxURI * uri = (const wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call constructor + returns = new wxURI(*uri); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxURI, returns); + + return 1; + } + + // wxString Create(const wxString& uri) + static int LUACALL wxLua_wxURI_Create(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // const wxString uri + const wxString uri = lua2wx(wxlState.GetStringType(2)); + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call Create + returns = self->Create(uri); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // bool HasScheme() const + static int LUACALL wxLua_wxURI_HasScheme(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasScheme + returns = self->HasScheme(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool HasUserInfo() const + static int LUACALL wxLua_wxURI_HasUserInfo(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasUserInfo + returns = self->HasUserInfo(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool HasServer() const + static int LUACALL wxLua_wxURI_HasServer(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasServer + returns = self->HasServer(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool HasPort() const + static int LUACALL wxLua_wxURI_HasPort(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasPort + returns = self->HasPort(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool HasPath() const + static int LUACALL wxLua_wxURI_HasPath(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasPath + returns = self->HasPath(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool HasQuery() const + static int LUACALL wxLua_wxURI_HasQuery(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasQuery + returns = self->HasQuery(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool HasFragment() const + static int LUACALL wxLua_wxURI_HasFragment(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call HasFragment + returns = self->HasFragment(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // wxString GetScheme() const + static int LUACALL wxLua_wxURI_GetScheme(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetScheme + returns = self->GetScheme(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetPath() const + static int LUACALL wxLua_wxURI_GetPath(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetPath + returns = self->GetPath(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetQuery() const + static int LUACALL wxLua_wxURI_GetQuery(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetQuery + returns = self->GetQuery(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetFragment() const + static int LUACALL wxLua_wxURI_GetFragment(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetFragment + returns = self->GetFragment(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetPort() const + static int LUACALL wxLua_wxURI_GetPort(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetPort + returns = self->GetPort(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetUserInfo() const + static int LUACALL wxLua_wxURI_GetUserInfo(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetUserInfo + returns = self->GetUserInfo(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetServer() const + static int LUACALL wxLua_wxURI_GetServer(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetServer + returns = self->GetServer(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxURIHostType GetHostType() const + static int LUACALL wxLua_wxURI_GetHostType(lua_State *L) + { + wxLuaState wxlState(L); + wxURIHostType returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetHostType + returns = self->GetHostType(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxString GetUser() const + static int LUACALL wxLua_wxURI_GetUser(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetUser + returns = self->GetUser(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetPassword() const + static int LUACALL wxLua_wxURI_GetPassword(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call GetPassword + returns = self->GetPassword(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString BuildURI() const + static int LUACALL wxLua_wxURI_BuildURI(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call BuildURI + returns = self->BuildURI(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString BuildUnescapedURI() const + static int LUACALL wxLua_wxURI_BuildUnescapedURI(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call BuildUnescapedURI + returns = self->BuildUnescapedURI(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // void Resolve(const wxURI& base, int flags = wxURI_STRICT) + static int LUACALL wxLua_wxURI_Resolve(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxURI_STRICT + int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxURI_STRICT); + // const wxURI base + const wxURI * base = (const wxURI *)wxlState.GetUserDataType(2, s_wxluatag_wxURI); + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call Resolve + self->Resolve(*base, flags); + + return 0; + } + + // bool IsReference() const + static int LUACALL wxLua_wxURI_IsReference(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call IsReference + returns = self->IsReference(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // static wxString Unescape (const wxString& szEscapedURI) + static int LUACALL wxLua_wxURI_Unescape(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // const wxString szEscapedURI + const wxString szEscapedURI = lua2wx(wxlState.GetStringType(2)); + // call Unescape + returns = wxURI::Unescape(szEscapedURI); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // %operator wxURI& operator = (const wxURI& uri); + static int LUACALL wxLua_wxURI_op_assign(lua_State *L) + { + wxLuaState wxlState(L); + wxURI *returns; + // const wxURI uri + const wxURI * uri = (const wxURI *)wxlState.GetUserDataType(2, s_wxluatag_wxURI); + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call op_assign + returns = self; + *returns = ((*self)=(*uri)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxURI, returns); + + return 1; + } + + // %operator bool operator == (const wxURI& uri) const + static int LUACALL wxLua_wxURI_op_eq(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxURI uri + const wxURI * uri = (const wxURI *)wxlState.GetUserDataType(2, s_wxluatag_wxURI); + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call op_eq + returns = (*self)==(*uri); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxURI_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxURI_methods[] = { + { LuaConstructor, "wxURI", wxLua_wxURI_constructor, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaConstructor, "wxURICopy", wxLua_wxURICopy_constructor, 1, 1, { &s_wxluatag_wxURI, 0 } }, + { LuaMethod, "Create", wxLua_wxURI_Create, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "HasScheme", wxLua_wxURI_HasScheme, 0, 0, { 0 } }, + { LuaMethod, "HasUserInfo", wxLua_wxURI_HasUserInfo, 0, 0, { 0 } }, + { LuaMethod, "HasServer", wxLua_wxURI_HasServer, 0, 0, { 0 } }, + { LuaMethod, "HasPort", wxLua_wxURI_HasPort, 0, 0, { 0 } }, + { LuaMethod, "HasPath", wxLua_wxURI_HasPath, 0, 0, { 0 } }, + { LuaMethod, "HasQuery", wxLua_wxURI_HasQuery, 0, 0, { 0 } }, + { LuaMethod, "HasFragment", wxLua_wxURI_HasFragment, 0, 0, { 0 } }, + { LuaMethod, "GetScheme", wxLua_wxURI_GetScheme, 0, 0, { 0 } }, + { LuaMethod, "GetPath", wxLua_wxURI_GetPath, 0, 0, { 0 } }, + { LuaMethod, "GetQuery", wxLua_wxURI_GetQuery, 0, 0, { 0 } }, + { LuaMethod, "GetFragment", wxLua_wxURI_GetFragment, 0, 0, { 0 } }, + { LuaMethod, "GetPort", wxLua_wxURI_GetPort, 0, 0, { 0 } }, + { LuaMethod, "GetUserInfo", wxLua_wxURI_GetUserInfo, 0, 0, { 0 } }, + { LuaMethod, "GetServer", wxLua_wxURI_GetServer, 0, 0, { 0 } }, + { LuaMethod, "GetHostType", wxLua_wxURI_GetHostType, 0, 0, { 0 } }, + { LuaMethod, "GetUser", wxLua_wxURI_GetUser, 0, 0, { 0 } }, + { LuaMethod, "GetPassword", wxLua_wxURI_GetPassword, 0, 0, { 0 } }, + { LuaMethod, "BuildURI", wxLua_wxURI_BuildURI, 0, 0, { 0 } }, + { LuaMethod, "BuildUnescapedURI", wxLua_wxURI_BuildUnescapedURI, 0, 0, { 0 } }, + { LuaMethod, "Resolve", wxLua_wxURI_Resolve, 2, 1, { &s_wxluatag_wxURI, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "IsReference", wxLua_wxURI_IsReference, 0, 0, { 0 } }, + { LuaMethod, "Unescape", wxLua_wxURI_Unescape, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "op_assign", wxLua_wxURI_op_assign, 1, 1, { &s_wxluatag_wxURI, 0 } }, + { LuaMethod, "op_eq", wxLua_wxURI_op_eq, 1, 1, { &s_wxluatag_wxURI, 0 } }, + { LuaDelete, "wxURI", wxLua_wxURI_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxURI_methods = s_wxURI_methods; + int wxURI_methodCount = sizeof(s_wxURI_methods)/sizeof(s_wxURI_methods[0]); + #endif + + + #if wxLUA_USE_wxSocket + // ------------------------------------------------------------------------------------------------- + // Bind class wxURL + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxURL = -1; + + + #if (wxLUA_USE_wxSocket) && (wxUSE_STREAMS) + // wxInputStream *GetInputStream() + static int LUACALL wxLua_wxURL_GetInputStream(lua_State *L) + { + wxLuaState wxlState(L); + wxInputStream *returns; + // get this + wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); + // call GetInputStream + returns = self->GetInputStream(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); + + return 1; + } + + #endif + + + #if (wxUSE_PROTOCOL_HTTP) && (wxLUA_USE_wxSocket) + // static void SetDefaultProxy(const wxString& url_proxy) + static int LUACALL wxLua_wxURL_SetDefaultProxy(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString url_proxy + const wxString url_proxy = lua2wx(wxlState.GetStringType(2)); + // call SetDefaultProxy + wxURL::SetDefaultProxy(url_proxy); + + return 0; + } + + // void SetProxy(const wxString& url_proxy) + static int LUACALL wxLua_wxURL_SetProxy(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString url_proxy + const wxString url_proxy = lua2wx(wxlState.GetStringType(2)); + // get this + wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); + // call SetProxy + self->SetProxy(url_proxy); + + return 0; + } + + #endif + + // wxURL(const wxString& sUrl) + static int LUACALL wxLua_wxURL_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxURL *returns; + // const wxString sUrl + const wxString sUrl = lua2wx(wxlState.GetStringType(1)); + // call constructor + returns = new wxURL(sUrl); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxURL, returns); + + return 1; + } + + // %constructor wxURLFromURI(const wxURI& url) + static int LUACALL wxLua_wxURLFromURI_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxURL *returns; + // const wxURI url + const wxURI * url = (const wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call constructor + returns = new wxURL(*url); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxURL, returns); + + return 1; + } + + // wxProtocol& GetProtocol() + static int LUACALL wxLua_wxURL_GetProtocol(lua_State *L) + { + wxLuaState wxlState(L); + wxProtocol *returns; + // get this + wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); + // call GetProtocol + returns = &self->GetProtocol(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxProtocol, returns); + + return 1; + } + + // wxURLError GetError() const + static int LUACALL wxLua_wxURL_GetError(lua_State *L) + { + wxLuaState wxlState(L); + wxURLError returns; + // get this + wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); + // call GetError + returns = self->GetError(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxString GetURL() const + static int LUACALL wxLua_wxURL_GetURL(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL); + // call GetURL + returns = self->GetURL(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + static int LUACALL wxLua_wxURL_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxURL_methods[] = { + + #if (wxLUA_USE_wxSocket) && (wxUSE_STREAMS) + { LuaMethod, "GetInputStream", wxLua_wxURL_GetInputStream, 0, 0, { 0 } }, + #endif + + + #if (wxUSE_PROTOCOL_HTTP) && (wxLUA_USE_wxSocket) + { LuaMethod, "SetDefaultProxy", wxLua_wxURL_SetDefaultProxy, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetProxy", wxLua_wxURL_SetProxy, 1, 1, { &s_wxluaarg_String, 0 } }, + #endif + + { LuaConstructor, "wxURL", wxLua_wxURL_constructor, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaConstructor, "wxURLFromURI", wxLua_wxURLFromURI_constructor, 1, 1, { &s_wxluatag_wxURI, 0 } }, + { LuaMethod, "GetProtocol", wxLua_wxURL_GetProtocol, 0, 0, { 0 } }, + { LuaMethod, "GetError", wxLua_wxURL_GetError, 0, 0, { 0 } }, + { LuaMethod, "GetURL", wxLua_wxURL_GetURL, 0, 0, { 0 } }, + { LuaDelete, "wxURL", wxLua_wxURL_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxURL_methods = s_wxURL_methods; + int wxURL_methodCount = sizeof(s_wxURL_methods)/sizeof(s_wxURL_methods[0]); + #endif + Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** defsutil.cpp 16 May 2006 04:55:33 -0000 1.14 --- defsutil.cpp 16 May 2006 22:47:09 -0000 1.15 *************** *** 727,731 **** #if wxLUA_USE_wxCursor ! // wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { --- 727,732 ---- #if wxLUA_USE_wxCursor ! // %override wxLua_wxBusyCursor_constructor ! // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { *************** *** 735,739 **** int argCount = lua_gettop(L); // const wxCursor cursor = wxHOURGLASS_CURSOR ! const wxCursor * cursor = (argCount >= 1 ? (const wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor) : wxHOURGLASS_CURSOR); // call constructor returns = new wxBusyCursor(cursor); --- 736,742 ---- int argCount = lua_gettop(L); // const wxCursor cursor = wxHOURGLASS_CURSOR ! ! // NOTE: gcc complains that wxHOURGLASS_CURSOR is const, if changed to const MSVC complains wxBusyCursor takes non const ! wxCursor * cursor = (argCount >= 1 ? (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor) : (wxCursor*)wxHOURGLASS_CURSOR); // call constructor returns = new wxBusyCursor(cursor); Index: wave.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wave.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wave.cpp 13 May 2006 17:20:52 -0000 1.12 --- wave.cpp 16 May 2006 22:47:09 -0000 1.13 *************** *** 406,407 **** --- 406,824 ---- #endif + + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + // ------------------------------------------------------------------------------------------------- + // Bind class wxMediaCtrl + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxMediaCtrl = -1; + + + #if (((wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) + // wxMediaCtrl( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) + static int LUACALL wxLua_wxMediaCtrl_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMediaCtrl *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxMediaCtrl" + const wxString name = (argCount >= 9 ? lua2wx(wxlState.GetStringType(9)) : wxString(wxT("wxMediaCtrl"))); + // const wxValidator val = wxDefaultValidator + const wxValidator * val = (argCount >= 8 ? (const wxValidator *)wxlState.GetUserDataType(8, s_wxluatag_wxValidator) : &wxDefaultValidator); + // const wxString szBackend = "" + const wxString szBackend = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxEmptyString)); + // long style = 0 + long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString fileName = "" + const wxString fileName = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); + // wxWindowID winid + wxWindowID winid = (wxWindowID)wxlState.GetNumberType(2); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxMediaCtrl(parent, winid, fileName, *pos, *size, style, szBackend, *val, name); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxMediaCtrl, returns); + + return 1; + } + + // bool Create( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) + static int LUACALL wxLua_wxMediaCtrl_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxMediaCtrl" + const wxString name = (argCount >= 10 ? lua2wx(wxlState.GetStringType(10)) : wxString(wxT("wxMediaCtrl"))); + // const wxValidator val = wxDefaultValidator + const wxValidator * val = (argCount >= 9 ? (const wxValidator *)wxlState.GetUserDataType(9, s_wxluatag_wxValidator) : &wxDefaultValidator); + // const wxString szBackend = "" + const wxString szBackend = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxEmptyString)); + // long style = 0 + long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString fileName = "" + const wxString fileName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(4)) : wxString(wxEmptyString)); + // wxWindowID winid + wxWindowID winid = (wxWindowID)wxlState.GetNumberType(3); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Create + returns = self->Create(parent, winid, fileName, *pos, *size, style, szBackend, *val, name); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif + + + #if (wxLUA_USE_wxFile) && ((wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)) + // wxFileOffset Seek(wxFileOffset where, wxSeekMode mode) + static int LUACALL wxLua_wxMediaCtrl_Seek(lua_State *L) + { + wxLuaState wxlState(L); + wxFileOffset returns; + // wxSeekMode mode + wxSeekMode mode = (wxSeekMode)wxlState.GetEnumerationType(3); + // wxFileOffset where + wxFileOffset where = (wxFileOffset)wxlState.GetNumberType(2); + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Seek + returns = self->Seek(where, mode); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif + + // %constructor wxMediaCtrlDefault() + static int LUACALL wxLua_wxMediaCtrlDefault_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMediaCtrl *returns; + // call constructor + returns = new wxMediaCtrl(); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxMediaCtrl, returns); + + return 1; + } + + // wxFileOffset GetDownloadProgress() + static int LUACALL wxLua_wxMediaCtrl_GetDownloadProgress(lua_State *L) + { + wxLuaState wxlState(L); + wxFileOffset returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call GetDownloadProgress + returns = self->GetDownloadProgress(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxFileOffset GetDownloadTotal() + static int LUACALL wxLua_wxMediaCtrl_GetDownloadTotal(lua_State *L) + { + wxLuaState wxlState(L); + wxFileOffset returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call GetDownloadTotal + returns = self->GetDownloadTotal(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxMediaState GetState() + static int LUACALL wxLua_wxMediaCtrl_GetState(lua_State *L) + { + wxLuaState wxlState(L); + wxMediaState returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call GetState + returns = self->GetState(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // bool Load(const wxString& fileName) + static int LUACALL wxLua_wxMediaCtrl_Load(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxString fileName + const wxString fileName = lua2wx(wxlState.GetStringType(2)); + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Load + returns = self->Load(fileName); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool Pause() + static int LUACALL wxLua_wxMediaCtrl_Pause(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Pause + returns = self->Pause(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool Play() + static int LUACALL wxLua_wxMediaCtrl_Play(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Play + returns = self->Play(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool Stop() + static int LUACALL wxLua_wxMediaCtrl_Stop(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Stop + returns = self->Stop(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool SetVolume(double dVolume) + static int LUACALL wxLua_wxMediaCtrl_SetVolume(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // double dVolume + double dVolume = (double)wxlState.GetNumberType(2); + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call SetVolume + returns = self->SetVolume(dVolume); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // double GetVolume() + static int LUACALL wxLua_wxMediaCtrl_GetVolume(lua_State *L) + { + wxLuaState wxlState(L); + double returns; + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call GetVolume + returns = self->GetVolume(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) + static int LUACALL wxLua_wxMediaCtrl_ShowPlayerControls(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxMediaCtrlPlayerControls flags + wxMediaCtrlPlayerControls flags = (wxMediaCtrlPlayerControls)wxlState.GetEnumerationType(2); + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call ShowPlayerControls + returns = self->ShowPlayerControls(flags); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxMediaCtrl_destructor(lua_State *) + { + return 0; + } + + + #if (wxLUA_USE_wxSocket) && ((wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)) + // %rename LoadFromURI bool Load(const wxURI& location) + static int LUACALL wxLua_wxMediaCtrl_LoadFromURI(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxURI location + const wxURI * location = (const wxURI *)wxlState.GetUserDataType(2, s_wxluatag_wxURI); + // get this + wxMediaCtrl * self = (wxMediaCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaCtrl); + // call Load + returns = self->Load(*location); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxMediaCtrl_methods[] = { + + #if (((wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) + { LuaConstructor, "wxMediaCtrl", wxLua_wxMediaCtrl_constructor, 9, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, + { LuaMethod, "Create", wxLua_wxMediaCtrl_Create, 9, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, + #endif + + + #if (wxLUA_USE_wxFile) && ((wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)) + { LuaMethod, "Seek", wxLua_wxMediaCtrl_Seek, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 } }, + #endif + + { LuaConstructor, "wxMediaCtrlDefault", wxLua_wxMediaCtrlDefault_constructor, 0, 0, { 0 } }, + { LuaMethod, "GetDownloadProgress", wxLua_wxMediaCtrl_GetDownloadProgress, 0, 0, { 0 } }, + { LuaMethod, "GetDownloadTotal", wxLua_wxMediaCtrl_GetDownloadTotal, 0, 0, { 0 } }, + { LuaMethod, "GetState", wxLua_wxMediaCtrl_GetState, 0, 0, { 0 } }, + { LuaMethod, "Load", wxLua_wxMediaCtrl_Load, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "Pause", wxLua_wxMediaCtrl_Pause, 0, 0, { 0 } }, + { LuaMethod, "Play", wxLua_wxMediaCtrl_Play, 0, 0, { 0 } }, + { LuaMethod, "Stop", wxLua_wxMediaCtrl_Stop, 0, 0, { 0 } }, + { LuaMethod, "SetVolume", wxLua_wxMediaCtrl_SetVolume, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "GetVolume", wxLua_wxMediaCtrl_GetVolume, 0, 0, { 0 } }, + { LuaMethod, "ShowPlayerControls", wxLua_wxMediaCtrl_ShowPlayerControls, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, + { LuaDelete, "wxMediaCtrl", wxLua_wxMediaCtrl_destructor, 0, 0, {0} }, + + #if (wxLUA_USE_wxSocket) && ((wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)) + { LuaMethod, "LoadFromURI", wxLua_wxMediaCtrl_LoadFromURI, 1, 1, { &s_wxluatag_wxURI, 0 } }, + #endif + + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxMediaCtrl_methods = s_wxMediaCtrl_methods; + int wxMediaCtrl_methodCount = sizeof(s_wxMediaCtrl_methods)/sizeof(s_wxMediaCtrl_methods[0]); + #endif + + + #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) + // ------------------------------------------------------------------------------------------------- + // Bind class wxMediaEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxMediaEvent = -1; + + // wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) + static int LUACALL wxLua_wxMediaEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMediaEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // int winid = 0 + int winid = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : 0); + // wxEventType commandType = wxEVT_NULL + wxEventType commandType = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL); + // call constructor + returns = new wxMediaEvent(commandType, winid); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxMediaEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxMediaEvent, returns); + + return 1; + } + + static int LUACALL wxLua_wxMediaEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMediaEvent * self = (wxMediaEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxMediaEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxMediaEvent * self = (wxMediaEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMediaEvent); + // 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_wxMediaEvent_methods[] = { + { LuaConstructor, "wxMediaEvent", wxLua_wxMediaEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaDelete, "wxMediaEvent", wxLua_wxMediaEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxMediaEvent_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxMediaEvent_methods = s_wxMediaEvent_methods; + int wxMediaEvent_methodCount = sizeof(s_wxMediaEvent_methods)/sizeof(s_wxMediaEvent_methods[0]); + #endif + |
|
From: Francesco M. <fr...@us...> - 2006-05-16 20:24:39
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19332 Modified Files: download.php screenshots.php Log Message: fixed small graphic problems Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** download.php 16 May 2006 20:12:50 -0000 1.18 --- download.php 16 May 2006 20:24:32 -0000 1.19 *************** *** 99,103 **** --> - <br/> <div class="indented"> <h2 id="sources">Sources</h2> --- 99,102 ---- *************** *** 110,114 **** </div> - <br/> <div class="indented"> <h2 id="snapshot">Nightly snapshot</h2> --- 109,112 ---- *************** *** 120,124 **** </div> - <br/> <div class="indented"> <h2 id="browsesources">Browse the source files online</h2> --- 118,121 ---- Index: screenshots.php =================================================================== RCS file: /cvsroot/wxlua/website/screenshots.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** screenshots.php 16 May 2006 20:12:51 -0000 1.12 --- screenshots.php 16 May 2006 20:24:32 -0000 1.13 *************** *** 47,51 **** <h1 id="other">wxLua on other platforms ?</h1> ! <p>The other ports where <a href="http://www.wxwidgets.org">wxWidgets</a> is available for may also work with wxLua, but we need testers:</p> <!-- --- 47,51 ---- <h1 id="other">wxLua on other platforms ?</h1> ! <p>The other ports where <a href="http://www.wxwidgets.org">wxWidgets</a> is available for may also work with wxLua, but we need testers: if you use OS2, </p> <!-- |
|
From: Francesco M. <fr...@us...> - 2006-05-16 20:12:54
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15379 Modified Files: docs.php download.php index.php screenshots.php updatesite.sh Log Message: fixed permissions Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** updatesite.sh 16 May 2006 19:53:25 -0000 1.24 --- updatesite.sh 16 May 2006 20:12:51 -0000 1.25 *************** *** 8,11 **** --- 8,16 ---- echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs + + # note: the user permissions must be set, too otherwise the owner + # won't be able to run the files. To suppress errors which + # users != owner would get trying to run this script + # we redirect everything to /dev/null chmod -R ug+rw * CVS images docs screenshots wxLua download >/dev/null 2>&1 chmod -R a+x *.sh CVS images docs screenshots wxLua download >/dev/null 2>&1 Index: docs.php =================================================================== RCS file: /cvsroot/wxlua/website/docs.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** docs.php 16 May 2006 19:26:31 -0000 1.13 --- docs.php 16 May 2006 20:12:50 -0000 1.14 *************** *** 32,41 **** <p>Read the <a href="docs/binding.html">binding.html</a> file from the docs directory. Also, take a look at a few of the binding files on ! <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/bindings/wxwidgets">Sourceforge</a> or from our <a href="http://wxlua.sourceforge.net/wxLua/bindings/wxwidgets/">nightly tarball</a> to see how they're constructed and how they're merely simplified versions of the original C/C++ code.</p> <h1 id="cvs">CVS</h1> ! <p>You can access a web version of them on <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua">this page</a>.<br/> Note: The Sourceforge ViewCVS has not been updated in months, more up to date sources can be downloaded or browsed from the nightly tarball link on the <a href="download.php">download</a> page.</p> --- 32,41 ---- <p>Read the <a href="docs/binding.html">binding.html</a> file from the docs directory. Also, take a look at a few of the binding files on ! <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/bindings/wxwidgets">Sourceforge</a> or from our <a href="http://wxlua.sourceforge.net/wxLua/bindings/wxwidgets/">nightly tarball</a> to see how they're constructed and how they're merely simplified versions of the original C/C++ code.</p> <h1 id="cvs">CVS</h1> ! <p>You can access a web version of them on <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua">this page</a>.<br/> Note: The Sourceforge ViewCVS has not been updated in months, more up to date sources can be downloaded or browsed from the nightly tarball link on the <a href="download.php">download</a> page.</p> Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** download.php 16 May 2006 19:26:31 -0000 1.17 --- download.php 16 May 2006 20:12:50 -0000 1.18 *************** *** 125,129 **** <p>The Sourceforge CVS repository or the source files used to create the nightly tarball can be browsed online as well:</p> <ul> ! <li>Browse the wxLua <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/">CVS repository</a> on Sourceforge</li> <li>Browse the wxLua source files <a href="http://wxlua.sourceforge.net/wxLua/">online</a></li> </ul> --- 125,129 ---- <p>The Sourceforge CVS repository or the source files used to create the nightly tarball can be browsed online as well:</p> <ul> ! <li>Browse the wxLua <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/">CVS repository</a> on Sourceforge</li> <li>Browse the wxLua source files <a href="http://wxlua.sourceforge.net/wxLua/">online</a></li> </ul> Index: screenshots.php =================================================================== RCS file: /cvsroot/wxlua/website/screenshots.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** screenshots.php 3 May 2006 04:45:51 -0000 1.11 --- screenshots.php 16 May 2006 20:12:51 -0000 1.12 *************** *** 3,7 **** $pagetitle="screenshots"; $anchors_href=array("win", "gtk2", "osx", "other"); ! $anchors_text=array("wxLua on Windows", "wxLua on GTK2", "wxLua on OSX", "wxLua on ?"); include_once("header.inc.php"); --- 3,7 ---- $pagetitle="screenshots"; $anchors_href=array("win", "gtk2", "osx", "other"); ! $anchors_text=array("wxLua on Windows", "wxLua on GTK2", "wxLua on OSX", "wxLua on other platforms ?"); include_once("header.inc.php"); *************** *** 45,55 **** ?> </div> ! ! <h1 id="other">wxLua on ?</h1> ! <p>The other ports that <a href="http://www.wxwidgets.org">wxWidgets</a> is available for may also work with wxLua, but we need testers:</p> ! <div style="text-align: center"> ! <?php ! ?> ! </div> <?php include_once("footer.inc.php"); ?> \ No newline at end of file --- 45,58 ---- ?> </div> ! ! <h1 id="other">wxLua on other platforms ?</h1> ! <p>The other ports where <a href="http://www.wxwidgets.org">wxWidgets</a> is available for may also work with wxLua, but we need testers:</p> ! ! <!-- ! <div style="text-align: center"> ! <?php ! ?> ! </div> ! --> <?php include_once("footer.inc.php"); ?> \ No newline at end of file Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** index.php 16 May 2006 19:58:30 -0000 1.15 --- index.php 16 May 2006 20:12:51 -0000 1.16 *************** *** 29,33 **** wxFrame top level window and a menubar, just add your program to it:</p> <?php include_once("luasample.lua.html"); ?> ! <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/samples/">here</a>.</p> <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> --- 29,33 ---- wxFrame top level window and a menubar, just add your program to it:</p> <?php include_once("luasample.lua.html"); ?> ! <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:58:34
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10702 Modified Files: index.php Log Message: fixing XHTML compliancy Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** index.php 16 May 2006 19:26:31 -0000 1.14 --- index.php 16 May 2006 19:58:30 -0000 1.15 *************** *** 49,53 **** <ol> <li>the <a href="http://www.wxwidgets.org/manuals/2.6.2/wx_contents.html">wxWidgets documentation</a></li> ! <li>the <a href="http://www.lua.org/pil/">Lua</a> reference manual</a></li> <li>the <a href="docs.php">wxLua documentation</a></li> <li>the <a href="http://lua-users.org/wiki">LuaWiki</a> and <a href="http://www.wxwidgets.org/wiki">wxWiki</a></li> --- 49,53 ---- <ol> <li>the <a href="http://www.wxwidgets.org/manuals/2.6.2/wx_contents.html">wxWidgets documentation</a></li> ! <li>the <a href="http://www.lua.org/pil/">Lua reference manual</a></li> <li>the <a href="docs.php">wxLua documentation</a></li> <li>the <a href="http://lua-users.org/wiki">LuaWiki</a> and <a href="http://www.wxwidgets.org/wiki">wxWiki</a></li> |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:53:30
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9030 Modified Files: updatesite.sh Log Message: Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** updatesite.sh 16 May 2006 19:50:02 -0000 1.23 --- updatesite.sh 16 May 2006 19:53:25 -0000 1.24 *************** *** 8,13 **** echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * cvs images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh cvs images docs screenshots wxLua download >/dev/null 2>&1 } --- 8,13 ---- echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * CVS images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh CVS images docs screenshots wxLua download >/dev/null 2>&1 } |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:50:08
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7694 Modified Files: updatesite.sh Log Message: Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** updatesite.sh 16 May 2006 19:48:47 -0000 1.22 --- updatesite.sh 16 May 2006 19:50:02 -0000 1.23 *************** *** 2,6 **** # $Id$ ! export CVSROOT=:pserver:ano...@wx...s -q:/cvsroot/wxlua function restorepermissions --- 2,6 ---- # $Id$ ! export CVSROOT=:pserver:ano...@wx...s:/cvsroot/wxlua function restorepermissions |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:48:54
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7327 Modified Files: updatesite.sh Log Message: Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** updatesite.sh 16 May 2006 19:45:59 -0000 1.21 --- updatesite.sh 16 May 2006 19:48:47 -0000 1.22 *************** *** 4,7 **** --- 4,16 ---- export CVSROOT=:pserver:ano...@wx...s -q:/cvsroot/wxlua + function restorepermissions + { + echo Restoring permissions + cd /home/groups/w/wx/wxlua/htdocs + chmod -R ug+rw * cvs images docs screenshots wxLua download >/dev/null 2>&1 + chmod -R a+x *.sh cvs images docs screenshots wxLua download >/dev/null 2>&1 + } + + echo Checking out website to htdocs dir from cvs cd /home/groups/w/wx/wxlua *************** *** 17,21 **** # update to the main website only if [ ! -z "$1" ]; then ! echo "Not updating component websites as per user request." exit 0 fi --- 26,31 ---- # update to the main website only if [ ! -z "$1" ]; then ! echo "Not generating docs and tarball as per user request." ! restorepermissions exit 0 fi *************** *** 39,45 **** find . -type f -mtime +7 -path "./wxLua_Snapshot_*" | xargs rm -f ! ! echo Restoring permissions ! cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * cvs images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh cvs images docs screenshots wxLua download >/dev/null 2>&1 --- 49,51 ---- find . -type f -mtime +7 -path "./wxLua_Snapshot_*" | xargs rm -f ! restorepermissions |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:46:05
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6348 Modified Files: updatesite.sh Log Message: Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** updatesite.sh 16 May 2006 19:26:31 -0000 1.20 --- updatesite.sh 16 May 2006 19:45:59 -0000 1.21 *************** *** 2,14 **** # $Id$ ! export cvs -qROOT=:pserver:ano...@wx...s -q:/cvs -qroot/wxlua ! echo Checking out website to htdocs dir from cvs -q cd /home/groups/w/wx/wxlua cvs -q checkout -P -d htdocs website ! echo Checking out the docs dir to the htdocs/docs dir from cvs -q cd /home/groups/w/wx/wxlua/htdocs cvs -q checkout -P -d docs wxLua/docs ! echo Checking out the whole wxLua cvs -q repository to the htdocs/wxLua dir from cvs -q cd /home/groups/w/wx/wxlua/htdocs cvs -q checkout -P wxLua --- 2,14 ---- # $Id$ ! export CVSROOT=:pserver:ano...@wx...s -q:/cvsroot/wxlua ! echo Checking out website to htdocs dir from cvs cd /home/groups/w/wx/wxlua cvs -q checkout -P -d htdocs website ! echo Checking out the docs dir to the htdocs/docs dir from cvs cd /home/groups/w/wx/wxlua/htdocs cvs -q checkout -P -d docs wxLua/docs ! echo Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs cd /home/groups/w/wx/wxlua/htdocs cvs -q checkout -P wxLua *************** *** 32,38 **** cd /home/groups/w/wx/wxlua/htdocs/download tar \ ! --wildcards --exclude=*.o --exclude=*.d --exclude=*.obj --exclude=*.dll --exclude=*.exe --exclude=*.a --exclude=*.d --exclude=cvs -q \ --create wxLua/* | gzip -c > wxLua_Snapshot_`date +%F`.tar.gz ! echo Since we modified the cvs -q with add_crlf_to_dsp_dsw we should delete it rm -Rf wxLua echo Deleting tarballs created more than 1 week ago --- 32,38 ---- cd /home/groups/w/wx/wxlua/htdocs/download tar \ ! --wildcards --exclude=*.o --exclude=*.d --exclude=*.obj --exclude=*.dll --exclude=*.exe --exclude=*.a --exclude=*.d --exclude=cvs \ --create wxLua/* | gzip -c > wxLua_Snapshot_`date +%F`.tar.gz ! echo Since we modified the cvs with add_crlf_to_dsp_dsw we should delete it rm -Rf wxLua echo Deleting tarballs created more than 1 week ago *************** *** 42,45 **** echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * cvs -q images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh cvs -q images docs screenshots wxLua download >/dev/null 2>&1 --- 42,45 ---- echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * cvs images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh cvs images docs screenshots wxLua download >/dev/null 2>&1 |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:43:53
|
Update of /cvsroot/wxlua/website/download In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5694/download Added Files: .cvsignore .htaccess Log Message: added download dir --- NEW FILE: .cvsignore --- *.gz *.bz2 --- NEW FILE: .htaccess --- # File: .htaccess # Author: Francesco Montorsi # Note: these settings make the download directory indexing nicer AddDescription "GZipped archive" *.tar.gz # ignore ourselves from listing IndexIgnore .htaccess # make column width big enough IndexOptions FancyIndexing NameWidth=50 DescriptionWidth=* |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:42:52
|
Update of /cvsroot/wxlua/website/download In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5351/download Log Message: Directory /cvsroot/wxlua/website/download added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:26:44
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32418 Modified Files: docs.php download.php index.php updatesite.sh Log Message: s/cvs.sourceforge/wxlua.cvs.sourceforge Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** updatesite.sh 16 May 2006 19:08:24 -0000 1.19 --- updatesite.sh 16 May 2006 19:26:31 -0000 1.20 *************** *** 2,16 **** # $Id$ ! export CVSROOT=:pserver:ano...@wx...s:/cvsroot/wxlua ! echo Checking out website to htdocs dir from CVS cd /home/groups/w/wx/wxlua ! cvs checkout -P -d htdocs website ! echo Checking out the docs dir to the htdocs/docs dir from CVS cd /home/groups/w/wx/wxlua/htdocs ! cvs checkout -P -d docs wxLua/docs ! echo Checking out the whole wxLua CVS repository to the htdocs/wxLua dir from CVS cd /home/groups/w/wx/wxlua/htdocs ! cvs checkout -P wxLua echo Generate Doxygen documentation --- 2,23 ---- # $Id$ ! export cvs -qROOT=:pserver:ano...@wx...s -q:/cvs -qroot/wxlua ! echo Checking out website to htdocs dir from cvs -q cd /home/groups/w/wx/wxlua ! cvs -q checkout -P -d htdocs website ! echo Checking out the docs dir to the htdocs/docs dir from cvs -q cd /home/groups/w/wx/wxlua/htdocs ! cvs -q checkout -P -d docs wxLua/docs ! echo Checking out the whole wxLua cvs -q repository to the htdocs/wxLua dir from cvs -q cd /home/groups/w/wx/wxlua/htdocs ! cvs -q checkout -P wxLua ! ! # if user called this with a non-empty argument, limit the ! # update to the main website only ! if [ ! -z "$1" ]; then ! echo "Not updating component websites as per user request." ! exit 0 ! fi echo Generate Doxygen documentation *************** *** 20,31 **** echo Create nightly tarball cd /home/groups/w/wx/wxlua/htdocs/download ! cvs checkout -P wxLua cd /home/groups/w/wx/wxlua/htdocs/download/wxLua ../add_crlf_to_dsp_dsw cd /home/groups/w/wx/wxlua/htdocs/download tar \ ! --wildcards --exclude=*.o --exclude=*.d --exclude=*.obj --exclude=*.dll --exclude=*.exe --exclude=*.a --exclude=*.d --exclude=CVS \ --create wxLua/* | gzip -c > wxLua_Snapshot_`date +%F`.tar.gz ! echo Since we modified the CVS with add_crlf_to_dsp_dsw we should delete it rm -Rf wxLua echo Deleting tarballs created more than 1 week ago --- 27,38 ---- echo Create nightly tarball cd /home/groups/w/wx/wxlua/htdocs/download ! cvs -q checkout -P wxLua cd /home/groups/w/wx/wxlua/htdocs/download/wxLua ../add_crlf_to_dsp_dsw cd /home/groups/w/wx/wxlua/htdocs/download tar \ ! --wildcards --exclude=*.o --exclude=*.d --exclude=*.obj --exclude=*.dll --exclude=*.exe --exclude=*.a --exclude=*.d --exclude=cvs -q \ --create wxLua/* | gzip -c > wxLua_Snapshot_`date +%F`.tar.gz ! echo Since we modified the cvs -q with add_crlf_to_dsp_dsw we should delete it rm -Rf wxLua echo Deleting tarballs created more than 1 week ago *************** *** 35,38 **** echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * CVS images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh CVS images docs screenshots wxLua download >/dev/null 2>&1 --- 42,45 ---- echo Restoring permissions cd /home/groups/w/wx/wxlua/htdocs ! chmod -R ug+rw * cvs -q images docs screenshots wxLua download >/dev/null 2>&1 ! chmod -R a+x *.sh cvs -q images docs screenshots wxLua download >/dev/null 2>&1 Index: docs.php =================================================================== RCS file: /cvsroot/wxlua/website/docs.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** docs.php 16 May 2006 03:42:02 -0000 1.12 --- docs.php 16 May 2006 19:26:31 -0000 1.13 *************** *** 6,24 **** include_once("header.inc.php"); ?> ! ! <h1 id="wxlua" class="first">wxLua documentation</h1> ! <p>Read the <a href="docs/wxlua.html">wxLua documentation</a> that describes ! programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> ! <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of classes ! and datatypes from wxWidgets that wxLua wraps.</p> ! ! <h1 id="lua">Lua documentation</h1> ! <p>The <a href="http://www.lua.org/docs.html">Lua reference manual</a> on ! <a href="http://www.lua.org">www.lua.org</a> describes the lua language in detail.</p> ! ! <h1 id="wxwidgets">wxWidgets documentation</h1> ! <p>The <a href="http://www.wxwidgets.org/docs.htm">wxWidgets reference manual</a> on ! <a href="http://www.wxwidgets.org">www.wxwidgets.org</a> is the best ! reference for the wxWidgets classes that wxLua wraps.</p> <h1 id="doxy">Doxygen-generated docs</h1> --- 6,24 ---- include_once("header.inc.php"); ?> ! ! <h1 id="wxlua" class="first">wxLua documentation</h1> ! <p>Read the <a href="docs/wxlua.html">wxLua documentation</a> that describes ! programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> ! <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of classes ! and datatypes from wxWidgets that wxLua wraps.</p> ! ! <h1 id="lua">Lua documentation</h1> ! <p>The <a href="http://www.lua.org/docs.html">Lua reference manual</a> on ! <a href="http://www.lua.org">www.lua.org</a> describes the lua language in detail.</p> ! ! <h1 id="wxwidgets">wxWidgets documentation</h1> ! <p>The <a href="http://www.wxwidgets.org/docs.htm">wxWidgets reference manual</a> on ! <a href="http://www.wxwidgets.org">www.wxwidgets.org</a> is the best ! reference for the wxWidgets classes that wxLua wraps.</p> <h1 id="doxy">Doxygen-generated docs</h1> *************** *** 31,42 **** <h1 id="bindings">Writing and understanding the binding files</h1> <p>Read the <a href="docs/binding.html">binding.html</a> file from the docs directory. ! Also, take a look at a few of the binding files on ! <a href="http://cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/bindings/wxwidgets">Sourceforge</a> or ! from our <a href="http://wxlua.sourceforge.net/wxLua/bindings/wxwidgets/">nightly tarball</a> to see how they're constructed and how they're merely simplified versions of the original C/C++ code.</p> <h1 id="cvs">CVS</h1> ! <p>You can access a web version of them on <a href="http://cvs.sourceforge.net/viewcvs.py/wxlua/wxLua">this page</a>.<br/> ! Note: The Sourceforge ViewCVS has not been updated in months, more up to date sources can be downloaded or browsed from the nightly tarball link on the <a href="download.php">download</a> page.</p> --- 31,42 ---- <h1 id="bindings">Writing and understanding the binding files</h1> <p>Read the <a href="docs/binding.html">binding.html</a> file from the docs directory. ! Also, take a look at a few of the binding files on ! <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/bindings/wxwidgets">Sourceforge</a> or ! from our <a href="http://wxlua.sourceforge.net/wxLua/bindings/wxwidgets/">nightly tarball</a> to see how they're constructed and how they're merely simplified versions of the original C/C++ code.</p> <h1 id="cvs">CVS</h1> ! <p>You can access a web version of them on <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua">this page</a>.<br/> ! Note: The Sourceforge ViewCVS has not been updated in months, more up to date sources can be downloaded or browsed from the nightly tarball link on the <a href="download.php">download</a> page.</p> *************** *** 55,57 **** <p>Credits also goes to all those tools which lets us to maintain the project: <a href="http://bakefile.sourceforge.net">bakefile</a>, <a href="http://www.doxygen.org">doxygen</a>, <a href="http://www.autopackage.org">autopackage</a> projects and obviously to <a href="http://www.wxwidgets.org">wxWidgets toolkit</a> and to <a href="http://www.sourceforge.net">SourceForge.net</a> for hosting the project.</p> ! <?php include_once("footer.inc.php"); ?> --- 55,57 ---- <p>Credits also goes to all those tools which lets us to maintain the project: <a href="http://bakefile.sourceforge.net">bakefile</a>, <a href="http://www.doxygen.org">doxygen</a>, <a href="http://www.autopackage.org">autopackage</a> projects and obviously to <a href="http://www.wxwidgets.org">wxWidgets toolkit</a> and to <a href="http://www.sourceforge.net">SourceForge.net</a> for hosting the project.</p> ! <?php include_once("footer.inc.php"); ?> Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** download.php 3 May 2006 04:40:18 -0000 1.16 --- download.php 16 May 2006 19:26:31 -0000 1.17 *************** *** 109,132 **** <p>See <a href="docs/install.html">install.html</a> for info about required libraries and how to compile and install them</p> </div> ! ! <br/> ! <div class="indented"> ! <h2 id="snapshot">Nightly snapshot</h2> ! <p>A nightly tarball (tar.gz) source package is created with Unix linefeeds (LF) for the sources, but DOS linefeeds (CRLF) for the build files for MSWindows compilers.<br> ! This combination seems to work for most people. If not, you can use the programs dos2unix and unix2dos which are available for most systems.</p> ! <ul> ! <li>Browse <a href="http://wxlua.sourceforge.net/download/">wxLua_Snapshot_YYYY-MM-DD.tar.gz</a> source packages</li> ! </ul> ! </div> ! ! <br/> ! <div class="indented"> ! <h2 id="browsesources">Browse the source files online</h2> ! <p>The Sourceforge CVS repository or the source files used to create the nightly tarball can be browsed online as well:</p> ! <ul> ! <li>Browse the wxLua <a href="http://cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/">CVS repository</a> on Sourceforge</li> ! <li>Browse the wxLua source files <a href="http://wxlua.sourceforge.net/wxLua/">online</a></li> ! </ul> ! </div> <br/> --- 109,132 ---- <p>See <a href="docs/install.html">install.html</a> for info about required libraries and how to compile and install them</p> </div> ! ! <br/> ! <div class="indented"> ! <h2 id="snapshot">Nightly snapshot</h2> ! <p>A nightly tarball (tar.gz) source package is created with Unix linefeeds (LF) for the sources, but DOS linefeeds (CRLF) for the build files for MSWindows compilers.<br/> ! This combination seems to work for most people. If not, you can use the programs dos2unix and unix2dos which are available for most systems.</p> ! <ul> ! <li>Browse <a href="http://wxlua.sourceforge.net/download/">wxLua_Snapshot_YYYY-MM-DD.tar.gz</a> source packages</li> ! </ul> ! </div> ! ! <br/> ! <div class="indented"> ! <h2 id="browsesources">Browse the source files online</h2> ! <p>The Sourceforge CVS repository or the source files used to create the nightly tarball can be browsed online as well:</p> ! <ul> ! <li>Browse the wxLua <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/">CVS repository</a> on Sourceforge</li> ! <li>Browse the wxLua source files <a href="http://wxlua.sourceforge.net/wxLua/">online</a></li> ! </ul> ! </div> <br/> Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** index.php 3 May 2006 04:45:51 -0000 1.13 --- index.php 16 May 2006 19:26:31 -0000 1.14 *************** *** 29,33 **** wxFrame top level window and a menubar, just add your program to it:</p> <?php include_once("luasample.lua.html"); ?> ! <p>Easy, isn't it ? You can see more samples <a href="http://cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/samples/">here</a>.</p> <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> --- 29,33 ---- wxFrame top level window and a menubar, just add your program to it:</p> <?php include_once("luasample.lua.html"); ?> ! <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/viewcvs.py/wxlua/wxLua/samples/">here</a>.</p> <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> |
|
From: Francesco M. <fr...@us...> - 2006-05-16 19:09:58
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26268 Modified Files: style.css updatesite.sh Log Message: made font size a bit bigger Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** updatesite.sh 16 May 2006 03:35:34 -0000 1.18 --- updatesite.sh 16 May 2006 19:08:24 -0000 1.19 *************** *** 37,40 **** chmod -R ug+rw * CVS images docs screenshots wxLua download >/dev/null 2>&1 chmod -R a+x *.sh CVS images docs screenshots wxLua download >/dev/null 2>&1 - - --- 37,38 ---- Index: style.css =================================================================== RCS file: /cvsroot/wxlua/website/style.css,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** style.css 8 Mar 2006 19:31:15 -0000 1.14 --- style.css 16 May 2006 19:08:24 -0000 1.15 *************** *** 18,22 **** html > body { ! font-size: 9pt; } --- 18,22 ---- html > body { ! font-size: 10pt; } |
|
From: John L. <jr...@us...> - 2006-05-16 04:55:36
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26082/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: add more classes from 2.6.3 Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxstc_datatypes.lua 15 May 2006 22:57:29 -0000 1.22 --- wxstc_datatypes.lua 16 May 2006 04:55:32 -0000 1.23 *************** *** 307,310 **** --- 307,329 ---- Name = "wxBrushList", }, + wxBufferedDC = { + BaseClass = "wxMemoryDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxBufferedDC", + }, + wxBufferedPaintDC = { + BaseClass = "wxBufferedDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxBufferedPaintDC", + }, + wxBusyCursor = { + DefType = "class", + Intrinsic = false, + Name = "wxBusyCursor", + }, wxButton = { BaseClass = "wxControl", *************** *** 353,357 **** }, wxCalendarEvent = { ! BaseClass = "wxEvent", Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", --- 372,376 ---- }, wxCalendarEvent = { ! BaseClass = "wxDateEvent", Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", *************** *** 603,606 **** --- 622,632 ---- Name = "wxDataObjectSimple", }, + wxDateEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxLUA_USE_wxCalendarCtrl", + DefType = "class", + Intrinsic = false, + Name = "wxDateEvent", + }, wxDateSpan = { Condition = "wxLUA_USE_wxDateSpan", *************** *** 1444,1447 **** --- 1470,1479 ---- Name = "wxIcon", }, + wxIconizeEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxIconizeEvent", + }, wxIdleEvent = { BaseClass = "wxEvent", *************** *** 1744,1747 **** --- 1776,1785 ---- Name = "wxMask", }, + wxMaximizeEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxMaximizeEvent", + }, wxMemoryDC = { BaseClass = "wxDC", *************** *** 1819,1822 **** --- 1857,1873 ---- Name = "wxMiniFrame", }, + wxMirrorDC = { + BaseClass = "wxDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxMirrorDC", + }, + wxMouseCaptureChangedEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxMouseCaptureChangedEvent", + }, wxMouseEvent = { BaseClass = "wxEvent", *************** *** 2279,2282 **** --- 2330,2339 ---- Name = "wxSeekMode", }, + wxSetCursorEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxSetCursorEvent", + }, wxSignal = { DefType = "enum", *************** *** 2674,2677 **** --- 2731,2741 ---- Name = "wxTimerEvent", }, + wxToggleButton = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxButton", + DefType = "class", + Intrinsic = false, + Name = "wxToggleButton", + }, wxToolBar = { BaseClass = "wxToolBarBase", *************** *** 2848,2851 **** --- 2912,2921 ---- Name = "wxWindow", }, + wxWindowCreateEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + Intrinsic = false, + Name = "wxWindowCreateEvent", + }, wxWindowDC = { BaseClass = "wxDC", *************** *** 2855,2858 **** --- 2925,2939 ---- Name = "wxWindowDC", }, + wxWindowDestroyEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + Intrinsic = false, + Name = "wxWindowDestroyEvent", + }, + wxWindowDisabler = { + DefType = "class", + Intrinsic = false, + Name = "wxWindowDisabler", + }, wxWindowID = { DefType = "wxtypedef", |
|
From: John L. <jr...@us...> - 2006-05-16 04:55:36
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26082/wxLua/bindings/wxwidgets Modified Files: controls.i datetime.i defsutil.i event.i gdi.i windows.i wx_datatypes.lua Log Message: add more classes from 2.6.3 Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wx_datatypes.lua 15 May 2006 22:57:29 -0000 1.26 --- wx_datatypes.lua 16 May 2006 04:55:32 -0000 1.27 *************** *** 307,310 **** --- 307,329 ---- Name = "wxBrushList", }, + wxBufferedDC = { + BaseClass = "wxMemoryDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxBufferedDC", + }, + wxBufferedPaintDC = { + BaseClass = "wxBufferedDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxBufferedPaintDC", + }, + wxBusyCursor = { + DefType = "class", + Intrinsic = false, + Name = "wxBusyCursor", + }, wxButton = { BaseClass = "wxControl", *************** *** 353,357 **** }, wxCalendarEvent = { ! BaseClass = "wxEvent", Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", --- 372,376 ---- }, wxCalendarEvent = { ! BaseClass = "wxDateEvent", Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", *************** *** 603,606 **** --- 622,632 ---- Name = "wxDataObjectSimple", }, + wxDateEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxLUA_USE_wxCalendarCtrl", + DefType = "class", + Intrinsic = false, + Name = "wxDateEvent", + }, wxDateSpan = { Condition = "wxLUA_USE_wxDateSpan", *************** *** 1444,1447 **** --- 1470,1479 ---- Name = "wxIcon", }, + wxIconizeEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxIconizeEvent", + }, wxIdleEvent = { BaseClass = "wxEvent", *************** *** 1744,1747 **** --- 1776,1785 ---- Name = "wxMask", }, + wxMaximizeEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxMaximizeEvent", + }, wxMemoryDC = { BaseClass = "wxDC", *************** *** 1819,1822 **** --- 1857,1873 ---- Name = "wxMiniFrame", }, + wxMirrorDC = { + BaseClass = "wxDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxMirrorDC", + }, + wxMouseCaptureChangedEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxMouseCaptureChangedEvent", + }, wxMouseEvent = { BaseClass = "wxEvent", *************** *** 2279,2282 **** --- 2330,2339 ---- Name = "wxSeekMode", }, + wxSetCursorEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxSetCursorEvent", + }, wxSignal = { DefType = "enum", *************** *** 2661,2664 **** --- 2718,2728 ---- Name = "wxTimerEvent", }, + wxToggleButton = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxButton", + DefType = "class", + Intrinsic = false, + Name = "wxToggleButton", + }, wxToolBar = { BaseClass = "wxToolBarBase", *************** *** 2835,2838 **** --- 2899,2908 ---- Name = "wxWindow", }, + wxWindowCreateEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + Intrinsic = false, + Name = "wxWindowCreateEvent", + }, wxWindowDC = { BaseClass = "wxDC", *************** *** 2842,2845 **** --- 2912,2926 ---- Name = "wxWindowDC", }, + wxWindowDestroyEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + Intrinsic = false, + Name = "wxWindowDestroyEvent", + }, + wxWindowDisabler = { + DefType = "class", + Intrinsic = false, + Name = "wxWindowDisabler", + }, wxWindowID = { DefType = "wxtypedef", Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** windows.i 6 May 2006 19:54:31 -0000 1.17 --- windows.i 16 May 2006 04:55:32 -0000 1.18 *************** *** 9,12 **** --- 9,22 ---- /////////////////////////////////////////////////////////////////////////////// + // wxWindowDisabler + + %include "wx/utils.h" + + %class %delete %noclassinfo %encapsulate wxWindowDisabler + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough + wxWindowDisabler(wxWindow *winToSkip = NULL) + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxWindow %define wxSIMPLE_BORDER Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** gdi.i 16 May 2006 03:32:28 -0000 1.21 --- gdi.i 16 May 2006 04:55:32 -0000 1.22 *************** *** 1086,1089 **** --- 1086,1122 ---- %endclass + /////////////////////////////////////////////////////////////////////////////// + // wxBufferedDC + + %include "wx/dcbuffer.h" + + %class %delete wxBufferedDC, wxMemoryDC + wxBufferedDC() + %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + + void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxBufferedPaintDC + + %include "wx/dcbuffer.h" + + %class %delete wxBufferedPaintDC, wxBufferedDC + wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) + %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxMirrorDC + + %include "wx/dcmirror.h" + + %class %delete wxMirrorDC, wxDC + wxMirrorDC(wxDC& dc, bool mirror) + %endclass + %endif wxLUA_USE_wxDC Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** datetime.i 16 May 2006 03:32:28 -0000 1.13 --- datetime.i 16 May 2006 04:55:32 -0000 1.14 *************** *** 435,443 **** /////////////////////////////////////////////////////////////////////////////// // wxCalendarEvent %include "wx/event.h" ! %class %delete wxCalendarEvent, wxEvent %define %event wxEVT_CALENDAR_SEL_CHANGED %define %event wxEVT_CALENDAR_DAY_CHANGED --- 435,455 ---- /////////////////////////////////////////////////////////////////////////////// + // wxDateEvent + + %class %delete wxDateEvent, wxCommandEvent + wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) + + const wxDateTime& GetDate() const + void SetDate(const wxDateTime &date) + + %property=Date, read + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxCalendarEvent %include "wx/event.h" ! %class %delete wxCalendarEvent, wxDateEvent %define %event wxEVT_CALENDAR_SEL_CHANGED %define %event wxEVT_CALENDAR_DAY_CHANGED *************** *** 448,456 **** wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) ! const wxDateTime& GetDate() const wxDateTime::WeekDay GetWeekDay() const ! %property=Date, read ! %property=WeekDay, read %endclass --- 460,468 ---- wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) ! wxDateTime::WeekDay GetWeekDay() const + void SetWeekDay(const wxDateTime::WeekDay wd) ! %property=WeekDay, read, write %endclass Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** controls.i 7 May 2006 14:27:35 -0000 1.16 --- controls.i 16 May 2006 04:55:32 -0000 1.17 *************** *** 26,37 **** bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") - wxString GetLabel() const static wxSize GetDefaultSize() - void SetDefault() ! void SetLabel(const wxString& label) %property=DefaultSize, read - %property=Label, read, write %endclass --- 26,36 ---- bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") static wxSize GetDefaultSize() void SetDefault() ! ! //wxString GetLabel() const in wxWindow ! //void SetLabel(const wxString& label) in wxWindow %property=DefaultSize, read %endclass *************** *** 66,69 **** --- 65,88 ---- /////////////////////////////////////////////////////////////////////////////// + // wxToggleButton + + %if wxLUA_USE_wxButton + + %include "wx/tglbtn.h" + + %class wxToggleButton, wxControl + wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton") + + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton") + void SetValue(bool state) + bool GetValue() const + + //wxString GetLabel() const in wxWindow + //void SetLabel(const wxString& label) in wxWindow + %endclass + + %endif wxLUA_USE_wxButton + + /////////////////////////////////////////////////////////////////////////////// // wxCheckBox Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** defsutil.i 6 May 2006 16:58:29 -0000 1.20 --- defsutil.i 16 May 2006 04:55:32 -0000 1.21 *************** *** 559,560 **** --- 559,570 ---- wxBG_STYLE_CUSTOM %endenum + + /////////////////////////////////////////////////////////////////////////////// + // wxBusyCursor + + %include "wx/utils.h" + + %class %delete %noclassinfo %encapsulate wxBusyCursor + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough + wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) + %endclass Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** event.i 1 May 2006 19:36:30 -0000 1.11 --- event.i 16 May 2006 04:55:32 -0000 1.12 *************** *** 504,507 **** --- 504,520 ---- /////////////////////////////////////////////////////////////////////////////// + // wxMouseCaptureChangedEvent + + %include "wx/event.h" + + %class %delete wxMouseCaptureChangedEvent, wxEvent + %define %event wxEVT_MOUSE_CAPTURE_CHANGED + + wxMouseCaptureChangedEvent(wxWindowID winid = 0, wxWindow* gainedCapture = NULL) + + wxWindow* GetCapturedWindow() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxMoveEvent *************** *** 613,616 **** --- 626,676 ---- /////////////////////////////////////////////////////////////////////////////// + // wxIconizeEvent + + %include "wx/event.h" + + %class %delete wxIconizeEvent, wxEvent + %define %event wxEVT_ICONIZE + + wxIconizeEvent(int winid = 0, bool iconized = true) + + bool Iconized() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxMaximizeEvent + + %include "wx/event.h" + + %class %delete wxMaximizeEvent, wxEvent + %define %event wxEVT_MAXIMIZE + + wxMaximizeEvent(int winid = 0) + + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxWindowCreateEvent + + %class wxWindowCreateEvent, wxCommandEvent + %define %event wxEVT_CREATE + + wxWindowCreateEvent(wxWindow *win = NULL) + + wxWindow *GetWindow() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxWindowDestroyEvent + + %class wxWindowDestroyEvent, wxCommandEvent + %define %event wxEVT_DESTROY + + wxWindowDestroyEvent(wxWindow *win = NULL) + + wxWindow *GetWindow() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxSysColourChangedEvent *************** *** 624,627 **** --- 684,705 ---- /////////////////////////////////////////////////////////////////////////////// + // wxSetCursorEvent + + %include "wx/event.h" + + %class %delete wxSetCursorEvent, wxEvent + %define %event wxEVT_SET_CURSOR + + wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0) + + wxCoord GetX() const + wxCoord GetY() const + void SetCursor(const wxCursor& cursor) + wxCursor GetCursor() const + bool HasCursor() const + + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxUpdateUIEvent |
|
From: John L. <jr...@us...> - 2006-05-16 04:55:36
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26082/wxLua/modules/wxbind/src Modified Files: controls.cpp datetime.cpp defsutil.cpp event.cpp gdi.cpp windows.cpp wx_bind.cpp Log Message: add more classes from 2.6.3 Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** controls.cpp 7 May 2006 14:27:40 -0000 1.23 --- controls.cpp 16 May 2006 04:55:33 -0000 1.24 *************** *** 129,147 **** #endif - // wxString GetLabel() const - static int LUACALL wxLua_wxButton_GetLabel(lua_State *L) - { - wxLuaState wxlState(L); - wxString returns; - // get this - wxButton * self = (wxButton *)wxlState.GetUserDataType(1, s_wxluatag_wxButton); - // call GetLabel - returns = self->GetLabel(); - // push the result string - lua_pushstring(L, wx2lua(returns) ); - - return 1; - } - // void SetDefault() static int LUACALL wxLua_wxButton_SetDefault(lua_State *L) --- 129,132 ---- *************** *** 156,173 **** } - // void SetLabel(const wxString& label) - static int LUACALL wxLua_wxButton_SetLabel(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString label - const wxString label = lua2wx(wxlState.GetStringType(2)); - // get this - wxButton * self = (wxButton *)wxlState.GetUserDataType(1, s_wxluatag_wxButton); - // call SetLabel - self->SetLabel(label); - - return 0; - } - static int LUACALL wxLua_wxButton_destructor(lua_State *) { --- 141,144 ---- *************** *** 193,201 **** #endif - { LuaMethod, "GetLabel", wxLua_wxButton_GetLabel, 0, 0, { 0 } }, { LuaMethod, "SetDefault", wxLua_wxButton_SetDefault, 0, 0, { 0 } }, - { LuaMethod, "SetLabel", wxLua_wxButton_SetLabel, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaGetProp, "Label", wxLua_wxButton_GetLabel, 0, 0, {0} }, - { LuaSetProp, "Label", wxLua_wxButton_SetLabel, 1, 1, {0} }, { LuaDelete, "wxButton", wxLua_wxButton_destructor, 0, 0, {0} }, }; --- 164,168 ---- *************** *** 452,455 **** --- 419,558 ---- + #if wxLUA_USE_wxButton + // ------------------------------------------------------------------------------------------------- + // Bind class wxToggleButton + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxToggleButton = -1; + + + #if ((wxLUA_USE_wxButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) + // wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton") + static int LUACALL wxLua_wxToggleButton_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxToggleButton *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxToggleButton" + const wxString name = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxT("wxToggleButton"))); + // const wxValidator validator = wxDefaultValidator + const wxValidator * validator = (argCount >= 7 ? (const wxValidator *)wxlState.GetUserDataType(7, s_wxluatag_wxValidator) : &wxDefaultValidator); + // long style = 0 + long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString label + const wxString label = lua2wx(wxlState.GetStringType(3)); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlState.GetNumberType(2); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxToggleButton(parent, id, label, *pos, *size, style, *validator, name); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxToggleButton, returns); + + return 1; + } + + // bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton") + static int LUACALL wxLua_wxToggleButton_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxToggleButton" + const wxString name = (argCount >= 9 ? lua2wx(wxlState.GetStringType(9)) : wxString(wxT("wxToggleButton"))); + // const wxValidator validator = wxDefaultValidator + const wxValidator * validator = (argCount >= 8 ? (const wxValidator *)wxlState.GetUserDataType(8, s_wxluatag_wxValidator) : &wxDefaultValidator); + // long style = 0 + long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString label + const wxString label = lua2wx(wxlState.GetStringType(4)); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxToggleButton * self = (wxToggleButton *)wxlState.GetUserDataType(1, s_wxluatag_wxToggleButton); + // call Create + returns = self->Create(parent, id, label, *pos, *size, style, *validator, name); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif + + // void SetValue(bool state) + static int LUACALL wxLua_wxToggleButton_SetValue(lua_State *L) + { + wxLuaState wxlState(L); + // bool state + bool state = wxlState.GetBooleanType(2); + // get this + wxToggleButton * self = (wxToggleButton *)wxlState.GetUserDataType(1, s_wxluatag_wxToggleButton); + // call SetValue + self->SetValue(state); + + return 0; + } + + // bool GetValue() const + static int LUACALL wxLua_wxToggleButton_GetValue(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxToggleButton * self = (wxToggleButton *)wxlState.GetUserDataType(1, s_wxluatag_wxToggleButton); + // call GetValue + returns = self->GetValue(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxToggleButton_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxToggleButton_methods[] = { + + #if ((wxLUA_USE_wxButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) + { LuaConstructor, "wxToggleButton", wxLua_wxToggleButton_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, + { LuaMethod, "Create", wxLua_wxToggleButton_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, + #endif + + { LuaMethod, "SetValue", wxLua_wxToggleButton_SetValue, 1, 1, { &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "GetValue", wxLua_wxToggleButton_GetValue, 0, 0, { 0 } }, + { LuaDelete, "wxToggleButton", wxLua_wxToggleButton_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxToggleButton_methods = s_wxToggleButton_methods; + int wxToggleButton_methodCount = sizeof(s_wxToggleButton_methods)/sizeof(s_wxToggleButton_methods[0]); + #endif + + #if wxLUA_USE_wxCheckBox // ------------------------------------------------------------------------------------------------- Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** defsutil.cpp 2 May 2006 05:25:02 -0000 1.13 --- defsutil.cpp 16 May 2006 04:55:33 -0000 1.14 *************** *** 693,694 **** --- 693,768 ---- #endif + // ------------------------------------------------------------------------------------------------- + // Bind class wxBusyCursor + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxBusyCursor = -1; + + static int LUACALL wxLua_wxBusyCursor_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursor * self = (wxBusyCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyCursor); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursor * self = (wxBusyCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyCursor); + // 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; + } + + + #if wxLUA_USE_wxCursor + // wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) + static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursor *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxCursor cursor = wxHOURGLASS_CURSOR + const wxCursor * cursor = (argCount >= 1 ? (const wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor) : wxHOURGLASS_CURSOR); + // call constructor + returns = new wxBusyCursor(cursor); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBusyCursor *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); + + return 1; + } + + #endif + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxBusyCursor_methods[] = { + { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxBusyCursor_Delete, 0, 0, {0} }, + + #if wxLUA_USE_wxCursor + { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, + #endif + + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; + int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); + Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** datetime.cpp 2 May 2006 05:25:02 -0000 1.13 --- datetime.cpp 16 May 2006 04:55:33 -0000 1.14 *************** *** 210,214 **** #endif ! // wxDateTime() static int LUACALL wxLua_wxDateTime_constructor(lua_State *L) { --- 210,214 ---- #endif ! // wxDateTime() static int LUACALL wxLua_wxDateTime_constructor(lua_State *L) { *************** *** 3645,3663 **** #if wxLUA_USE_wxCalendarCtrl // ------------------------------------------------------------------------------------------------- ! // Bind class wxCalendarEvent // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class ! int s_wxluatag_wxCalendarEvent = -1; #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxCalendarCtrl) // const wxDateTime& GetDate() const ! static int LUACALL wxLua_wxCalendarEvent_GetDate(lua_State *L) { wxLuaState wxlState(L); const wxDateTime *returns; // get this ! wxCalendarEvent * self = (wxCalendarEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxCalendarEvent); // call GetDate returns = &self->GetDate(); --- 3645,3684 ---- #if wxLUA_USE_wxCalendarCtrl // ------------------------------------------------------------------------------------------------- ! // Bind class wxDateEvent // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class ! int s_wxluatag_wxDateEvent = -1; #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxCalendarCtrl) + // wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) + static int LUACALL wxLua_wxDateEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDateEvent *returns; + // wxEventType type + wxEventType type = (wxEventType)wxlState.GetNumberType(3); + // const wxDateTime dt + const wxDateTime * dt = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // wxWindow win + wxWindow * win = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxDateEvent(win, *dt, type); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxDateEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDateEvent, returns); + + return 1; + } + // const wxDateTime& GetDate() const ! static int LUACALL wxLua_wxDateEvent_GetDate(lua_State *L) { wxLuaState wxlState(L); const wxDateTime *returns; // get this ! wxDateEvent * self = (wxDateEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDateEvent); // call GetDate returns = &self->GetDate(); *************** *** 3668,3671 **** --- 3689,3767 ---- } + // void SetDate(const wxDateTime &date) + static int LUACALL wxLua_wxDateEvent_SetDate(lua_State *L) + { + wxLuaState wxlState(L); + // const wxDateTime date + const wxDateTime * date = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // get this + wxDateEvent * self = (wxDateEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDateEvent); + // call SetDate + self->SetDate(*date); + + return 0; + } + + #endif + + static int LUACALL wxLua_wxDateEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDateEvent * self = (wxDateEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDateEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxDateEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxDateEvent * self = (wxDateEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDateEvent); + // 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_wxDateEvent_methods[] = { + + #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxCalendarCtrl) + { LuaConstructor, "wxDateEvent", wxLua_wxDateEvent_constructor, 3, 3, { &s_wxluatag_wxWindow, &s_wxluatag_wxDateTime, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "GetDate", wxLua_wxDateEvent_GetDate, 0, 0, { 0 } }, + { LuaMethod, "SetDate", wxLua_wxDateEvent_SetDate, 1, 1, { &s_wxluatag_wxDateTime, 0 } }, + { LuaGetProp, "Date", wxLua_wxDateEvent_GetDate, 0, 0, {0} }, + #endif + + { LuaDelete, "wxDateEvent", wxLua_wxDateEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxDateEvent_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxDateEvent_methods = s_wxDateEvent_methods; + int wxDateEvent_methodCount = sizeof(s_wxDateEvent_methods)/sizeof(s_wxDateEvent_methods[0]); + #endif + + + #if wxLUA_USE_wxCalendarCtrl + // ------------------------------------------------------------------------------------------------- + // Bind class wxCalendarEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxCalendarEvent = -1; + + + #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxCalendarCtrl) // wxDateTime::WeekDay GetWeekDay() const static int LUACALL wxLua_wxCalendarEvent_GetWeekDay(lua_State *L) *************** *** 3683,3686 **** --- 3779,3796 ---- } + // void SetWeekDay(const wxDateTime::WeekDay wd) + static int LUACALL wxLua_wxCalendarEvent_SetWeekDay(lua_State *L) + { + wxLuaState wxlState(L); + // const wxDateTime::WeekDay wd + const wxDateTime::WeekDay wd = (wxDateTime::WeekDay)wxlState.GetEnumerationType(2); + // get this + wxCalendarEvent * self = (wxCalendarEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxCalendarEvent); + // call SetWeekDay + self->SetWeekDay(wd); + + return 0; + } + #endif *************** *** 3737,3744 **** #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxCalendarCtrl) - { LuaMethod, "GetDate", wxLua_wxCalendarEvent_GetDate, 0, 0, { 0 } }, { LuaMethod, "GetWeekDay", wxLua_wxCalendarEvent_GetWeekDay, 0, 0, { 0 } }, ! { LuaGetProp, "Date", wxLua_wxCalendarEvent_GetDate, 0, 0, {0} }, { LuaGetProp, "WeekDay", wxLua_wxCalendarEvent_GetWeekDay, 0, 0, {0} }, #endif --- 3847,3854 ---- #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxCalendarCtrl) { LuaMethod, "GetWeekDay", wxLua_wxCalendarEvent_GetWeekDay, 0, 0, { 0 } }, ! { LuaMethod, "SetWeekDay", wxLua_wxCalendarEvent_SetWeekDay, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, { LuaGetProp, "WeekDay", wxLua_wxCalendarEvent_GetWeekDay, 0, 0, {0} }, + { LuaSetProp, "WeekDay", wxLua_wxCalendarEvent_SetWeekDay, 1, 1, {0} }, #endif Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** event.cpp 2 May 2006 05:25:02 -0000 1.17 --- event.cpp 16 May 2006 04:55:33 -0000 1.18 *************** *** 2807,2810 **** --- 2807,2894 ---- // ------------------------------------------------------------------------------------------------- + // Bind class wxMouseCaptureChangedEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxMouseCaptureChangedEvent = -1; + + // wxMouseCaptureChangedEvent(wxWindowID winid = 0, wxWindow* gainedCapture = NULL) + static int LUACALL wxLua_wxMouseCaptureChangedEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMouseCaptureChangedEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow gainedCapture = NULL + wxWindow * gainedCapture = (argCount >= 2 ? (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow) : NULL); + // wxWindowID winid = 0 + wxWindowID winid = (argCount >= 1 ? (wxWindowID)wxlState.GetNumberType(1) : 0); + // call constructor + returns = new wxMouseCaptureChangedEvent(winid, gainedCapture); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxMouseCaptureChangedEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxMouseCaptureChangedEvent, returns); + + return 1; + } + + // wxWindow* GetCapturedWindow() const + static int LUACALL wxLua_wxMouseCaptureChangedEvent_GetCapturedWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxMouseCaptureChangedEvent * self = (wxMouseCaptureChangedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseCaptureChangedEvent); + // call GetCapturedWindow + returns = self->GetCapturedWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + static int LUACALL wxLua_wxMouseCaptureChangedEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMouseCaptureChangedEvent * self = (wxMouseCaptureChangedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseCaptureChangedEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxMouseCaptureChangedEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxMouseCaptureChangedEvent * self = (wxMouseCaptureChangedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseCaptureChangedEvent); + // 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_wxMouseCaptureChangedEvent_methods[] = { + { LuaConstructor, "wxMouseCaptureChangedEvent", wxLua_wxMouseCaptureChangedEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluatag_wxWindow, 0 } }, + { LuaMethod, "GetCapturedWindow", wxLua_wxMouseCaptureChangedEvent_GetCapturedWindow, 0, 0, { 0 } }, + { LuaDelete, "wxMouseCaptureChangedEvent", wxLua_wxMouseCaptureChangedEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxMouseCaptureChangedEvent_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxMouseCaptureChangedEvent_methods = s_wxMouseCaptureChangedEvent_methods; + int wxMouseCaptureChangedEvent_methodCount = sizeof(s_wxMouseCaptureChangedEvent_methods)/sizeof(s_wxMouseCaptureChangedEvent_methods[0]); + + // ------------------------------------------------------------------------------------------------- // Bind class wxMoveEvent // ------------------------------------------------------------------------------------------------- *************** *** 3417,3420 **** --- 3501,3778 ---- // ------------------------------------------------------------------------------------------------- + // Bind class wxIconizeEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxIconizeEvent = -1; + + // wxIconizeEvent(int winid = 0, bool iconized = true) + static int LUACALL wxLua_wxIconizeEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxIconizeEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // bool iconized = true + bool iconized = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); + // int winid = 0 + int winid = (argCount >= 1 ? (int)wxlState.GetNumberType(1) : 0); + // call constructor + returns = new wxIconizeEvent(winid, iconized); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxIconizeEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxIconizeEvent, returns); + + return 1; + } + + // bool Iconized() const + static int LUACALL wxLua_wxIconizeEvent_Iconized(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxIconizeEvent * self = (wxIconizeEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxIconizeEvent); + // call Iconized + returns = self->Iconized(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxIconizeEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxIconizeEvent * self = (wxIconizeEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxIconizeEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxIconizeEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxIconizeEvent * self = (wxIconizeEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxIconizeEvent); + // 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_wxIconizeEvent_methods[] = { + { LuaConstructor, "wxIconizeEvent", wxLua_wxIconizeEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "Iconized", wxLua_wxIconizeEvent_Iconized, 0, 0, { 0 } }, + { LuaDelete, "wxIconizeEvent", wxLua_wxIconizeEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxIconizeEvent_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxIconizeEvent_methods = s_wxIconizeEvent_methods; + int wxIconizeEvent_methodCount = sizeof(s_wxIconizeEvent_methods)/sizeof(s_wxIconizeEvent_methods[0]); + + // ------------------------------------------------------------------------------------------------- + // Bind class wxMaximizeEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxMaximizeEvent = -1; + + // wxMaximizeEvent(int winid = 0) + static int LUACALL wxLua_wxMaximizeEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMaximizeEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // int winid = 0 + int winid = (argCount >= 1 ? (int)wxlState.GetNumberType(1) : 0); + // call constructor + returns = new wxMaximizeEvent(winid); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxMaximizeEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxMaximizeEvent, returns); + + return 1; + } + + static int LUACALL wxLua_wxMaximizeEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxMaximizeEvent * self = (wxMaximizeEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMaximizeEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxMaximizeEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxMaximizeEvent * self = (wxMaximizeEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxMaximizeEvent); + // 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_wxMaximizeEvent_methods[] = { + { LuaConstructor, "wxMaximizeEvent", wxLua_wxMaximizeEvent_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, + { LuaDelete, "wxMaximizeEvent", wxLua_wxMaximizeEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxMaximizeEvent_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxMaximizeEvent_methods = s_wxMaximizeEvent_methods; + int wxMaximizeEvent_methodCount = sizeof(s_wxMaximizeEvent_methods)/sizeof(s_wxMaximizeEvent_methods[0]); + + // ------------------------------------------------------------------------------------------------- + // Bind class wxWindowCreateEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWindowCreateEvent = -1; + + // wxWindowCreateEvent(wxWindow *win = NULL) + static int LUACALL wxLua_wxWindowCreateEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowCreateEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow win = NULL + wxWindow * win = (argCount >= 1 ? (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow) : NULL); + // call constructor + returns = new wxWindowCreateEvent(win); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWindowCreateEvent, returns); + + return 1; + } + + // wxWindow *GetWindow() const + static int LUACALL wxLua_wxWindowCreateEvent_GetWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxWindowCreateEvent * self = (wxWindowCreateEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowCreateEvent); + // call GetWindow + returns = self->GetWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + static int LUACALL wxLua_wxWindowCreateEvent_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxWindowCreateEvent_methods[] = { + { LuaConstructor, "wxWindowCreateEvent", wxLua_wxWindowCreateEvent_constructor, 1, 0, { &s_wxluatag_wxWindow, 0 } }, + { LuaMethod, "GetWindow", wxLua_wxWindowCreateEvent_GetWindow, 0, 0, { 0 } }, + { LuaDelete, "wxWindowCreateEvent", wxLua_wxWindowCreateEvent_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWindowCreateEvent_methods = s_wxWindowCreateEvent_methods; + int wxWindowCreateEvent_methodCount = sizeof(s_wxWindowCreateEvent_methods)/sizeof(s_wxWindowCreateEvent_methods[0]); + + // ------------------------------------------------------------------------------------------------- + // Bind class wxWindowDestroyEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWindowDestroyEvent = -1; + + // wxWindowDestroyEvent(wxWindow *win = NULL) + static int LUACALL wxLua_wxWindowDestroyEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowDestroyEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow win = NULL + wxWindow * win = (argCount >= 1 ? (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow) : NULL); + // call constructor + returns = new wxWindowDestroyEvent(win); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWindowDestroyEvent, returns); + + return 1; + } + + // wxWindow *GetWindow() const + static int LUACALL wxLua_wxWindowDestroyEvent_GetWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxWindowDestroyEvent * self = (wxWindowDestroyEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDestroyEvent); + // call GetWindow + returns = self->GetWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + static int LUACALL wxLua_wxWindowDestroyEvent_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxWindowDestroyEvent_methods[] = { + { LuaConstructor, "wxWindowDestroyEvent", wxLua_wxWindowDestroyEvent_constructor, 1, 0, { &s_wxluatag_wxWindow, 0 } }, + { LuaMethod, "GetWindow", wxLua_wxWindowDestroyEvent_GetWindow, 0, 0, { 0 } }, + { LuaDelete, "wxWindowDestroyEvent", wxLua_wxWindowDestroyEvent_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWindowDestroyEvent_methods = s_wxWindowDestroyEvent_methods; + int wxWindowDestroyEvent_methodCount = sizeof(s_wxWindowDestroyEvent_methods)/sizeof(s_wxWindowDestroyEvent_methods[0]); + + // ------------------------------------------------------------------------------------------------- // Bind class wxSysColourChangedEvent // ------------------------------------------------------------------------------------------------- *************** *** 3479,3482 **** --- 3837,3998 ---- // ------------------------------------------------------------------------------------------------- + // Bind class wxSetCursorEvent + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxSetCursorEvent = -1; + + // wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0) + static int LUACALL wxLua_wxSetCursorEvent_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxSetCursorEvent *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxCoord y = 0 + wxCoord y = (argCount >= 2 ? (wxCoord)wxlState.GetNumberType(2) : 0); + // wxCoord x = 0 + wxCoord x = (argCount >= 1 ? (wxCoord)wxlState.GetNumberType(1) : 0); + // call constructor + returns = new wxSetCursorEvent(x, y); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxSetCursorEvent *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxSetCursorEvent, returns); + + return 1; + } + + // wxCoord GetX() const + static int LUACALL wxLua_wxSetCursorEvent_GetX(lua_State *L) + { + wxLuaState wxlState(L); + wxCoord returns; + // get this + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + // call GetX + returns = self->GetX(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxCoord GetY() const + static int LUACALL wxLua_wxSetCursorEvent_GetY(lua_State *L) + { + wxLuaState wxlState(L); + wxCoord returns; + // get this + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + // call GetY + returns = self->GetY(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // bool HasCursor() const + static int LUACALL wxLua_wxSetCursorEvent_HasCursor(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + // call HasCursor + returns = self->HasCursor(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxSetCursorEvent_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxSetCursorEvent_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + // 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; + } + + + #if wxLUA_USE_wxCursor + // void SetCursor(const wxCursor& cursor) + static int LUACALL wxLua_wxSetCursorEvent_SetCursor(lua_State *L) + { + wxLuaState wxlState(L); + // const wxCursor cursor + const wxCursor * cursor = (const wxCursor *)wxlState.GetUserDataType(2, s_wxluatag_wxCursor); + // get this + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + // call SetCursor + self->SetCursor(*cursor); + + return 0; + } + + // wxCursor GetCursor() const + static int LUACALL wxLua_wxSetCursorEvent_GetCursor(lua_State *L) + { + wxLuaState wxlState(L); + wxCursor *returns; + // get this + wxSetCursorEvent * self = (wxSetCursorEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSetCursorEvent); + // call GetCursor + // allocate a new object using the copy constructor + returns = new wxCursor(self->GetCursor()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxCursor *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxCursor, returns); + + return 1; + } + + #endif + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxSetCursorEvent_methods[] = { + { LuaConstructor, "wxSetCursorEvent", wxLua_wxSetCursorEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "GetX", wxLua_wxSetCursorEvent_GetX, 0, 0, { 0 } }, + { LuaMethod, "GetY", wxLua_wxSetCursorEvent_GetY, 0, 0, { 0 } }, + { LuaMethod, "HasCursor", wxLua_wxSetCursorEvent_HasCursor, 0, 0, { 0 } }, + { LuaDelete, "wxSetCursorEvent", wxLua_wxSetCursorEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxSetCursorEvent_Delete, 0, 0, {0} }, + + #if wxLUA_USE_wxCursor + { LuaMethod, "SetCursor", wxLua_wxSetCursorEvent_SetCursor, 1, 1, { &s_wxluatag_wxCursor, 0 } }, + { LuaMethod, "GetCursor", wxLua_wxSetCursorEvent_GetCursor, 0, 0, { 0 } }, + #endif + + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxSetCursorEvent_methods = s_wxSetCursorEvent_methods; + int wxSetCursorEvent_methodCount = sizeof(s_wxSetCursorEvent_methods)/sizeof(s_wxSetCursorEvent_methods[0]); + + // ------------------------------------------------------------------------------------------------- // Bind class wxUpdateUIEvent // ------------------------------------------------------------------------------------------------- Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** windows.cpp 6 May 2006 19:54:32 -0000 1.21 --- windows.cpp 16 May 2006 04:55:33 -0000 1.22 *************** *** 30,33 **** --- 30,99 ---- // ------------------------------------------------------------------------------------------------- + // Bind class wxWindowDisabler + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxWindowDisabler = -1; + + // wxWindowDisabler(wxWindow *winToSkip = NULL) + static int LUACALL wxLua_wxWindowDisabler_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowDisabler *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow winToSkip = NULL + wxWindow * winToSkip = (argCount >= 1 ? (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow) : NULL); + // call constructor + returns = new wxWindowDisabler(winToSkip); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxWindowDisabler *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWindowDisabler, returns); + + return 1; + } + + static int LUACALL wxLua_wxWindowDisabler_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowDisabler * self = (wxWindowDisabler *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDisabler); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxWindowDisabler_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowDisabler * self = (wxWindowDisabler *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDisabler); + // 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_wxWindowDisabler_methods[] = { + { LuaConstructor, "wxWindowDisabler", wxLua_wxWindowDisabler_constructor, 1, 0, { &s_wxluatag_wxWindow, 0 } }, + { LuaDelete, "wxWindowDisabler", wxLua_wxWindowDisabler_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxWindowDisabler_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxWindowDisabler_methods = s_wxWindowDisabler_methods; + int wxWindowDisabler_methodCount = sizeof(s_wxWindowDisabler_methods)/sizeof(s_wxWindowDisabler_methods[0]); + + // ------------------------------------------------------------------------------------------------- // Bind class wxVisualAttributes // ------------------------------------------------------------------------------------------------- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wx_bind.cpp 15 May 2006 22:57:30 -0000 1.37 --- wx_bind.cpp 16 May 2006 04:55:33 -0000 1.38 *************** *** 141,148 **** --- 141,151 ---- { &wxEVT_COMMAND_TOOL_ENTER, "wxEVT_COMMAND_TOOL_ENTER", &s_wxluatag_wxCommandEvent }, { &wxEVT_COMMAND_TOOL_RCLICKED, "wxEVT_COMMAND_TOOL_RCLICKED", &s_wxluatag_wxCommandEvent }, + { &wxEVT_CREATE, "wxEVT_CREATE", &s_wxluatag_wxWindowCreateEvent }, + { &wxEVT_DESTROY, "wxEVT_DESTROY", &s_wxluatag_wxWindowDestroyEvent }, { &wxEVT_END_PROCESS, "wxEVT_END_PROCESS", &s_wxluatag_wxProcessEvent }, { &wxEVT_END_SESSION, "wxEVT_END_SESSION", &s_wxluatag_wxCloseEvent }, { &wxEVT_ENTER_WINDOW, "wxEVT_ENTER_WINDOW", &s_wxluatag_wxMouseEvent }, { &wxEVT_ERASE_BACKGROUND, "wxEVT_ERASE_BACKGROUND", &s_wxluatag_wxEraseEvent }, + { &wxEVT_ICONIZE, "wxEVT_ICONIZE", &s_wxluatag_wxIconizeEvent }, { &wxEVT_IDLE, "wxEVT_IDLE", &s_wxluatag_wxIdleEvent }, { &wxEVT_INIT_DIALOG, "wxEVT_INIT_DIALOG", &s_wxluatag_wxInitDialogEvent }, *************** *** 158,161 **** --- 161,165 ---- { &wxEVT_LEFT_DOWN, "wxEVT_LEFT_DOWN", &s_wxluatag_wxMouseEvent }, { &wxEVT_LEFT_UP, "wxEVT_LEFT_UP", &s_wxluatag_wxMouseEvent }, + { &wxEVT_MAXIMIZE, "wxEVT_MAXIMIZE", &s_wxluatag_wxMaximizeEvent }, { &wxEVT_MIDDLE_DCLICK, "wxEVT_MIDDLE_DCLICK", &s_wxluatag_wxMouseEvent }, { &wxEVT_MIDDLE_DOWN, "wxEVT_MIDDLE_DOWN", &s_wxluatag_wxMouseEvent }, *************** *** 163,166 **** --- 167,171 ---- { &wxEVT_MOTION, "wxEVT_MOTION", &s_wxluatag_wxMouseEvent }, { &wxEVT_MOUSEWHEEL, "wxEVT_MOUSEWHEEL", &s_wxluatag_wxMouseEvent }, + { &wxEVT_MOUSE_CAPTURE_CHANGED, "wxEVT_MOUSE_CAPTURE_CHANGED", &s_wxluatag_wxMouseCaptureChangedEvent }, { &wxEVT_MOVE, "wxEVT_MOVE", &s_wxluatag_wxMoveEvent }, { &wxEVT_NC_ENTER_WINDOW, "wxEVT_NC_ENTER_WINDOW", &s_wxluatag_wxMouseEvent }, *************** *** 198,201 **** --- 203,207 ---- { &wxEVT_SCROLL_THUMBTRACK, "wxEVT_SCROLL_THUMBTRACK", &s_wxluatag_wxScrollEvent }, { &wxEVT_SCROLL_TOP, "wxEVT_SCROLL_TOP", &s_wxluatag_wxScrollEvent }, + { &wxEVT_SET_CURSOR, "wxEVT_SET_CURSOR", &s_wxluatag_wxSetCursorEvent }, { &wxEVT_SET_FOCUS, "wxEVT_SET_FOCUS", &s_wxluatag_wxFocusEvent }, { &wxEVT_SIZE, "wxEVT_SIZE", &s_wxluatag_wxSizeEvent }, *************** *** 5126,5130 **** --- 5132,5138 ---- } + wxLUA_IMPLEMENT_ENCAPSULATION(wxBusyCursor) wxLUA_IMPLEMENT_ENCAPSULATION(wxProcess) + wxLUA_IMPLEMENT_ENCAPSULATION(wxWindowDisabler) #if wxCHECK_VERSION(2,7,0) *************** *** 5430,5433 **** --- 5438,5442 ---- { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, -1, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent" }, + { "wxBusyCursor", wxBusyCursor_methods, wxBusyCursor_methodCount, -1, NULL, &s_wxluatag_wxBusyCursor, NULL }, { "wxClientData", wxClientData_methods, wxClientData_methodCount, -1, NULL, &s_wxluatag_wxClientData, NULL }, { "wxCloseEvent", wxCloseEvent_methods, wxCloseEvent_methodCount, -1, CLASSINFO(wxCloseEvent), &s_wxluatag_wxCloseEvent, "wxEvent" }, *************** *** 5439,5442 **** --- 5448,5452 ---- { "wxFocusEvent", wxFocusEvent_methods, wxFocusEvent_methodCount, -1, CLASSINFO(wxFocusEvent), &s_wxluatag_wxFocusEvent, "wxEvent" }, { "wxGDIObject", wxGDIObject_methods, wxGDIObject_methodCount, -1, CLASSINFO(wxGDIObject), &s_wxluatag_wxGDIObject, "wxObject" }, + { "wxIconizeEvent", wxIconizeEvent_methods, wxIconizeEvent_methodCount, -1, CLASSINFO(wxIconizeEvent), &s_wxluatag_wxIconizeEvent, "wxEvent" }, { "wxIdleEvent", wxIdleEvent_methods, wxIdleEvent_methodCount, -1, CLASSINFO(wxIdleEvent), &s_wxluatag_wxIdleEvent, "wxEvent" }, { "wxInitDialogEvent", wxInitDialogEvent_methods, wxInitDialogEvent_methodCount, -1, CLASSINFO(wxInitDialogEvent), &s_wxluatag_wxInitDialogEvent, "wxEvent" }, *************** *** 5445,5448 **** --- 5455,5460 ---- { "wxLuaObject", wxLuaObject_methods, wxLuaObject_methodCount, -1, CLASSINFO(wxLuaObject), &s_wxluatag_wxLuaObject, "wxObject" }, { "wxLuaState", wxLuaState_methods, wxLuaState_methodCount, -1, CLASSINFO(wxLuaState), &s_wxluatag_wxLuaState, "wxObject" }, + { "wxMaximizeEvent", wxMaximizeEvent_methods, wxMaximizeEvent_methodCount, -1, CLASSINFO(wxMaximizeEvent), &s_wxluatag_wxMaximizeEvent, "wxEvent" }, + { "wxMouseCaptureChangedEvent", wxMouseCaptureChangedEvent_methods, wxMouseCaptureChangedEvent_methodCount, -1, CLASSINFO(wxMouseCaptureChangedEvent), &s_wxluatag_wxMouseCaptureChangedEvent, "wxEvent" }, { "wxMouseEvent", wxMouseEvent_methods, wxMouseEvent_methodCount, -1, CLASSINFO(wxMouseEvent), &s_wxluatag_wxMouseEvent, "wxEvent" }, { "wxMoveEvent", wxMoveEvent_methods, wxMoveEvent_methodCount, -1, CLASSINFO(wxMoveEvent), &s_wxluatag_wxMoveEvent, "wxEvent" }, *************** *** 5455,5458 **** --- 5467,5471 ---- { "wxScrollEvent", wxScrollEvent_methods, wxScrollEvent_methodCount, -1, CLASSINFO(wxScrollEvent), &s_wxluatag_wxScrollEvent, "wxCommandEvent" }, { "wxScrollWinEvent", wxScrollWinEvent_methods, wxScrollWinEvent_methodCount, -1, CLASSINFO(wxScrollWinEvent), &s_wxluatag_wxScrollWinEvent, "wxEvent" }, + { "wxSetCursorEvent", wxSetCursorEvent_methods, wxSetCursorEvent_methodCount, -1, CLASSINFO(wxSetCursorEvent), &s_wxluatag_wxSetCursorEvent, "wxEvent" }, { "wxSizeEvent", wxSizeEvent_methods, wxSizeEvent_methodCount, -1, CLASSINFO(wxSizeEvent), &s_wxluatag_wxSizeEvent, "wxEvent" }, { "wxStringClientData", wxStringClientData_methods, wxStringClientData_methodCount, -1, NULL, &s_wxluatag_wxStringClientData, "wxClientData" }, *************** *** 5461,5464 **** --- 5474,5480 ---- { "wxVisualAttributes", wxVisualAttributes_methods, wxVisualAttributes_methodCount, -1, NULL, &s_wxluatag_wxVisualAttributes, NULL }, { "wxWindow", wxWindow_methods, wxWindow_methodCount, -1, CLASSINFO(wxWindow), &s_wxluatag_wxWindow, "wxEvtHandler" }, + { "wxWindowCreateEvent", wxWindowCreateEvent_methods, wxWindowCreateEvent_methodCount, -1, CLASSINFO(wxWindowCreateEvent), &s_wxluatag_wxWindowCreateEvent, "wxCommandEvent" }, + { "wxWindowDestroyEvent", wxWindowDestroyEvent_methods, wxWindowDestroyEvent_methodCount, -1, CLASSINFO(wxWindowDestroyEvent), &s_wxluatag_wxWindowDestroyEvent, "wxCommandEvent" }, + { "wxWindowDisabler", wxWindowDisabler_methods, wxWindowDisabler_methodCount, -1, NULL, &s_wxluatag_wxWindowDisabler, NULL }, #if wxCHECK_VERSION(2,3,0) *************** *** 5526,5529 **** --- 5542,5546 ---- #if wxLUA_USE_wxButton { "wxButton", wxButton_methods, wxButton_methodCount, -1, CLASSINFO(wxButton), &s_wxluatag_wxButton, "wxControl" }, + { "wxToggleButton", wxToggleButton_methods, wxToggleButton_methodCount, -1, CLASSINFO(wxToggleButton), &s_wxluatag_wxToggleButton, "wxControl" }, #endif *************** *** 5532,5536 **** { "wxCalendarCtrl", wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, -1, CLASSINFO(wxCalendarCtrl), &s_wxluatag_wxCalendarCtrl, "wxControl" }, { "wxCalendarDateAttr", wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, -1, NULL, &s_wxluatag_wxCalendarDateAttr, NULL }, ! { "wxCalendarEvent", wxCalendarEvent_methods, wxCalendarEvent_methodCount, -1, CLASSINFO(wxCalendarEvent), &s_wxluatag_wxCalendarEvent, "wxEvent" }, #endif --- 5549,5554 ---- { "wxCalendarCtrl", wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, -1, CLASSINFO(wxCalendarCtrl), &s_wxluatag_wxCalendarCtrl, "wxControl" }, { "wxCalendarDateAttr", wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, -1, NULL, &s_wxluatag_wxCalendarDateAttr, NULL }, ! { "wxCalendarEvent", wxCalendarEvent_methods, wxCalendarEvent_methodCount, -1, CLASSINFO(wxCalendarEvent), &s_wxluatag_wxCalendarEvent, "wxDateEvent" }, ! { "wxDateEvent", wxDateEvent_methods, wxDateEvent_methodCount, -1, CLASSINFO(wxDateEvent), &s_wxluatag_wxDateEvent, "wxCommandEvent" }, #endif *************** *** 5613,5619 **** --- 5631,5640 ---- #if wxLUA_USE_wxDC + { "wxBufferedDC", wxBufferedDC_methods, wxBufferedDC_methodCount, -1, CLASSINFO(wxBufferedDC), &s_wxluatag_wxBufferedDC, "wxMemoryDC" }, + { "wxBufferedPaintDC", wxBufferedPaintDC_methods, wxBufferedPaintDC_methodCount, -1, CLASSINFO(wxBufferedPaintDC), &s_wxluatag_wxBufferedPaintDC, "wxBufferedDC" }, { "wxClientDC", wxClientDC_methods, wxClientDC_methodCount, -1, CLASSINFO(wxClientDC), &s_wxluatag_wxClientDC, "wxWindowDC" }, { "wxDC", wxDC_methods, wxDC_methodCount, -1, CLASSINFO(wxDC), &s_wxluatag_wxDC, "wxObject" }, { "wxMemoryDC", wxMemoryDC_methods, wxMemoryDC_methodCount, -1, CLASSINFO(wxMemoryDC), &s_wxluatag_wxMemoryDC, "wxDC" }, + { "wxMirrorDC", wxMirrorDC_methods, wxMirrorDC_methodCount, -1, CLASSINFO(wxMirrorDC), &s_wxluatag_wxMirrorDC, "wxDC" }, { "wxPaintDC", wxPaintDC_methods, wxPaintDC_methodCount, -1, CLASSINFO(wxPaintDC), &s_wxluatag_wxPaintDC, "wxWindowDC" }, { "wxScreenDC", wxScreenDC_methods, wxScreenDC_methodCount, -1, CLASSINFO(wxScreenDC), &s_wxluatag_wxScreenDC, "wxDC" }, Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** gdi.cpp 14 May 2006 17:45:05 -0000 1.23 --- gdi.cpp 16 May 2006 04:55:33 -0000 1.24 *************** *** 2422,2426 **** #endif ! // wxFont(int pointSize, int family, int style, int weight, const bool underline = false, const wxString& faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT) static int LUACALL wxLua_wxFont_constructor(lua_State *L) { --- 2422,2426 ---- #endif ! // wxFont(int pointSize, int family, int style, int weight, const bool underline = false, const wxString& faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT) static int LUACALL wxLua_wxFont_constructor(lua_State *L) { *************** *** 3655,3659 **** #endif ! // %overload wxPen() static int LUACALL wxLua_wxPen_constructor1(lua_State *L) { --- 3655,3659 ---- #endif ! // %overload wxPen() static int LUACALL wxLua_wxPen_constructor1(lua_State *L) { *************** *** 5234,5238 **** #endif ! // %constructor wxDefaultBitmap() static int LUACALL wxLua_wxDefaultBitmap_constructor(lua_State *L) { --- 5234,5238 ---- #endif ! // %constructor wxDefaultBitmap() static int LUACALL wxLua_wxDefaultBitmap_constructor(lua_State *L) { *************** *** 8338,8341 **** --- 8338,8684 ---- + #if wxLUA_USE_wxDC + // ------------------------------------------------------------------------------------------------- + // Bind class wxBufferedDC + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxBufferedDC = -1; + + + #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxDC) + // %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + static int LUACALL wxLua_wxBufferedDCFromBitmap_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBufferedDC *returns; + // get number of arguments + int argCount = lua_gettop(L); + // int style = wxBUFFER_CLIENT_AREA + int style = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxBUFFER_CLIENT_AREA); + // const wxBitmap buffer + const wxBitmap * buffer = (const wxBitmap *)wxlState.GetUserDataType(2, s_wxluatag_wxBitmap); + // wxDC dc + wxDC * dc = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); + // call constructor + returns = new wxBufferedDC(dc, *buffer, style); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBufferedDC *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBufferedDC, returns); + + return 1; + } + + // %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + static int LUACALL wxLua_wxBufferedDC_InitFromBitmap(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // int style = wxBUFFER_CLIENT_AREA + int style = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxBUFFER_CLIENT_AREA); + // const wxBitmap buffer + const wxBitmap * buffer = (const wxBitmap *)wxlState.GetUserDataType(3, s_wxluatag_wxBitmap); + // wxDC dc + wxDC * dc = (wxDC *)wxlState.GetUserDataType(2, s_wxluatag_wxDC); + // get this + wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC); + // call Init + self->Init(dc, *buffer, style); + + return 0; + } + + #endif + + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) + // %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + static int LUACALL wxLua_wxBufferedDCFromSize_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBufferedDC *returns; + // get number of arguments + int argCount = lua_gettop(L); + // int style = wxBUFFER_CLIENT_AREA + int style = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxBUFFER_CLIENT_AREA); + // const wxSize area + const wxSize * area = (const wxSize *)wxlState.GetUserDataType(2, s_wxluatag_wxSize); + // wxDC dc + wxDC * dc = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); + // call constructor + returns = new wxBufferedDC(dc, *area, style); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBufferedDC *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBufferedDC, returns); + + return 1; + } + + // void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + static int LUACALL wxLua_wxBufferedDC_Init(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // int style = wxBUFFER_CLIENT_AREA + int style = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxBUFFER_CLIENT_AREA); + // const wxSize area + const wxSize * area = (const wxSize *)wxlState.GetUserDataType(3, s_wxluatag_wxSize); + // wxDC dc + wxDC * dc = (wxDC *)wxlState.GetUserDataType(2, s_wxluatag_wxDC); + // get this + wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC); + // call Init + self->Init(dc, *area, style); + + return 0; + } + + #endif + + // wxBufferedDC() + static int LUACALL wxLua_wxBufferedDC_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBufferedDC *returns; + // call constructor + returns = new wxBufferedDC(); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBufferedDC *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBufferedDC, returns); + + return 1; + } + + static int LUACALL wxLua_wxBufferedDC_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxBufferedDC_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC); + // 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_wxBufferedDC_methods[] = { + + #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxDC) + { LuaConstructor, "wxBufferedDCFromBitmap", wxLua_wxBufferedDCFromBitmap_constructor, 3, 2, { &s_wxluatag_wxDC, &s_wxluatag_wxBitmap, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "InitFromBitmap", wxLua_wxBufferedDC_InitFromBitmap, 3, 2, { &s_wxluatag_wxDC, &s_wxluatag_wxBitmap, &s_wxluaarg_Number, 0 } }, + #endif + + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) + { LuaConstructor, "wxBufferedDCFromSize", wxLua_wxBufferedDCFromSize_constructor, 3, 2, { &s_wxluatag_wxDC, &s_wxluatag_wxSize, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Init", wxLua_wxBufferedDC_Init, 3, 2, { &s_wxluatag_wxDC, &s_wxluatag_wxSize, &s_wxluaarg_Number, 0 } }, + #endif + + { LuaConstructor, "wxBufferedDC", wxLua_wxBufferedDC_constructor, 0, 0, { 0 } }, + { LuaDelete, "wxBufferedDC", wxLua_wxBufferedDC_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxBufferedDC_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxBufferedDC_methods = s_wxBufferedDC_methods; + int wxBufferedDC_methodCount = sizeof(s_wxBufferedDC_methods)/sizeof(s_wxBufferedDC_methods[0]); + #endif + + + #if wxLUA_USE_wxDC + // ------------------------------------------... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-05-16 04:55:36
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26082/wxLua/docs Modified Files: wxluaref.html Log Message: add more classes from 2.6.3 Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluaref.html 16 May 2006 03:32:28 -0000 1.1 --- wxluaref.html 16 May 2006 04:55:32 -0000 1.2 *************** *** 37,45 **** <a href="#wxBrush">wxBrush</a><br> <a href="#wxBrushList">wxBrushList</a><br> ! wxBufferedDC - NOT WRAPPED<br> wxBufferedInputStream - NOT WRAPPED<br> wxBufferedOutputStream - NOT WRAPPED<br> ! wxBufferedPaintDC - NOT WRAPPED<br> ! wxBusyCursor - NOT WRAPPED<br> wxBusyInfo - NOT WRAPPED<br> <a href="#wxButton">wxButton</a><br> --- 37,45 ---- <a href="#wxBrush">wxBrush</a><br> <a href="#wxBrushList">wxBrushList</a><br> ! <a href="#wxBufferedDC">wxBufferedDC</a><br> wxBufferedInputStream - NOT WRAPPED<br> wxBufferedOutputStream - NOT WRAPPED<br> ! <a href="#wxBufferedPaintDC">wxBufferedPaintDC</a><br> ! <a href="#wxBusyCursor">wxBusyCursor</a><br> wxBusyInfo - NOT WRAPPED<br> <a href="#wxButton">wxButton</a><br> *************** *** 97,101 **** <a href="#wxDataObjectSimple">wxDataObjectSimple</a><br> wxDataOutputStream - NOT WRAPPED<br> ! wxDateEvent - NOT WRAPPED<br> wxDatePickerCtrl - NOT WRAPPED<br> <a href="#wxDateSpan">wxDateSpan</a><br> --- 97,101 ---- <a href="#wxDataObjectSimple">wxDataObjectSimple</a><br> wxDataOutputStream - NOT WRAPPED<br> ! <a href="#wxDateEvent">wxDateEvent</a><br> wxDatePickerCtrl - NOT WRAPPED<br> <a href="#wxDateSpan">wxDateSpan</a><br> *************** *** 259,263 **** wxIconBundle - NOT WRAPPED<br> wxIconLocation - NOT WRAPPED<br> ! wxIconizeEvent - NOT WRAPPED<br> <a href="#wxIdleEvent">wxIdleEvent</a><br> <a href="#wxImage">wxImage</a><br> --- 259,263 ---- wxIconBundle - NOT WRAPPED<br> wxIconLocation - NOT WRAPPED<br> ! <a href="#wxIconizeEvent">wxIconizeEvent</a><br> <a href="#wxIdleEvent">wxIdleEvent</a><br> <a href="#wxImage">wxImage</a><br> *************** *** 312,316 **** <a href="#wxMDIParentFrame">wxMDIParentFrame</a><br> <a href="#wxMask">wxMask</a><br> ! wxMaximizeEvent - NOT WRAPPED<br> wxMediaCtrl - NOT WRAPPED<br> wxMediaEvent - NOT WRAPPED<br> --- 312,316 ---- <a href="#wxMDIParentFrame">wxMDIParentFrame</a><br> <a href="#wxMask">wxMask</a><br> ! <a href="#wxMaximizeEvent">wxMaximizeEvent</a><br> wxMediaCtrl - NOT WRAPPED<br> wxMediaEvent - NOT WRAPPED<br> *************** *** 330,336 **** wxMimeTypesManager - NOT WRAPPED<br> <a href="#wxMiniFrame">wxMiniFrame</a><br> ! wxMirrorDC - NOT WRAPPED<br> wxModule - NOT WRAPPED<br> ! wxMouseCaptureChangedEvent - NOT WRAPPED<br> <a href="#wxMouseEvent">wxMouseEvent</a><br> <a href="#wxMouseState">wxMouseState</a><br> --- 330,336 ---- wxMimeTypesManager - NOT WRAPPED<br> <a href="#wxMiniFrame">wxMiniFrame</a><br> ! <a href="#wxMirrorDC">wxMirrorDC</a><br> wxModule - NOT WRAPPED<br> ! <a href="#wxMouseCaptureChangedEvent">wxMouseCaptureChangedEvent</a><br> <a href="#wxMouseEvent">wxMouseEvent</a><br> <a href="#wxMouseState">wxMouseState</a><br> *************** *** 408,412 **** wxSemaphore - NOT WRAPPED<br> wxServer - NOT WRAPPED<br> ! wxSetCursorEvent - NOT WRAPPED<br> wxSimpleHelpProvider - NOT WRAPPED<br> <a href="#wxSingleChoiceDialog">wxSingleChoiceDialog</a><br> --- 408,412 ---- wxSemaphore - NOT WRAPPED<br> wxServer - NOT WRAPPED<br> ! <a href="#wxSetCursorEvent">wxSetCursorEvent</a><br> wxSimpleHelpProvider - NOT WRAPPED<br> <a href="#wxSingleChoiceDialog">wxSingleChoiceDialog</a><br> *************** *** 483,487 **** wxTipProvider - NOT WRAPPED<br> wxTipWindow - NOT WRAPPED<br> ! wxToggleButton - NOT WRAPPED<br> <a href="#wxToolBar">wxToolBar</a><br> <a href="#wxToolBarBase">wxToolBarBase</a><br> --- 483,487 ---- wxTipProvider - NOT WRAPPED<br> wxTipWindow - NOT WRAPPED<br> ! <a href="#wxToggleButton">wxToggleButton</a><br> <a href="#wxToolBar">wxToolBar</a><br> <a href="#wxToolBarBase">wxToolBarBase</a><br> *************** *** 510,517 **** <a href="#wxWinHelpController">wxWinHelpController</a><br> <a href="#wxWindow">wxWindow</a><br> ! wxWindowCreateEvent - NOT WRAPPED<br> <a href="#wxWindowDC">wxWindowDC</a><br> ! wxWindowDestroyEvent - NOT WRAPPED<br> ! wxWindowDisabler - NOT WRAPPED<br> <a href="#wxWindowList">wxWindowList</a><br> <a href="#wxWizard">wxWizard</a><br> --- 510,517 ---- <a href="#wxWinHelpController">wxWinHelpController</a><br> <a href="#wxWindow">wxWindow</a><br> ! <a href="#wxWindowCreateEvent">wxWindowCreateEvent</a><br> <a href="#wxWindowDC">wxWindowDC</a><br> ! <a href="#wxWindowDestroyEvent">wxWindowDestroyEvent</a><br> ! <a href="#wxWindowDisabler">wxWindowDisabler</a><br> <a href="#wxWindowList">wxWindowList</a><br> <a href="#wxWizard">wxWizard</a><br> *************** *** 1546,1557 **** <br> bool Create(<a href="#wxWindow">wxWindow</a> *parent, <a href="#wxWindow">wxWindow</a>ID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "<a href="#wxButton">wxButton</a>")<br> - <a href="#wxString">wxString</a> GetLabel() const<br> static <a href="#wxSize">wxSize</a> GetDefaultSize()<br> - <br> void SetDefault()<br> ! void SetLabel(const <a href="#wxString">wxString</a>& label)<br> <br> <font color=#000088> <i>%property</i>=DefaultSize, read</font><br> - <font color=#000088> <i>%property</i>=Label, read, write</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 1546,1556 ---- <br> bool Create(<a href="#wxWindow">wxWindow</a> *parent, <a href="#wxWindow">wxWindow</a>ID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "<a href="#wxButton">wxButton</a>")<br> static <a href="#wxSize">wxSize</a> GetDefaultSize()<br> void SetDefault()<br> ! <br> ! //<a href="#wxString">wxString</a> GetLabel() const in <a href="#wxWindow">wxWindow</a><br> ! //void SetLabel(const <a href="#wxString">wxString</a>& label) in <a href="#wxWindow">wxWindow</a><br> <br> <font color=#000088> <i>%property</i>=DefaultSize, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 1586,1589 **** --- 1585,1608 ---- <br> ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxToggleButton">wxToggleButton</a><br> + <br> + <i>%if</i> wxLUA_USE_wxButton<br> + <br> + <i>%include</i> "wx/tglbtn.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxToggleButton">wxToggleButton</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <a href="#wxToggleButton">wxToggleButton</a>(<a href="#wxWindow">wxWindow</a> *parent, <a href="#wxWindow">wxWindow</a>ID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "<a href="#wxToggleButton">wxToggleButton</a>")<br> + <br> + bool Create(<a href="#wxWindow">wxWindow</a> *parent, <a href="#wxWindow">wxWindow</a>ID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "<a href="#wxToggleButton">wxToggleButton</a>")<br> + void SetValue(bool state)<br> + bool GetValue() const<br> + <br> + //<a href="#wxString">wxString</a> GetLabel() const in <a href="#wxWindow">wxWindow</a><br> + //void SetLabel(const <a href="#wxString">wxString</a>& label) in <a href="#wxWindow">wxWindow</a><br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxButton<br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxCheckBox">wxCheckBox</a><br> <br> *************** *** 3545,3553 **** <br> ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxCalendarEvent">wxCalendarEvent</a><br> <br> <i>%include</i> "wx/event.h"<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxCalendarEvent">wxCalendarEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_CALENDAR_SEL_CHANGED</font><br> <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_CALENDAR_DAY_CHANGED</font><br> --- 3564,3584 ---- <br> ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxDateEvent">wxDateEvent</a><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxDateEvent">wxDateEvent</a></b>, <a href="#wxCommandEvent">wxCommandEvent</a></font></font><blockquote> + <a href="#wxDateEvent">wxDateEvent</a>(<a href="#wxWindow">wxWindow</a> *win, const <a href="#wxDateTime">wxDateTime</a>& dt, <a href="#wxEventType">wxEventType</a> type)<br> + <br> + const <a href="#wxDateTime">wxDateTime</a>& GetDate() const<br> + void SetDate(const <a href="#wxDateTime">wxDateTime</a> &date)<br> + <br> + <font color=#000088> <i>%property</i>=Date, read</font><br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxCalendarEvent">wxCalendarEvent</a><br> <br> <i>%include</i> "wx/event.h"<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxCalendarEvent">wxCalendarEvent</a></b>, <a href="#wxDateEvent">wxDateEvent</a></font></font><blockquote> <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_CALENDAR_SEL_CHANGED</font><br> <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_CALENDAR_DAY_CHANGED</font><br> *************** *** 3558,3566 **** <br> <a href="#wxCalendarEvent">wxCalendarEvent</a>(<a href="#wxCalendarCtrl">wxCalendarCtrl</a> *cal, <a href="#wxEventType">wxEventType</a> type)<br> ! const <a href="#wxDateTime">wxDateTime</a>& GetDate() const<br> <a href="#wxDateTime">wxDateTime</a>::WeekDay GetWeekDay() const<br> <br> ! <font color=#000088> <i>%property</i>=Date, read</font><br> ! <font color=#000088> <i>%property</i>=WeekDay, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 3589,3597 ---- <br> <a href="#wxCalendarEvent">wxCalendarEvent</a>(<a href="#wxCalendarCtrl">wxCalendarCtrl</a> *cal, <a href="#wxEventType">wxEventType</a> type)<br> ! <br> <a href="#wxDateTime">wxDateTime</a>::WeekDay GetWeekDay() const<br> + void SetWeekDay(const <a href="#wxDateTime">wxDateTime</a>::WeekDay wd)<br> <br> ! <font color=#000088> <i>%property</i>=WeekDay, read, write</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 4128,4131 **** --- 4159,4172 ---- wxBG_STYLE_CUSTOM<br> </blockquote><i>%endenum</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxBusyCursor">wxBusyCursor</a><br> + <br> + <i>%include</i> "wx/utils.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxBusyCursor">wxBusyCursor</a></b></font></font><blockquote> + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough<br> + <a href="#wxBusyCursor">wxBusyCursor</a>(const <a href="#wxCursor">wxCursor</a>* cursor = wxHOURGLASS_CURSOR)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> <HR> <h2>dialogs.i</h2> *************** *** 5134,5137 **** --- 5175,5191 ---- <br> ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxMouseCaptureChangedEvent">wxMouseCaptureChangedEvent</a><br> + <br> + <i>%include</i> "wx/event.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxMouseCaptureChangedEvent">wxMouseCaptureChangedEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> + <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_MOUSE_CAPTURE_CHANGED</font><br> + <br> + <a href="#wxMouseCaptureChangedEvent">wxMouseCaptureChangedEvent</a>(<a href="#<a href="#wxWindow">wxWindow</a>ID"><a href="#wxWindow">wxWindow</a>ID</a> winid = 0, <a href="#wxWindow">wxWindow</a>* gainedCapture = NULL)<br> + <br> + <a href="#wxWindow">wxWindow</a>* GetCapturedWindow() const<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxMoveEvent">wxMoveEvent</a><br> <br> *************** *** 5243,5246 **** --- 5297,5347 ---- <br> ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxIconizeEvent">wxIconizeEvent</a><br> + <br> + <i>%include</i> "wx/event.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxIconizeEvent">wxIconizeEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> + <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_ICONIZE</font><br> + <br> + <a href="#wxIconizeEvent">wxIconizeEvent</a>(int winid = 0, bool iconized = true)<br> + <br> + bool Iconized() const<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxMaximizeEvent">wxMaximizeEvent</a><br> + <br> + <i>%include</i> "wx/event.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxMaximizeEvent">wxMaximizeEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> + <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_MAXIMIZE</font><br> + <br> + <a href="#wxMaximizeEvent">wxMaximizeEvent</a>(int winid = 0)<br> + <br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxWindowCreateEvent">wxWindowCreateEvent</a><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxWindowCreateEvent">wxWindowCreateEvent</a></b>, <a href="#wxCommandEvent">wxCommandEvent</a></font></font><blockquote> + <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_CREATE</font><br> + <br> + <a href="#<a href="#wxWindow">wxWindow</a>CreateEvent"><a href="#wxWindow">wxWindow</a>CreateEvent</a>(<a href="#wxWindow">wxWindow</a> *win = NULL)<br> + <br> + <a href="#wxWindow">wxWindow</a> *GetWindow() const<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxWindowDestroyEvent">wxWindowDestroyEvent</a><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxWindowDestroyEvent">wxWindowDestroyEvent</a></b>, <a href="#wxCommandEvent">wxCommandEvent</a></font></font><blockquote> + <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_DESTROY</font><br> + <br> + <a href="#<a href="#wxWindow">wxWindow</a>DestroyEvent"><a href="#wxWindow">wxWindow</a>DestroyEvent</a>(<a href="#wxWindow">wxWindow</a> *win = NULL)<br> + <br> + <a href="#wxWindow">wxWindow</a> *GetWindow() const<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxSysColourChangedEvent">wxSysColourChangedEvent</a><br> <br> *************** *** 5254,5257 **** --- 5355,5376 ---- <br> ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxSetCursorEvent">wxSetCursorEvent</a><br> + <br> + <i>%include</i> "wx/event.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxSetCursorEvent">wxSetCursorEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> + <font color=#AA00AA> <i>%define</i> <i>%event</i> wxEVT_SET_CURSOR</font><br> + <br> + <a href="#wxSetCursorEvent">wxSetCursorEvent</a>(<a href="#wxCoord">wxCoord</a> x = 0, <a href="#wxCoord">wxCoord</a> y = 0)<br> + <br> + <a href="#wxCoord">wxCoord</a> GetX() const<br> + <a href="#wxCoord">wxCoord</a> GetY() const<br> + void SetCursor(const <a href="#wxCursor">wxCursor</a>& cursor)<br> + <a href="#wxCursor">wxCursor</a> GetCursor() const<br> + bool HasCursor() const<br> + <br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxUpdateUIEvent">wxUpdateUIEvent</a><br> <br> *************** *** 6787,6790 **** --- 6906,6942 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxBufferedDC">wxBufferedDC</a><br> + <br> + <i>%include</i> "wx/dcbuffer.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxBufferedDC">wxBufferedDC</a></b>, <a href="#wxMemoryDC">wxMemoryDC</a></font></font><blockquote> + <a href="#wxBufferedDC">wxBufferedDC</a>()<br> + <i>%constructor</i> wxBufferedDCFromSize(<a href="#wxDC">wxDC</a> *dc, const <a href="#wxSize">wxSize</a>& area, int style = wxBUFFER_CLIENT_AREA)<br> + <i>%constructor</i> wxBufferedDCFromBitmap(<a href="#wxDC">wxDC</a> *dc, const <a href="#wxBitmap">wxBitmap</a>& buffer, int style = wxBUFFER_CLIENT_AREA)<br> + <br> + void Init(<a href="#wxDC">wxDC</a> *dc, const <a href="#wxSize">wxSize</a>& area, int style = wxBUFFER_CLIENT_AREA)<br> + <font color=#FF0000> <i>%rename</i> InitFromBitmap void Init(<a href="#wxDC">wxDC</a> *dc, const <a href="#wxBitmap">wxBitmap</a>& buffer, int style = wxBUFFER_CLIENT_AREA)</font><br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxBufferedPaintDC">wxBufferedPaintDC</a><br> + <br> + <i>%include</i> "wx/dcbuffer.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxBufferedPaintDC">wxBufferedPaintDC</a></b>, <a href="#wxBufferedDC">wxBufferedDC</a></font></font><blockquote> + <a href="#wxBufferedPaintDC">wxBufferedPaintDC</a>(<a href="#wxWindow">wxWindow</a> *window, int style = wxBUFFER_CLIENT_AREA)<br> + <i>%constructor</i> wxBufferedPaintDCFromBitmap(<a href="#wxWindow">wxWindow</a> *window, const <a href="#wxBitmap">wxBitmap</a>& buffer, int style = wxBUFFER_CLIENT_AREA)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxMirrorDC">wxMirrorDC</a><br> + <br> + <i>%include</i> "wx/dcmirror.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxMirrorDC">wxMirrorDC</a></b>, <a href="#wxDC">wxDC</a></font></font><blockquote> + <a href="#wxMirrorDC">wxMirrorDC</a>(<a href="#wxDC">wxDC</a>& dc, bool mirror)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> <i>%endif</i> wxLUA_USE_wxDC<br> <br> *************** *** 10729,10732 **** --- 10881,10894 ---- <br> ///////////////////////////////////////////////////////////////////////////////<br> + // <a href="#wxWindowDisabler">wxWindowDisabler</a><br> + <br> + <i>%include</i> "wx/utils.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxWindowDisabler">wxWindowDisabler</a></b></font></font><blockquote> + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough<br> + <a href="#<a href="#wxWindow">wxWindow</a>Disabler"><a href="#wxWindow">wxWindow</a>Disabler</a>(<a href="#wxWindow">wxWindow</a> *winToSkip = NULL)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + ///////////////////////////////////////////////////////////////////////////////<br> // <a href="#wxWindow">wxWindow</a><br> <font color=#0000EE><i>%define</i> wxSIMPLE_BORDER</font><br> |
|
From: John L. <jr...@us...> - 2006-05-16 04:55:35
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26082/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: add more classes from 2.6.3 Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxbind.h 15 May 2006 22:57:30 -0000 1.24 --- wxbind.h 16 May 2006 04:55:33 -0000 1.25 *************** *** 189,192 **** --- 189,193 ---- #if wxLUA_USE_wxButton #include "wx/button.h" + #include "wx/tglbtn.h" #endif *************** *** 271,276 **** --- 272,279 ---- #if wxLUA_USE_wxDC #include "wx/dc.h" + #include "wx/dcbuffer.h" #include "wx/dcclient.h" #include "wx/dcmemory.h" + #include "wx/dcmirror.h" #include "wx/dcscreen.h" #endif *************** *** 817,820 **** --- 820,824 ---- extern int s_wxluatag_wxActivateEvent; + extern int s_wxluatag_wxBusyCursor; extern int s_wxluatag_wxClientData; extern int s_wxluatag_wxCloseEvent; *************** *** 826,829 **** --- 830,834 ---- extern int s_wxluatag_wxFocusEvent; extern int s_wxluatag_wxGDIObject; + extern int s_wxluatag_wxIconizeEvent; extern int s_wxluatag_wxIdleEvent; extern int s_wxluatag_wxInitDialogEvent; *************** *** 832,835 **** --- 837,842 ---- extern int s_wxluatag_wxLuaObject; extern int s_wxluatag_wxLuaState; + extern int s_wxluatag_wxMaximizeEvent; + extern int s_wxluatag_wxMouseCaptureChangedEvent; extern int s_wxluatag_wxMouseEvent; extern int s_wxluatag_wxMoveEvent; *************** *** 842,845 **** --- 849,853 ---- extern int s_wxluatag_wxScrollEvent; extern int s_wxluatag_wxScrollWinEvent; + extern int s_wxluatag_wxSetCursorEvent; extern int s_wxluatag_wxSizeEvent; extern int s_wxluatag_wxStringClientData; *************** *** 848,851 **** --- 856,862 ---- extern int s_wxluatag_wxVisualAttributes; extern int s_wxluatag_wxWindow; + extern int s_wxluatag_wxWindowCreateEvent; + extern int s_wxluatag_wxWindowDestroyEvent; + extern int s_wxluatag_wxWindowDisabler; #if wxCHECK_VERSION(2,3,0) *************** *** 913,916 **** --- 924,928 ---- #if wxLUA_USE_wxButton extern int s_wxluatag_wxButton; + extern int s_wxluatag_wxToggleButton; #endif *************** *** 920,923 **** --- 932,936 ---- extern int s_wxluatag_wxCalendarDateAttr; extern int s_wxluatag_wxCalendarEvent; + extern int s_wxluatag_wxDateEvent; #endif *************** *** 1000,1006 **** --- 1013,1022 ---- #if wxLUA_USE_wxDC + extern int s_wxluatag_wxBufferedDC; + extern int s_wxluatag_wxBufferedPaintDC; extern int s_wxluatag_wxClientDC; extern int s_wxluatag_wxDC; extern int s_wxluatag_wxMemoryDC; + extern int s_wxluatag_wxMirrorDC; extern int s_wxluatag_wxPaintDC; extern int s_wxluatag_wxScreenDC; *************** *** 1739,1742 **** --- 1755,1760 ---- extern WXLUAMETHOD* wxActivateEvent_methods; extern int wxActivateEvent_methodCount; + extern WXLUAMETHOD* wxBusyCursor_methods; + extern int wxBusyCursor_methodCount; extern WXLUAMETHOD* wxClientData_methods; extern int wxClientData_methodCount; *************** *** 1757,1760 **** --- 1775,1780 ---- extern WXLUAMETHOD* wxGDIObject_methods; extern int wxGDIObject_methodCount; + extern WXLUAMETHOD* wxIconizeEvent_methods; + extern int wxIconizeEvent_methodCount; extern WXLUAMETHOD* wxIdleEvent_methods; extern int wxIdleEvent_methodCount; *************** *** 1769,1772 **** --- 1789,1796 ---- extern WXLUAMETHOD* wxLuaState_methods; extern int wxLuaState_methodCount; + extern WXLUAMETHOD* wxMaximizeEvent_methods; + extern int wxMaximizeEvent_methodCount; + extern WXLUAMETHOD* wxMouseCaptureChangedEvent_methods; + extern int wxMouseCaptureChangedEvent_methodCount; extern WXLUAMETHOD* wxMouseEvent_methods; extern int wxMouseEvent_methodCount; *************** *** 1789,1792 **** --- 1813,1818 ---- extern WXLUAMETHOD* wxScrollWinEvent_methods; extern int wxScrollWinEvent_methodCount; + extern WXLUAMETHOD* wxSetCursorEvent_methods; + extern int wxSetCursorEvent_methodCount; extern WXLUAMETHOD* wxSizeEvent_methods; extern int wxSizeEvent_methodCount; *************** *** 1801,1804 **** --- 1827,1836 ---- extern WXLUAMETHOD* wxWindow_methods; extern int wxWindow_methodCount; + extern WXLUAMETHOD* wxWindowCreateEvent_methods; + extern int wxWindowCreateEvent_methodCount; + extern WXLUAMETHOD* wxWindowDestroyEvent_methods; + extern int wxWindowDestroyEvent_methodCount; + extern WXLUAMETHOD* wxWindowDisabler_methods; + extern int wxWindowDisabler_methodCount; #if wxCHECK_VERSION(2,3,0) *************** *** 1889,1892 **** --- 1921,1926 ---- extern WXLUAMETHOD* wxButton_methods; extern int wxButton_methodCount; + extern WXLUAMETHOD* wxToggleButton_methods; + extern int wxToggleButton_methodCount; #endif *************** *** 1899,1902 **** --- 1933,1938 ---- extern WXLUAMETHOD* wxCalendarEvent_methods; extern int wxCalendarEvent_methodCount; + extern WXLUAMETHOD* wxDateEvent_methods; + extern int wxDateEvent_methodCount; #endif *************** *** 1999,2002 **** --- 2035,2042 ---- #if wxLUA_USE_wxDC + extern WXLUAMETHOD* wxBufferedDC_methods; + extern int wxBufferedDC_methodCount; + extern WXLUAMETHOD* wxBufferedPaintDC_methods; + extern int wxBufferedPaintDC_methodCount; extern WXLUAMETHOD* wxClientDC_methods; extern int wxClientDC_methodCount; *************** *** 2005,2008 **** --- 2045,2050 ---- extern WXLUAMETHOD* wxMemoryDC_methods; extern int wxMemoryDC_methodCount; + extern WXLUAMETHOD* wxMirrorDC_methods; + extern int wxMirrorDC_methodCount; extern WXLUAMETHOD* wxPaintDC_methods; extern int wxPaintDC_methodCount; *************** *** 2743,2747 **** --- 2785,2791 ---- + wxLUA_DECLARE_ENCAPSULATION(wxBusyCursor) wxLUA_DECLARE_ENCAPSULATION(wxProcess) + wxLUA_DECLARE_ENCAPSULATION(wxWindowDisabler) #if wxCHECK_VERSION(2,7,0) |
|
From: John L. <jr...@us...> - 2006-05-16 03:42:06
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1431/website Modified Files: docs.php Log Message: add wxlua reference Index: docs.php =================================================================== RCS file: /cvsroot/wxlua/website/docs.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** docs.php 3 May 2006 04:40:18 -0000 1.11 --- docs.php 16 May 2006 03:42:02 -0000 1.12 *************** *** 10,13 **** --- 10,15 ---- <p>Read the <a href="docs/wxlua.html">wxLua documentation</a> that describes programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> + <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of classes + and datatypes from wxWidgets that wxLua wraps.</p> <h1 id="lua">Lua documentation</h1> |
|
From: John L. <jr...@us...> - 2006-05-16 03:35:37
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31804/website Modified Files: updatesite.sh Log Message: use new sf cvs server Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** updatesite.sh 13 May 2006 22:37:07 -0000 1.17 --- updatesite.sh 16 May 2006 03:35:34 -0000 1.18 *************** *** 1,8 **** #!/bin/sh # $Id$ - #export CVSROOT=:pserver:ano...@wx...:/cvsroot/wxlua - # supposedly sourceforge will keep anonymous CVS in sync w/ devel CVS now and cvs1 is gone - export CVSROOT=:pserver:anonymous@cvs1:/cvsroot/wxlua echo Checking out website to htdocs dir from CVS --- 1,6 ---- #!/bin/sh # $Id$ + export CVSROOT=:pserver:ano...@wx...s:/cvsroot/wxlua echo Checking out website to htdocs dir from CVS |
|
From: John L. <jr...@us...> - 2006-05-16 03:32:31
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30482/wxLua/bindings Added Files: genidocs.lua Log Message: add generated reference manual based on the .i files --- NEW FILE: genidocs.lua --- ------------------------------------------------------------------------------- -- Name: genidocs.lua -- Purpose: This script generates docs from the wxLua interface files -- Author: John Labenski -- Created: 19/05/2006 -- Copyright: John Labenski -- Licence: wxWidgets licence ------------------------------------------------------------------------------- wxClassRef = {} typeDefs = {} -- filled from the data cache files dataTypes = {} conditions = {} classColour = "AA0000" enumColour = "008800" defineColour = "0000EE" eventColour = "AA00AA" propColour = "000088" memberColour = "008888" renameColour = "FF0000" overrideColour = "AA8800" --<a name="papers">Papers</a> --<a href="#papers">papers</a> function MakeColour(name, color) -- color is "RRGGBB" in hex return "<font color=#"..color..">"..name.."</font>" end function MakeBold(name) return "<b>"..name.."</b>" end function MakeItalic(name) return "<i>"..name.."</i>" end function MakeLink(name) return "<a href=\"#"..name.."\">"..name.."</a>" end function MakeTag(name) return "<b><a name=\""..name.."\">"..name.."</a></b>" end function GenerateHeader(fileTable) table.insert(fileTable, "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">") table.insert(fileTable, "<html>") table.insert(fileTable, "<head>") table.insert(fileTable, "<meta content=\"text/html; charset=ISO-8859-1\" http-equiv=\"content-type\">") table.insert(fileTable, "<title>wxLua Class Reference</title>") table.insert(fileTable, "<meta content=\"John Labenski\" name=\"author\">") table.insert(fileTable, "</head>") table.insert(fileTable, "<body>") table.insert(fileTable, "<h1>wxLua Class Reference for wxWidgets 2.6.3</h1>") return fileTable end function GenerateFooter(fileTable) table.insert(fileTable, "</body>") table.insert(fileTable, "</html>") return fileTable end function GenerateClassReference(fileTable) local names = {} table.insert(fileTable, "<h2>wxWidgets Classes</h2>") local allClasses = {} for k, v in pairs(wxClassRef) do allClasses[k] = false -- wxWidgets classes end for k, v in pairs(dataTypes) do if v.DefType == "class" then allClasses[k] = true -- the ones we wrap end end for k, v in pairs(allClasses) do table.insert(names, k) end table.sort(names) for n = 1, #names do if allClasses[names[n]] then table.insert(fileTable, MakeLink(names[n]).."<br>") else table.insert(fileTable, names[n].." - NOT WRAPPED<br>") end end table.insert(fileTable, "<br>") return fileTable end function GenerateEnumReference(fileTable) local names = {} table.insert(fileTable, "<h2>wxWidgets Enums</h2>") for k, v in pairs(dataTypes) do if v.DefType == "enum" then table.insert(names, k) end end table.sort(names) for n = 1, #names do table.insert(fileTable, MakeLink(names[n]).."<br>") end table.insert(fileTable, "<br>") return fileTable end local nameChars = {} -- valid chars for C variables for function names for n = string.byte("a"), string.byte("z") do nameChars[n] = true end for n = string.byte("A"), string.byte("Z") do nameChars[n] = true end for n = string.byte("0"), string.byte("9") do nameChars[n] = true end nameChars[string.byte("_")] = true nameChars[string.byte(":")] = true function GetPreviousWord(str, pos) local start_pos = 0 for n = pos, 0, -1 do if not nameChars[string.byte(str, n)] then start_pos = n+1 break end end return string.sub(str, start_pos, pos), start_pos end function ReadInterfaceFiles(fileTable) table.insert(fileTable, "<h2>Interface files</h2>") local strSp = string.byte(" ") local idx = 0 while interface_fileTable[idx+1] do idx = idx + 1 table.insert(fileTable, "<HR>\n<h2>"..interface_fileTable[idx].."</h2>") local filename = interface_filepath.."/"..interface_fileTable[idx] for line in io.lines(filename) do local cname = "" local out_line = line local comment_pos = string.find(line, "//", 1, 1) or 1E6 local class_pos = string.find(line, "%class", 1, 1) local enum_pos = string.find(line, "%enum", 1, 1) local start_block = false local end_block = false if (class_pos and class_pos < comment_pos) or (enum_pos and enum_pos < comment_pos) then start_block = true -- find this class not the base class local comma = string.find(line, ",", 1, 1) local start_pos = 0 if comma then cname, start_pos = GetPreviousWord(line, comma-1) else cname, start_pos = GetPreviousWord(line, string.len(line)) end out_line = "<font size=+1>"..string.sub(out_line, 1, start_pos-1)..MakeTag(cname)..string.sub(out_line, start_pos+string.len(cname)).."</font>" if class_pos then out_line = MakeColour(out_line, classColour) end if enum_pos then out_line = "<font color=#"..enumColour..">"..out_line end else -- priortize the colouring so we don't have to check for every single case local endclass_pos = string.find(line, "%endclass", 1, 1) local endenum_pos = string.find(line, "%endenum", 1, 1) if (endclass_pos and endclass_pos < comment_pos) or (endenum_pos and endenum_pos < comment_pos) then if endclass_pos then out_line = MakeColour(out_line, classColour) end if endenum_pos then out_line = out_line.."</font>" end end_block = true else local prop_pos = string.find(line, "%property", 1, 1) if (prop_pos and prop_pos < comment_pos) then out_line = MakeColour(out_line, propColour) else local member_pos = string.find(line, "%member", 1, 1) if (member_pos and member_pos < comment_pos) then out_line = MakeColour(out_line, memberColour) else local rename_pos = string.find(line, "%rename", 1, 1) if (rename_pos and rename_pos < comment_pos) then out_line = MakeColour(out_line, renameColour) else local override_pos = string.find(line, "%override", 1, 1) if override_pos then -- always commented in the .i files out_line = MakeColour(out_line, overrideColour) else local event_pos = string.find(line, "%event", 1, 1) if (event_pos and event_pos < comment_pos) then out_line = MakeColour(out_line, eventColour) else local define_pos = string.find(line, "%define", 1, 1) if define_pos then out_line = MakeColour(out_line, defineColour) end end end end end end end end local used = {} used[cname] = true for w in string.gmatch(line, "([%w_]+)") do if (not string.find(cname, w, 1, 1)) and (not used[w]) and dataTypes[w] and (dataTypes[w].DefType ~= "builtin") then used[w] = true out_line = string.gsub(out_line, w, MakeLink(w)) end end out_line = string.gsub(out_line, "(%%[%w_]+)", function(s) return "<i>"..s.."</i>" end) --[[ -- alternate to blockquote, just force the spaces local start_spaces = 0 for n = 1, string.len(out_line) do if string.byte(out_line, n) == strSp then start_spaces = start_spaces + 1 else break end end if start_spaces > 0 then out_line = string.rep(" ", start_spaces)..string.sub(out_line, start_spaces) end ]] local tail = "<br>" if start_block then tail = "" -- don't add extra space out_line = out_line.."<blockquote>" elseif end_block then out_line = "</blockquote>"..out_line end table.insert(fileTable, out_line..tail) end end end function LoadwxClassRef() for line in io.lines(interface_filepath.."/".."wxclassref.txt") do for w in string.gmatch(line, "([%w_]+)") do wxClassRef[w] = true end end end function main() -- load rules file if not rulesFilename then print("Warning: No rules filename set!") rulesFilename = "" end local rules = loadfile(rulesFilename) if rules then rules() --print("loaded rules file: "..rulesFilename) end local datatypes_file = loadfile(interface_filepath.."/"..datatypes_cache_output_filename) if datatypes_file then datatypes_file() --print("loaded data types file: "..datatypes_cache_output_filename) end -- load any cached settings from other wrappers if datatype_cache_input_fileTable then for key, filename in pairs(datatype_cache_input_fileTable) do if FileExists(filename) then local cache = loadfile(filename) cache() -- run loaded file print("loaded datatypes cache file: "..filename) else print("unable to load datatypes cache file: "..filename) end end end LoadwxClassRef() fileTable = {} GenerateHeader(fileTable) GenerateClassReference(fileTable) GenerateEnumReference(fileTable) ReadInterfaceFiles(fileTable) GenerateFooter(fileTable) for n = 1, #fileTable do print(fileTable[n]) end end main() |
|
From: John L. <jr...@us...> - 2006-05-16 03:32:31
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30482/wxLua/bindings/wxwidgets Modified Files: Makefile datetime.i gdi.i Added Files: wxclassref.txt Log Message: add generated reference manual based on the .i files Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 3 Feb 2006 17:13:29 -0000 1.5 --- Makefile 16 May 2006 03:32:28 -0000 1.6 *************** *** 20,23 **** --- 20,27 ---- @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) + genidocs: $(DEPFILES) + @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua) + + # do nothing to clean clean: Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** datetime.i 1 May 2006 19:36:30 -0000 1.12 --- datetime.i 16 May 2006 03:32:28 -0000 1.13 *************** *** 132,138 **** %class %delete %noclassinfo %encapsulate wxDateTime // FIXME not updated ! %define %object wxDefaultDateTime ! wxDateTime() %constructor wxDateTimeFromTime(time_t dateTime) %constructor wxDateTimeFromJDN(double dateTime) --- 132,138 ---- %class %delete %noclassinfo %encapsulate wxDateTime // FIXME not updated ! %define %object wxDefaultDateTime ! wxDateTime() %constructor wxDateTimeFromTime(time_t dateTime) %constructor wxDateTimeFromJDN(double dateTime) *************** *** 344,352 **** %enum ! wxCAL_SUNDAY_FIRST ! wxCAL_MONDAY_FIRST ! wxCAL_SHOW_HOLIDAYS ! wxCAL_NO_YEAR_CHANGE ! wxCAL_NO_MONTH_CHANGE wxCAL_SHOW_SURROUNDING_WEEKS wxCAL_SEQUENTIAL_MONTH_SELECTION --- 344,352 ---- %enum ! wxCAL_SUNDAY_FIRST ! wxCAL_MONDAY_FIRST ! wxCAL_SHOW_HOLIDAYS ! wxCAL_NO_YEAR_CHANGE ! wxCAL_NO_MONTH_CHANGE wxCAL_SHOW_SURROUNDING_WEEKS wxCAL_SEQUENTIAL_MONTH_SELECTION Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** gdi.i 2 May 2006 05:25:01 -0000 1.20 --- gdi.i 16 May 2006 03:32:28 -0000 1.21 *************** *** 270,317 **** %enum wxFontEncoding ! wxFONTENCODING_SYSTEM ! wxFONTENCODING_DEFAULT ! wxFONTENCODING_ISO8859_1 ! wxFONTENCODING_ISO8859_2 ! wxFONTENCODING_ISO8859_3 ! wxFONTENCODING_ISO8859_4 ! wxFONTENCODING_ISO8859_5 ! wxFONTENCODING_ISO8859_6 ! wxFONTENCODING_ISO8859_7 ! wxFONTENCODING_ISO8859_8 ! wxFONTENCODING_ISO8859_9 ! wxFONTENCODING_ISO8859_10 ! wxFONTENCODING_ISO8859_11 ! wxFONTENCODING_ISO8859_12 ! wxFONTENCODING_ISO8859_13 ! wxFONTENCODING_ISO8859_14 ! wxFONTENCODING_ISO8859_15 ! wxFONTENCODING_ISO8859_MAX ! wxFONTENCODING_KOI8 ! wxFONTENCODING_ALTERNATIVE ! wxFONTENCODING_BULGARIAN ! wxFONTENCODING_CP437 ! wxFONTENCODING_CP850 ! wxFONTENCODING_CP852 ! wxFONTENCODING_CP855 ! wxFONTENCODING_CP866 ! wxFONTENCODING_CP874 ! %wxchkver23 wxFONTENCODING_CP932 ! %wxchkver23 wxFONTENCODING_CP936 ! %wxchkver23 wxFONTENCODING_CP949 ! %wxchkver23 wxFONTENCODING_CP950 ! wxFONTENCODING_CP1250 ! wxFONTENCODING_CP1251 ! wxFONTENCODING_CP1252 ! wxFONTENCODING_CP1253 ! wxFONTENCODING_CP1254 ! wxFONTENCODING_CP1255 ! wxFONTENCODING_CP1256 ! wxFONTENCODING_CP1257 ! wxFONTENCODING_CP12_MAX ! %wxchkver23 wxFONTENCODING_UTF7 ! %wxchkver23 wxFONTENCODING_UTF8 ! wxFONTENCODING_UNICODE ! wxFONTENCODING_MAX %endenum --- 270,317 ---- %enum wxFontEncoding ! wxFONTENCODING_SYSTEM ! wxFONTENCODING_DEFAULT ! wxFONTENCODING_ISO8859_1 ! wxFONTENCODING_ISO8859_2 ! wxFONTENCODING_ISO8859_3 ! wxFONTENCODING_ISO8859_4 ! wxFONTENCODING_ISO8859_5 ! wxFONTENCODING_ISO8859_6 ! wxFONTENCODING_ISO8859_7 ! wxFONTENCODING_ISO8859_8 ! wxFONTENCODING_ISO8859_9 ! wxFONTENCODING_ISO8859_10 ! wxFONTENCODING_ISO8859_11 ! wxFONTENCODING_ISO8859_12 ! wxFONTENCODING_ISO8859_13 ! wxFONTENCODING_ISO8859_14 ! wxFONTENCODING_ISO8859_15 ! wxFONTENCODING_ISO8859_MAX ! wxFONTENCODING_KOI8 ! wxFONTENCODING_ALTERNATIVE ! wxFONTENCODING_BULGARIAN ! wxFONTENCODING_CP437 ! wxFONTENCODING_CP850 ! wxFONTENCODING_CP852 ! wxFONTENCODING_CP855 ! wxFONTENCODING_CP866 ! wxFONTENCODING_CP874 ! %wxchkver23 wxFONTENCODING_CP932 ! %wxchkver23 wxFONTENCODING_CP936 ! %wxchkver23 wxFONTENCODING_CP949 ! %wxchkver23 wxFONTENCODING_CP950 ! wxFONTENCODING_CP1250 ! wxFONTENCODING_CP1251 ! wxFONTENCODING_CP1252 ! wxFONTENCODING_CP1253 ! wxFONTENCODING_CP1254 ! wxFONTENCODING_CP1255 ! wxFONTENCODING_CP1256 ! wxFONTENCODING_CP1257 ! wxFONTENCODING_CP12_MAX ! %wxchkver23 wxFONTENCODING_UTF7 ! %wxchkver23 wxFONTENCODING_UTF8 ! wxFONTENCODING_UNICODE ! wxFONTENCODING_MAX %endenum *************** *** 319,330 **** // Note: use wxNullFont as the object for static functions ! %define %object wxNullFont ! %rename wxNORMAL_FONT %define %pointer wxLua_wxNORMAL_FONT ! %rename wxSMALL_FONT %define %pointer wxLua_wxSMALL_FONT ! %rename wxITALIC_FONT %define %pointer wxLua_wxITALIC_FONT ! %rename wxSWISS_FONT %define %pointer wxLua_wxSWISS_FONT //wxFont(int pointSize, wxFontFamily family, int style, wxFontWeight weight, const bool underline = false, const wxString& faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ! wxFont(int pointSize, int family, int style, int weight, const bool underline = false, const wxString& faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT) %constructor wxFontCopy(const wxFont& font) --- 319,330 ---- // Note: use wxNullFont as the object for static functions ! %define %object wxNullFont ! %rename wxNORMAL_FONT %define %pointer wxLua_wxNORMAL_FONT ! %rename wxSMALL_FONT %define %pointer wxLua_wxSMALL_FONT ! %rename wxITALIC_FONT %define %pointer wxLua_wxITALIC_FONT ! %rename wxSWISS_FONT %define %pointer wxLua_wxSWISS_FONT //wxFont(int pointSize, wxFontFamily family, int style, wxFontWeight weight, const bool underline = false, const wxString& faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ! wxFont(int pointSize, int family, int style, int weight, const bool underline = false, const wxString& faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT) %constructor wxFontCopy(const wxFont& font) *************** *** 494,498 **** %class %delete wxPen, wxGDIObject ! %define %object wxNullPen %rename wxRED_PEN %define %pointer wxLua_wxRED_PEN // hack for wxWidgets >2.7 wxStockGDI::GetPen %rename wxCYAN_PEN %define %pointer wxLua_wxCYAN_PEN --- 494,498 ---- %class %delete wxPen, wxGDIObject ! %define %object wxNullPen %rename wxRED_PEN %define %pointer wxLua_wxRED_PEN // hack for wxWidgets >2.7 wxStockGDI::GetPen %rename wxCYAN_PEN %define %pointer wxLua_wxCYAN_PEN *************** *** 506,510 **** %rename wxLIGHT_GREY_PEN %define %pointer wxLua_wxLIGHT_GREY_PEN ! %overload wxPen() %overload %constructor wxPenFromColour(const wxColour& colour, int width, int style) %overload %constructor wxPenFromColourName(const wxString& colourName, int width, int style) --- 506,510 ---- %rename wxLIGHT_GREY_PEN %define %pointer wxLua_wxLIGHT_GREY_PEN ! %overload wxPen() %overload %constructor wxPenFromColour(const wxColour& colour, int width, int style) %overload %constructor wxPenFromColourName(const wxString& colourName, int width, int style) *************** *** 559,563 **** %class %delete wxBrush, wxGDIObject ! %define %object wxNullBrush %rename wxBLUE_BRUSH %define %pointer wxLua_wxBLUE_BRUSH // hack for wxWidgets >2.7 wxStockGDI::GetBrush %rename wxGREEN_BRUSH %define %pointer wxLua_wxGREEN_BRUSH --- 559,563 ---- %class %delete wxBrush, wxGDIObject ! %define %object wxNullBrush %rename wxBLUE_BRUSH %define %pointer wxLua_wxBLUE_BRUSH // hack for wxWidgets >2.7 wxStockGDI::GetBrush %rename wxGREEN_BRUSH %define %pointer wxLua_wxGREEN_BRUSH *************** *** 680,686 **** %class %delete wxBitmap, wxGDIObject ! %define %object wxNullBitmap ! %constructor wxDefaultBitmap() %win wxBitmap(void * data, int type, int width, int height, int depth = -1) %constructor wxBitmapCopy(const wxBitmap& bitmap) --- 680,686 ---- %class %delete wxBitmap, wxGDIObject ! %define %object wxNullBitmap ! %constructor wxDefaultBitmap() %win wxBitmap(void * data, int type, int width, int height, int depth = -1) %constructor wxBitmapCopy(const wxBitmap& bitmap) *************** *** 773,780 **** %class %delete wxCursor, wxBitmap // just wxObject in GTK ! %define %object wxNullCursor ! %rename wxSTANDARD_CURSOR %define %pointer wxLua_wxSTANDARD_CURSOR ! %rename wxHOURGLASS_CURSOR %define %pointer wxLua_wxHOURGLASS_CURSOR ! %rename wxCROSS_CURSOR %define %pointer wxLua_wxCROSS_CURSOR %win|%mac wxCursor(const wxString& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0) --- 773,780 ---- %class %delete wxCursor, wxBitmap // just wxObject in GTK ! %define %object wxNullCursor ! %rename wxSTANDARD_CURSOR %define %pointer wxLua_wxSTANDARD_CURSOR ! %rename wxHOURGLASS_CURSOR %define %pointer wxLua_wxHOURGLASS_CURSOR ! %rename wxCROSS_CURSOR %define %pointer wxLua_wxCROSS_CURSOR %win|%mac wxCursor(const wxString& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0) --- NEW FILE: wxclassref.txt --- wxAcceleratorEntry wxAcceleratorTable wxAccessible wxActivateEvent wxApp wxArchiveClassFactory wxArchiveEntry wxArchiveInputStream wxArchiveIterator wxArchiveNotifier wxArchiveOutputStream wxArray wxArrayString wxArtProvider wxAutomationObject wxBitmap wxBitmapButton wxBitmapDataObject wxBitmapHandler wxBoxSizer wxBrush wxBrushList wxBufferedDC wxBufferedPaintDC wxBufferedInputStream wxBufferedOutputStream wxBusyCursor wxBusyInfo wxButton wxCalculateLayoutEvent wxCalendarCtrl wxCalendarDateAttr wxCalendarEvent wxCaret wxCheckBox wxCheckListBox wxChoice wxChoicebook wxClassInfo wxClient wxClientDC wxClientData wxClientDataContainer wxClipboard wxCloseEvent wxCmdLineParser wxColour wxColourData wxColourDatabase wxColourDialog wxComboBox wxCommand wxCommandEvent wxCommandProcessor wxCondition wxConfigBase wxConnection wxContextMenuEvent wxContextHelp wxContextHelpButton wxControl wxControlWithItems wxCountingOutputStream wxCriticalSection wxCriticalSectionLocker wxCSConv wxCursor wxCustomDataObject wxDataFormat wxDataInputStream wxDataObject wxDataObjectComposite wxDataObjectSimple wxDataOutputStream wxDateEvent wxDatePickerCtrl wxDateSpan wxDateTime wxDateTimeHolidayAuthority wxDateTimeWorkDays wxDb wxDbColDataPtr wxDbColDef wxDbColFor wxDbColInf wxDbConnectInf wxDbIdxDef wxDbInf wxDbTable wxDbTableInf wxDbGridColInfo wxDbGridTableBase wxDC wxDCClipper wxDDEClient wxDDEConnection wxDDEServer wxDebugContext wxDebugStreamBuf wxDebugReport wxDebugReportCompress wxDebugReportPreview wxDebugReportPreviewStd wxDebugReportUpload wxDelegateRendererNative wxDialog wxDialUpEvent wxDialUpManager wxDir wxDirDialog wxDirTraverser wxDisplay wxDllLoader wxDocChildFrame wxDocManager wxDocMDIChildFrame wxDocMDIParentFrame wxDocParentFrame wxDocTemplate wxDocument wxDragImage wxDropFilesEvent wxDropSource wxDropTarget wxDynamicLibrary wxDynamicLibraryDetails wxEncodingConverter wxEraseEvent wxEvent wxEvtHandler wxFFile wxFFileInputStream wxFFileOutputStream wxFFileStream wxFile wxFileConfig wxFileDataObject wxFileDialog wxFileDropTarget wxFileHistory wxFileInputStream wxFileName wxFileOutputStream wxFileStream wxFileSystem wxFileSystemHandler wxFileType wxFilterInputStream wxFilterOutputStream wxFindDialogEvent wxFindReplaceData wxFindReplaceDialog wxFlexGridSizer wxFocusEvent wxFont wxFontData wxFontDialog wxFontEnumerator wxFontList wxFontMapper wxFrame wxFSFile wxFTP wxGauge wxGBPosition wxGBSizerItem wxGBSpan wxGDIObject wxGenericDirCtrl wxGenericValidator wxGLCanvas wxGLContext wxGrid wxGridCellAttr wxGridBagSizer wxGridCellBoolEditor wxGridCellChoiceEditor wxGridCellEditor wxGridCellFloatEditor wxGridCellNumberEditor wxGridCellTextEditor wxGridEditorCreatedEvent wxGridEvent wxGridRangeSelectEvent wxGridSizeEvent wxGridCellBoolRenderer wxGridCellFloatRenderer wxGridCellNumberRenderer wxGridCellRenderer wxGridCellStringRenderer wxGridTableBase wxGridSizer wxHashMap wxHashSet wxHashTable wxHelpController wxHelpControllerHelpProvider wxHelpEvent wxHelpProvider wxHtmlCell wxHtmlColourCell wxHtmlContainerCell wxHtmlDCRenderer wxHtmlEasyPrinting wxHtmlFilter wxHtmlHelpController wxHtmlHelpData wxHtmlHelpFrame wxHtmlLinkInfo wxHtmlListBox wxHtmlParser wxHtmlPrintout wxHtmlTag wxHtmlTagHandler wxHtmlTagsModule wxHtmlWidgetCell wxHtmlWindow wxHtmlWinParser wxHtmlWinTagHandler wxHTTP wxIcon wxIconBundle wxIconLocation wxIconizeEvent wxIdleEvent wxImage wxImageHandler wxImageList wxIndividualLayoutConstraint wxInitDialogEvent wxInputStream wxIPaddress wxIPV4address wxJoystick wxJoystickEvent wxKeyEvent wxLayoutAlgorithm wxLayoutConstraints wxList wxListbook wxListBox wxListCtrl wxListEvent wxListItem wxListItemAttr wxListView wxLocale wxLog wxLogChain wxLogGui wxLogNull wxLogPassThrough wxLogStderr wxLogStream wxLogTextCtrl wxLogWindow wxLongLong wxMask wxMaximizeEvent wxMBConv wxMBConvFile wxMBConvUTF7 wxMBConvUTF8 wxMBConvUTF16 wxMBConvUTF32 wxMDIChildFrame wxMDIClientWindow wxMDIParentFrame wxMediaCtrl wxMediaEvent wxMemoryBuffer wxMemoryDC wxMemoryFSHandler wxMemoryInputStream wxMemoryOutputStream wxMenu wxMenuBar wxMenuEvent wxMenuItem wxMessageDialog wxMetafile wxMetafileDC wxMimeTypesManager wxMiniFrame wxMirrorDC wxModule wxMouseCaptureChangedEvent wxMouseEvent wxMoveEvent wxMultiChoiceDialog wxMutex wxMutexLocker wxNode wxNotebook wxNotebookEvent wxNotebookSizer wxNotifyEvent wxObject wxObjectRefData wxOutputStream wxPageSetupDialog wxPageSetupDialogData wxPaintDC wxPaintEvent wxPalette wxPanel wxPasswordEntryDialog wxPathList wxPen wxPenList wxPoint wxPostScriptDC wxPreviewCanvas wxPreviewControlBar wxPreviewFrame wxPrintData wxPrintDialog wxPrintDialogData wxPrinter wxPrinterDC wxPrintout wxPrintPreview wxProcess wxProcessEvent wxProgressDialog wxPropertySheetDialog wxProtocol wxQuantize wxQueryLayoutInfoEvent wxRadioBox wxRadioButton wxRealPoint wxRect wxRecursionGuard wxRecursionGuardFlag wxRegEx wxRegion wxRegionIterator wxRegKey wxRendererNative wxRendererVersion wxSashEvent wxSashLayoutWindow wxSashWindow wxScopedArray wxScopedPtr wxScopedTiedPtr wxScreenDC wxScrollBar wxScrolledWindow wxScrollEvent wxScrollWinEvent wxSemaphore wxSetCursorEvent wxServer wxSimpleHelpProvider wxSingleChoiceDialog wxSingleInstanceChecker wxSize wxSizeEvent wxSizer wxSizerFlags wxSizerItem wxSlider wxSockAddress wxSocketBase wxSocketClient wxSocketEvent wxSocketInputStream wxSocketOutputStream wxSocketServer wxSound wxSpinButton wxSpinCtrl wxSpinEvent wxSplashScreen wxSplitterEvent wxSplitterWindow wxSplitterRenderParams wxStackFrame wxStackWalker wxStandardPaths wxStaticBitmap wxStaticBox wxStaticBoxSizer wxStaticLine wxStaticText wxStatusBar wxStdDialogButtonSizer wxStopWatch wxStreamBase wxStreamBuffer wxStreamToTextRedirector wxString wxStringBuffer wxStringBufferLength wxStringClientData wxStringInputStream wxStringOutputStream wxStringTokenizer wxSysColourChangedEvent wxSystemOptions wxSystemSettings wxTaskBarIcon wxTCPClient wxTCPConnection wxTCPServer wxTempFile wxTempFileOutputStream wxTextAttr wxTextCtrl wxTextDataObject wxTextDropTarget wxTextEntryDialog wxTextFile wxTextInputStream wxTextOutputStream wxTextValidator wxThread wxThreadHelper wxTimer wxTimerEvent wxTimeSpan wxTipProvider wxTipWindow wxToggleButton wxToolBar wxToolTip wxTopLevelWindow wxTreeCtrl wxTreeEvent wxTreeItemData wxUpdateUIEvent wxURI wxURL wxValidator wxVariant wxVariantData wxView wxVListBox wxVScrolledWindow wxWindow wxWindowCreateEvent wxWindowDC wxWindowDestroyEvent wxWindowDisabler wxWizard wxWizardEvent wxWizardPage wxWizardPageSimple wxXmlResource wxXmlResourceHandler wxZipClassFactory wxZipEntry wxZipInputStream wxZipNotifier wxZipOutputStream wxZlibInputStream wxZlibOutputStream |
