Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10976/wxLua/bindings/wxwidgets
Modified Files:
defsutil.i html.i wx_datatypes.lua
Log Message:
add wxVERSION and WXLUA_XXX_VERSION bindings and use them in the About dialog for the samples
Cleanup samples for readability
Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** defsutil.i 24 Aug 2006 05:12:27 -0000 1.27
--- defsutil.i 20 Sep 2006 04:07:37 -0000 1.28
***************
*** 290,293 ****
--- 290,316 ----
//-----------------------------------------------------------------------------
+ // wxWidgets version defines
+
+ %define wxMAJOR_VERSION
+ %define wxMINOR_VERSION
+ %define wxRELEASE_NUMBER
+ %define wxSUBRELEASE_NUMBER
+ %define %string wxVERSION_STRING
+
+ %function bool wxCHECK_VERSION(int major, int minor, int release) // actually a define
+ %function bool wxCHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define
+
+ %define wxABI_VERSION
+
+ //-----------------------------------------------------------------------------
+ // wxLua version defines
+
+ %define WXLUA_MAJOR_VERSION
+ %define WXLUA_MINOR_VERSION
+ %define WXLUA_RELEASE_VERSION
+ %define WXLUA_SUBRELEASE_VERSION
+ %define %string WXLUA_VERSION_STRING
+
+ //-----------------------------------------------------------------------------
// wxLua platform defines - FIXME add simple method wxPlatform returning unix, msw, ...
Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wx_datatypes.lua 26 May 2006 20:22:09 -0000 1.34
--- wx_datatypes.lua 20 Sep 2006 04:07:37 -0000 1.35
***************
*** 1484,1487 ****
--- 1484,1499 ----
Name = "wxHtmlWindow",
},
+ wxHtmlWindowInterface = {
+ Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)",
+ DefType = "class",
+ Intrinsic = false,
+ Name = "wxHtmlWindowInterface",
+ },
+ ["wxHtmlWindowInterface::HTMLCursor"] = {
+ Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)",
+ DefType = "enum",
+ Intrinsic = true,
+ Name = "wxHtmlWindowInterface::HTMLCursor",
+ },
wxICOHandler = {
BaseClass = "wxBMPHandler",
Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** html.i 24 Aug 2006 05:12:27 -0000 1.10
--- html.i 20 Sep 2006 04:07:37 -0000 1.11
***************
*** 262,265 ****
--- 262,266 ----
wxColour GetLinkColor() const
//wxFontEncoding GetOutputEncoding() const
+ %wxchkver27 wxHtmlWindowInterface *GetWindowInterface()
!%wxchkver27 wxWindow* GetWindow()
wxHtmlContainerCell* OpenContainer()
***************
*** 296,299 ****
--- 297,327 ----
//-----------------------------------------------------------------------------
+ // wxHtmlWindowInterface
+
+ %if %wxchkver27
+
+ %enum wxHtmlWindowInterface::HTMLCursor
+ HTMLCursor_Default
+ HTMLCursor_Link
+ HTMLCursor_Text
+ %endenum
+
+ %class %noclassinfo wxHtmlWindowInterface
+
+ virtual void SetHTMLWindowTitle(const wxString& title)
+ virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link)
+ //virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, const wxString& url, wxString *redirect) const
+ virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, const wxPoint& pos) const
+ virtual wxWindow* GetHTMLWindow()
+ virtual wxColour GetHTMLBackgroundColour() const
+ virtual void SetHTMLBackgroundColour(const wxColour& clr)
+ virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg)
+ virtual void SetHTMLStatusText(const wxString& text)
+ virtual wxCursor GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor type) const
+ %endclass
+
+ %endif
+
+ //-----------------------------------------------------------------------------
// wxHtmlDCRenderer
|
