Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.40, 1.41 controls.i, 1.41, 1.42 data.i, 1.35, 1.36 html.i, 1.25, 1.26 override.hpp, 1.78, 1.79 windows.i, 1.44, 1.45 wx_datatypes.lua, 1.71, 1.72
|
From: John L. <jr...@us...> - 2007-06-18 19:52:02
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/bindings/wxwidgets Modified Files: appframe.i controls.i data.i html.i override.hpp windows.i wx_datatypes.lua Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** wx_datatypes.lua 18 Jun 2007 14:54:58 -0000 1.71 --- wx_datatypes.lua 18 Jun 2007 19:51:26 -0000 1.72 *************** *** 1747,1750 **** --- 1747,1764 ---- Name = "wxHtmlCell", }, + wxHtmlCellEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlCellEvent", + }, + wxHtmlColourCell = { + BaseClass = "wxHtmlCell", + Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlColourCell", + }, wxHtmlContainerCell = { BaseClass = "wxHtmlCell", *************** *** 1768,1771 **** --- 1782,1792 ---- Name = "wxHtmlEasyPrinting", }, + wxHtmlFontCell = { + BaseClass = "wxHtmlCell", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlFontCell", + }, wxHtmlHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 1783,1787 **** }, wxHtmlLinkInfo = { ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1804,1808 ---- }, wxHtmlLinkInfo = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1790,1794 **** wxHtmlParser = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1811,1815 ---- wxHtmlParser = { BaseClass = "wxObject", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1804,1808 **** wxHtmlTag = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1825,1829 ---- wxHtmlTag = { BaseClass = "wxObject", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1818,1822 **** wxHtmlWinParser = { BaseClass = "wxHtmlParser", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1839,1843 ---- wxHtmlWinParser = { BaseClass = "wxHtmlParser", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1825,1829 **** wxHtmlWindow = { BaseClass = "wxScrolledWindow", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1846,1850 ---- wxHtmlWindow = { BaseClass = "wxScrolledWindow", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1831,1835 **** }, wxHtmlWindowInterface = { ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 1852,1856 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1837,1845 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, Name = "wxHtmlWindowInterface::HTMLCursor", }, wxICOHandler = { BaseClass = "wxBMPHandler", --- 1858,1880 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, Name = "wxHtmlWindowInterface::HTMLCursor", }, + wxHyperlinkCtrl = { + BaseClass = "wxControl", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl", + DefType = "class", + IsNumber = false, + Name = "wxHyperlinkCtrl", + }, + wxHyperlinkEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl", + DefType = "class", + IsNumber = false, + Name = "wxHyperlinkEvent", + }, wxICOHandler = { BaseClass = "wxBMPHandler", *************** *** 3042,3046 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 3077,3081 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 3217,3220 **** --- 3252,3268 ---- Name = "wxSplitterWindow", }, + wxStandardPaths = { + Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxStandardPaths", + }, + ["wxStandardPaths::ResourceCat"] = { + Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", + DefType = "enum", + IsNumber = true, + Name = "wxStandardPaths::ResourceCat", + }, wxStaticBitmap = { BaseClass = "wxControl", *************** *** 3314,3317 **** --- 3362,3376 ---- Name = "wxStringClientData", }, + wxStringTokenizer = { + BaseClass = "wxObject", + DefType = "class", + IsNumber = false, + Name = "wxStringTokenizer", + }, + wxStringTokenizerMode = { + DefType = "enum", + IsNumber = true, + Name = "wxStringTokenizerMode", + }, wxSysColourChangedEvent = { BaseClass = "wxEvent", *************** *** 3541,3544 **** --- 3600,3617 ---- Name = "wxToolTip", }, + wxToolbook = { + BaseClass = "wxBookCtrlBase", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook", + DefType = "class", + IsNumber = false, + Name = "wxToolbook", + }, + wxToolbookEvent = { + BaseClass = "wxBookCtrlBaseEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook", + DefType = "class", + IsNumber = false, + Name = "wxToolbookEvent", + }, wxTopLevelWindow = { BaseClass = "wxWindow", *************** *** 3594,3597 **** --- 3667,3684 ---- Name = "wxTreeItemIdValue", }, + wxTreebook = { + BaseClass = "wxBookCtrlBase", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook", + DefType = "class", + IsNumber = false, + Name = "wxTreebook", + }, + wxTreebookEvent = { + BaseClass = "wxBookCtrlBaseEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook", + DefType = "class", + IsNumber = false, + Name = "wxTreebookEvent", + }, wxULongLong = { Condition = "wxUSE_LONGLONG", *************** *** 3980,3983 **** --- 4067,4071 ---- wxLUA_USE_wxHelpController = "wxLUA_USE_wxHelpController", wxLUA_USE_wxHtmlHelpController = "wxLUA_USE_wxHtmlHelpController", + wxLUA_USE_wxHyperlinkCtrl = "wxLUA_USE_wxHyperlinkCtrl", wxLUA_USE_wxID_XXX = "wxLUA_USE_wxID_XXX", wxLUA_USE_wxIcon = "wxLUA_USE_wxIcon", *************** *** 4022,4025 **** --- 4110,4114 ---- wxLUA_USE_wxSplashScreen = "wxLUA_USE_wxSplashScreen", wxLUA_USE_wxSplitterWindow = "wxLUA_USE_wxSplitterWindow", + wxLUA_USE_wxStandardPaths = "wxLUA_USE_wxStandardPaths", wxLUA_USE_wxStaticBitmap = "wxLUA_USE_wxStaticBitmap", wxLUA_USE_wxStaticBox = "wxLUA_USE_wxStaticBox", *************** *** 4039,4044 **** --- 4128,4135 ---- wxLUA_USE_wxToggleButton = "wxLUA_USE_wxToggleButton", wxLUA_USE_wxToolbar = "wxLUA_USE_wxToolbar", + wxLUA_USE_wxToolbook = "wxLUA_USE_wxToolbook", wxLUA_USE_wxTooltip = "wxLUA_USE_wxTooltip", wxLUA_USE_wxTreeCtrl = "wxLUA_USE_wxTreeCtrl", + wxLUA_USE_wxTreebook = "wxLUA_USE_wxTreebook", wxLUA_USE_wxValidator = "wxLUA_USE_wxValidator", wxLUA_USE_wxWave = "wxLUA_USE_wxWave", *************** *** 4115,4118 **** --- 4206,4210 ---- wxUSE_HOTKEY = "wxUSE_HOTKEY", wxUSE_HTML = "wxUSE_HTML", + wxUSE_HYPERLINKCTRL = "wxUSE_HYPERLINKCTRL", wxUSE_ICO_CUR = "wxUSE_ICO_CUR", wxUSE_IFF = "wxUSE_IFF", *************** *** 4214,4217 **** --- 4306,4310 ---- wxUSE_TOOLBAR = "wxUSE_TOOLBAR", wxUSE_TOOLBAR_NATIVE = "wxUSE_TOOLBAR_NATIVE", + wxUSE_TOOLBOOK = "wxUSE_TOOLBOOK", wxUSE_TOOLTIPS = "wxUSE_TOOLTIPS", wxUSE_TREECTRL = "wxUSE_TREECTRL", Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** windows.i 18 Jun 2007 14:54:58 -0000 1.44 --- windows.i 18 Jun 2007 19:51:26 -0000 1.45 *************** *** 604,607 **** --- 604,680 ---- // --------------------------------------------------------------------------- + // wxTreebook + + %if %wxchkver_2_8 && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + + %include "wx/treebook.h" + + %class wxTreebook, wxBookCtrlBase + wxTreebook() + wxTreebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBK_DEFAULT, const wxString& name = "wxTreebook") + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBK_DEFAULT,const wxString& name = "wxTreebook") + + virtual bool InsertPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool InsertSubPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool AddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool DeletePage(size_t pos); + virtual bool IsNodeExpanded(size_t pos) const; + + virtual bool ExpandNode(size_t pos, bool expand = true); + bool CollapseNode(size_t pos) + int GetPageParent(size_t pos) const; + wxTreeCtrl* GetTreeCtrl() const + %endclass + + // --------------------------------------------------------------------------- + // wxTreebookEvent + + %class %delete wxTreebookEvent, wxBookCtrlBaseEvent + %define_event wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED // EVT_TREEBOOK_PAGE_CHANGED(winid, fn) + %define_event wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING // EVT_TREEBOOK_PAGE_CHANGING(winid, fn) + %define_event wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED // EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) + %define_event wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED // EVT_TREEBOOK_NODE_EXPANDED(winid, fn) + + wxTreebookEvent(const wxTreebookEvent& event) + wxTreebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) + + %endclass + + %endif // %wxchkver_2_8 && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + + // --------------------------------------------------------------------------- + // wxToolbook + + %if %wxchkver_2_8 && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + %include "wx/toolbook.h" + + %class wxToolbook, wxBookCtrlBase + wxToolbook() + wxToolbook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxToolbook") + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxToolbook") + + wxToolBarBase* GetToolBar() const + // must be called in OnIdle or by application to realize the toolbar and select the initial page. + void Realize(); + + %endclass + + // --------------------------------------------------------------------------- + // wxToolbookEvent + + %class %delete wxToolbookEvent, wxBookCtrlBaseEvent + %define_event wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED // EVT_TOOLBOOK_PAGE_CHANGED(winid, fn) + %define_event wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING // EVT_TOOLBOOK_PAGE_CHANGING(winid, fn) + + wxToolbookEvent(const wxToolbookEvent& event) + wxToolbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) + + %endclass + + %endif // %wxchkver_2_8 && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + // --------------------------------------------------------------------------- // wxTabCtrl Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** html.i 18 Jun 2007 02:56:24 -0000 1.25 --- html.i 18 Jun 2007 19:51:26 -0000 1.26 *************** *** 61,110 **** // wxHtmlWidgetCell %class wxHtmlWidgetCell, wxHtmlCell wxHtmlWidgetCell(wxWindow* wnd, int w = 0) %endclass - // --------------------------------------------------------------------------- - // wxHtmlLinkInfo - - %include "wx/html/htmlcell.h" - - %class %noclassinfo wxHtmlLinkInfo - wxHtmlLinkInfo(const wxString& href, const wxString& target = "") - - const wxMouseEvent * GetEvent() - const wxHtmlCell * GetHtmlCell() - wxString GetHref() - wxString GetTarget() - %endclass - - // --------------------------------------------------------------------------- - // wxHtmlTag - - %include "wx/html/htmltag.h" - - %class wxHtmlTag, wxObject - //wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache) - - const wxString GetAllParams() const - int GetBeginPos() const - int GetEndPos1() const - int GetEndPos2() const - wxString GetName() const - wxString GetParam(const wxString& par, bool with_commas = false) const - - // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const - // C++ Func: bool GetParamAsColour(const wxString& par, wxColour *clr) const - bool GetParamAsColour(const wxString& par) const - - // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const - // C++ Func: bool GetParamAsInt(const wxString& par, int *value) const - bool GetParamAsInt(const wxString& par) const - - bool HasEnding() const - bool HasParam(const wxString& par) const - //bool IsEnding() const - //wxString ScanParam(const wxString& par, const wxString &format, void *value) const - %endclass // --------------------------------------------------------------------------- --- 61,70 ---- // wxHtmlWidgetCell + %include "wx/html/htmlcell.h" + %class wxHtmlWidgetCell, wxHtmlCell wxHtmlWidgetCell(wxWindow* wnd, int w = 0) %endclass // --------------------------------------------------------------------------- *************** *** 153,156 **** --- 113,213 ---- // --------------------------------------------------------------------------- + // wxHtmlColourCell + + %if %wxchkver_2_8 + + %include "wx/html/htmlcell.h" + + %class wxHtmlColourCell, wxHtmlCell + wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) + + //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); + //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info); + %endclass + + %endif // %wxchkver_2_8 + + // --------------------------------------------------------------------------- + // wxHtmlFontCell + + %if %wxchkver_2_8 + + %include "wx/html/htmlcell.h" + + %class wxHtmlFontCell, wxHtmlCell + wxHtmlFontCell(wxFont *font) + + //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); + //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info); + %endclass + + %endif // %wxchkver_2_8 + + // --------------------------------------------------------------------------- + // wxHtmlCellEvent + + %if %wxchkver_2_8 + + %include "wx/html/htmlwin.h" + + %class %delete wxHtmlCellEvent, wxCommandEvent + wxHtmlCellEvent() + wxHtmlCellEvent(wxEventType commandType, int id, wxHtmlCell *cell, const wxPoint &pt, const wxMouseEvent &ev) + + wxHtmlCell* GetCell() const + wxPoint GetPoint() const + wxMouseEvent GetMouseEvent() const + + void SetLinkClicked(bool linkclicked) + bool GetLinkClicked() const + %endclass + + %endif // %wxchkver_2_8 + + + // --------------------------------------------------------------------------- + // wxHtmlLinkInfo + + %include "wx/html/htmlcell.h" + + %class %noclassinfo wxHtmlLinkInfo + wxHtmlLinkInfo(const wxString& href, const wxString& target = "") + + const wxMouseEvent * GetEvent() + const wxHtmlCell * GetHtmlCell() + wxString GetHref() + wxString GetTarget() + %endclass + + // --------------------------------------------------------------------------- + // wxHtmlTag + + %include "wx/html/htmltag.h" + + %class wxHtmlTag, wxObject + //wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache) + + const wxString GetAllParams() const + int GetBeginPos() const + int GetEndPos1() const + int GetEndPos2() const + wxString GetName() const + wxString GetParam(const wxString& par, bool with_commas = false) const + + // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const + // C++ Func: bool GetParamAsColour(const wxString& par, wxColour *clr) const + bool GetParamAsColour(const wxString& par) const + + // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const + // C++ Func: bool GetParamAsInt(const wxString& par, int *value) const + bool GetParamAsInt(const wxString& par) const + + bool HasEnding() const + bool HasParam(const wxString& par) const + //bool IsEnding() const + //wxString ScanParam(const wxString& par, const wxString &format, void *value) const + %endclass + + // --------------------------------------------------------------------------- // wxHtmlWindow Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** override.hpp 18 Jun 2007 02:56:24 -0000 1.78 --- override.hpp 18 Jun 2007 19:51:26 -0000 1.79 *************** *** 142,145 **** --- 142,160 ---- %end + %override wxLua_wxStandardPaths_Get + // static wxStandardPaths& Get(); + static int LUACALL wxLua_wxStandardPaths_Get(lua_State *L) + { + wxLuaState wxlState(L); + wxStandardPathsBase *returns; + // call Get + returns = &wxStandardPaths::Get(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxStandardPaths, returns); + + return 1; + } + %end + // ---------------------------------------------------------------------------- // Overrides for clipdrag.i Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** controls.i 18 Jun 2007 02:56:23 -0000 1.41 --- controls.i 18 Jun 2007 19:51:26 -0000 1.42 *************** *** 1301,1302 **** --- 1301,1351 ---- %endif //wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG + + // --------------------------------------------------------------------------- + // wxHyperlinkCtrl + + %if %wxchkver_2_8 && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + + %include "wx/hyperlink.h" + + %define wxHL_CONTEXTMENU + %define wxHL_ALIGN_LEFT + %define wxHL_ALIGN_RIGHT + %define wxHL_ALIGN_CENTRE + %define wxHL_DEFAULT_STYLE // (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE) + + %class wxHyperlinkCtrl, wxControl + wxHyperlinkCtrl() + wxHyperlinkCtrl(wxWindow *parent, wxWindowID id, const wxString& label, const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const wxString& name = "wxHyperlinkCtrl") + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const wxString& name = "wxHyperlinkCtrl"); + + wxColour GetHoverColour() const + void SetHoverColour(const wxColour &colour) + + wxColour GetNormalColour() const + void SetNormalColour(const wxColour &colour); + + wxColour GetVisitedColour() const + void SetVisitedColour(const wxColour &colour); + + wxString GetURL() const + void SetURL (const wxString &url) + + void SetVisited(bool visited = true) + bool GetVisited() const + %endclass + + // --------------------------------------------------------------------------- + // wxHyperlinkEvent + + %class %delete wxHyperlinkEvent, wxCommandEvent + %define_event wxEVT_COMMAND_HYPERLINK // EVT_HYPERLINK(id, fn) + + //wxHyperlinkEvent() + wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url) + + wxString GetURL() const + void SetURL(const wxString &url) + %endclass + + %endif // %wxchkver_2_8 && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** appframe.i 18 Jun 2007 02:56:23 -0000 1.40 --- appframe.i 18 Jun 2007 19:51:26 -0000 1.41 *************** *** 621,624 **** --- 621,668 ---- %endif //wxLUA_USE_wxSystemOptions + + // --------------------------------------------------------------------------- + // wxStandardPaths + + %if %wxchkver_2_8 && wxLUA_USE_wxStandardPaths + + %include "wx/stdpaths.h" + + %enum wxStandardPaths::ResourceCat + ResourceCat_None // no special category + ResourceCat_Messages // message catalog resources + ResourceCat_Max // end of enum marker + %endenum + + + %class %delete %noclassinfo %encapsulate wxStandardPaths // we ignore wxStandardPathsBase + // No constructor - use Get() function + + // return the global standard paths object + // %override static wxStandardPaths& Get(); + // C++ Func: static wxStandardPathsBase& Get(); + // We pretend that there is no wxStandardPathsBase and just use the wxStandardPaths name + static wxStandardPaths& Get(); + + // These are only for the generic version, probably not ever needed + //void SetInstallPrefix(const wxString& prefix) + //wxString GetInstallPrefix() const + + virtual wxString GetExecutablePath() const + virtual wxString GetConfigDir() const + virtual wxString GetUserConfigDir() const + virtual wxString GetDataDir() const + virtual wxString GetLocalDataDir() const + virtual wxString GetUserDataDir() const + virtual wxString GetUserLocalDataDir() const + virtual wxString GetPluginsDir() const + virtual wxString GetResourcesDir() const + virtual wxString GetLocalizedResourcesDir(const wxString& lang, wxStandardPaths::ResourceCat category = wxStandardPaths::ResourceCat_None) const + virtual wxString GetDocumentsDir() const + virtual wxString GetTempDir() const; + %endclass + + %endif // %wxchkver_2_8 && wxLUA_USE_wxStandardPaths + // --------------------------------------------------------------------------- // wxPlatformInfo Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** data.i 18 Jun 2007 02:56:23 -0000 1.35 --- data.i 18 Jun 2007 19:51:26 -0000 1.36 *************** *** 22,25 **** --- 22,58 ---- // --------------------------------------------------------------------------- + // wxStringTokenizer + + %include "wx/tokenzr.h" + + %enum wxStringTokenizerMode + wxTOKEN_INVALID // set by def ctor until SetString() is called + wxTOKEN_DEFAULT // strtok() for whitespace delims, RET_EMPTY else + wxTOKEN_RET_EMPTY // return empty token in the middle of the string + wxTOKEN_RET_EMPTY_ALL // return trailing empty tokens too + wxTOKEN_RET_DELIMS // return the delim with token (implies RET_EMPTY) + wxTOKEN_STRTOK // behave exactly like strtok(3) + %endenum + + %class %delete %noclassinfo wxStringTokenizer, wxObject + wxStringTokenizer() + wxStringTokenizer(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT); + + void SetString(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT); + + void Reinit(const wxString& str); + size_t CountTokens() const; + bool HasMoreTokens() const; + wxString GetNextToken(); + //wxChar GetLastDelimiter() const + + wxString GetString() const + size_t GetPosition() const + + wxStringTokenizerMode GetMode() const + bool AllowEmpty() const + %endclass + + // --------------------------------------------------------------------------- // wxClientData |
