Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets defsutil.i,1.21,1.22 grid.i,1.7,1.8 override.hpp,1.38,1.39 socket.i,1.6,1.7 wave.i,1.6,1.7 wx_datatypes.lua,1.27,1.28
|
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 |
