Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/wxbind/include Modified Files: wxbinddefs.h wxcore_bind.h wxhtml_bind.h Added Files: wxcore_wxlcore.h wxhtml_wxlhtml.h Removed Files: wxcore_wxlprint.h wxhtml_wxlhtmlwin.h Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxcore_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxcore_bind.h 10 Jan 2008 23:06:26 -0000 1.10 *************** *** 129,133 **** #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) ! #include "wxbind/include/wxcore_wxlprint.h" #include "wxlua/include/wxlua_bind.h" #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) --- 129,133 ---- #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) ! #include "wxbind/include/wxcore_wxlcore.h" #include "wxlua/include/wxlua_bind.h" #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) --- wxhtml_wxlhtmlwin.h DELETED --- --- NEW FILE: wxhtml_wxlhtml.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: Wrappers for wxHTML classes for wxLua // Author: J. Winwood // Created: June 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #ifndef WX_LUA_WXLHTML_H #define WX_LUA_WXLHTML_H #include "wx/html/htmlwin.h" #include "wx/html/htmlcell.h" #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" #if wxLUA_USE_wxHTML // ---------------------------------------------------------------------------- // wxLuaHtmlWindow // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXHTML wxLuaHtmlWindow : public wxHtmlWindow { public: wxLuaHtmlWindow(const wxLuaState& wxlState, wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = wxT("wxLuaHtmlWindow")); virtual ~wxLuaHtmlWindow() {} #if wxCHECK_VERSION(2, 7, 0) virtual bool #else virtual void #endif OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event); virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y); virtual void OnLinkClicked(const wxHtmlLinkInfo& link); virtual void OnSetTitle(const wxString& title); private: wxLuaState m_wxlState; DECLARE_ABSTRACT_CLASS(wxLuaHtmlWindow) }; // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagEvent // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXHTML wxLuaHtmlWinTagEvent : public wxEvent { public: wxLuaHtmlWinTagEvent(wxEventType eventType = wxEVT_NULL); wxLuaHtmlWinTagEvent(const wxLuaHtmlWinTagEvent& event); virtual ~wxLuaHtmlWinTagEvent() {} void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser); const wxHtmlTag* GetHtmlTag() const { return m_pHtmlTag; } wxHtmlWinParser* GetHtmlParser() const { return m_pHtmlParser; } bool GetParseInnerCalled() const { return m_fParseInnerCalled; } void SetParseInnerCalled(bool fParseInnerCalled) { m_fParseInnerCalled = fParseInnerCalled; } protected: virtual wxEvent* Clone() const { return new wxLuaHtmlWinTagEvent(*this); } private: const wxHtmlTag *m_pHtmlTag; wxHtmlWinParser *m_pHtmlParser; bool m_fParseInnerCalled; DECLARE_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent) }; typedef void (wxEvtHandler::*wxLuaHtmlWinTagEventFunction)(wxLuaHtmlWinTagEvent&); BEGIN_DECLARE_EVENT_TYPES() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BINDWXHTML, wxEVT_HTML_TAG_HANDLER, 0) END_DECLARE_EVENT_TYPES() #define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL), #endif // wxLUA_USE_wxHTML #endif //WX_LUA_WXLHTML_H --- wxcore_wxlprint.h DELETED --- Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbinddefs.h 2 Aug 2007 18:25:42 -0000 1.8 --- wxbinddefs.h 10 Jan 2008 23:06:26 -0000 1.9 *************** *** 184,224 **** // ---------------------------------------------------------------------------- ! #define WXLUA_DECLARE_BIND_WXLUA extern WXDLLIMPEXP_WXLUA bool wxLuaBinding_wxlua_init(); // modules/wxlua ! #define WXLUA_DECLARE_BIND_WXLUASOCKET extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket ! #define WXLUA_IMPLEMENT_BIND_WXLUA wxLuaBinding_wxlua_init(); ! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET wxLuaBinding_wxluasocket_init(); - #define WXLUA_DECLARE_BIND_WXBASE extern WXDLLIMPEXP_BINDWXBASE bool wxLuaBinding_wxbase_init(); // modules/wxbind - #define WXLUA_DECLARE_BIND_WXCORE extern WXDLLIMPEXP_BINDWXCORE bool wxLuaBinding_wxcore_init(); // modules/wxbind - #define WXLUA_DECLARE_BIND_WXADV extern WXDLLIMPEXP_BINDWXADV bool wxLuaBinding_wxadv_init(); // modules/wxbind - #define WXLUA_DECLARE_BIND_WXNET extern WXDLLIMPEXP_BINDWXNET bool wxLuaBinding_wxnet_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXBASE wxLuaBinding_wxbase_init(); ! #define WXLUA_IMPLEMENT_BIND_WXCORE wxLuaBinding_wxcore_init(); ! #define WXLUA_IMPLEMENT_BIND_WXADV wxLuaBinding_wxadv_init(); ! #define WXLUA_IMPLEMENT_BIND_WXNET wxLuaBinding_wxnet_init(); ! #if wxUSE_XML ! #define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML bool wxLuaBinding_wxxml_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init(); #else ! #define WXLUA_DECLARE_BIND_WXXML ! #define WXLUA_IMPLEMENT_BIND_WXXML ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0" ! #endif //wxUSE_XML ! #if wxUSE_XRC ! #define WXLUA_DECLARE_BIND_WXXRC extern WXDLLIMPEXP_BINDWXXRC bool wxLuaBinding_wxxrc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXRC wxLuaBinding_wxxrc_init(); #else ! #define WXLUA_DECLARE_BIND_WXXRC ! #define WXLUA_IMPLEMENT_BIND_WXXRC ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0" ! #endif //wxUSE_XRC ! #if wxUSE_HTML #define WXLUA_DECLARE_BIND_WXHTML extern WXDLLIMPEXP_BINDWXHTML bool wxLuaBinding_wxhtml_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXHTML wxLuaBinding_wxhtml_init(); --- 184,247 ---- // ---------------------------------------------------------------------------- ! #if wxLUA_USEBINDING_WXLUA ! #define WXLUA_DECLARE_BIND_WXLUA extern WXDLLIMPEXP_WXLUA bool wxLuaBinding_wxlua_init(); // modules/wxlua ! #define WXLUA_IMPLEMENT_BIND_WXLUA wxLuaBinding_wxlua_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXLUA ! #define WXLUA_IMPLEMENT_BIND_WXLUA ! #endif // wxLUA_USEBINDING_WXLUA ! #if wxLUA_USEBINDING_WXLUASOCKET ! #define WXLUA_DECLARE_BIND_WXLUASOCKET extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket ! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET wxLuaBinding_wxluasocket_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXLUASOCKET ! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET ! #endif //wxLUA_USEBINDING_WXLUASOCKET ! #if wxLUA_USEBINDING_WXADV ! #define WXLUA_DECLARE_BIND_WXADV extern WXDLLIMPEXP_BINDWXADV bool wxLuaBinding_wxadv_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXADV wxLuaBinding_wxadv_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXADV ! #define WXLUA_IMPLEMENT_BIND_WXADV ! #endif // wxLUA_USEBINDING_WXADV + #if wxLUA_USEBINDING_WXAUI && wxUSE_AUI + #define WXLUA_DECLARE_BIND_WXAUI extern WXDLLIMPEXP_BINDWXAUI bool wxLuaBinding_wxaui_init(); // modules/wxbind + #define WXLUA_IMPLEMENT_BIND_WXAUI wxLuaBinding_wxaui_init(); + #else + #define WXLUA_DECLARE_BIND_WXAUI + #define WXLUA_IMPLEMENT_BIND_WXAUI + //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0" + #endif // wxLUA_USEBINDING_WXAUI && wxUSE_AUI ! #if wxLUA_USEBINDING_WXBASE ! #define WXLUA_DECLARE_BIND_WXBASE extern WXDLLIMPEXP_BINDWXBASE bool wxLuaBinding_wxbase_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXBASE wxLuaBinding_wxbase_init(); #else ! #define WXLUA_DECLARE_BIND_WXBASE ! #define WXLUA_IMPLEMENT_BIND_WXBASE ! #endif // wxLUA_USEBINDING_WXBASE ! #if wxLUA_USEBINDING_WXCORE ! #define WXLUA_DECLARE_BIND_WXCORE extern WXDLLIMPEXP_BINDWXCORE bool wxLuaBinding_wxcore_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXCORE wxLuaBinding_wxcore_init(); #else ! #define WXLUA_DECLARE_BIND_WXCORE ! #define WXLUA_IMPLEMENT_BIND_WXCORE ! #endif // wxLUA_USEBINDING_WXCORE ! #if wxLUA_USEBINDING_WXGL && wxUSE_GLCANVAS ! #define WXLUA_DECLARE_BIND_WXGL extern WXDLLIMPEXP_BINDWXGL bool wxLuaBinding_wxgl_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXGL wxLuaBinding_wxgl_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXGL ! #define WXLUA_IMPLEMENT_BIND_WXGL ! #endif // wxLUA_USEBINDING_WXGL && wxUSE_GLCANVAS ! ! #if wxLUA_USEBINDING_WXHTML && wxUSE_HTML #define WXLUA_DECLARE_BIND_WXHTML extern WXDLLIMPEXP_BINDWXHTML bool wxLuaBinding_wxhtml_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXHTML wxLuaBinding_wxhtml_init(); *************** *** 226,242 **** #define WXLUA_DECLARE_BIND_WXHTML #define WXLUA_IMPLEMENT_BIND_WXHTML ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0" ! #endif //wxUSE_HTML ! ! #if wxUSE_AUI ! #define WXLUA_DECLARE_BIND_WXAUI extern WXDLLIMPEXP_BINDWXAUI bool wxLuaBinding_wxaui_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXAUI wxLuaBinding_wxaui_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXAUI ! #define WXLUA_IMPLEMENT_BIND_WXAUI ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0" ! #endif //wxUSE_AUI ! #if wxUSE_MEDIACTRL #define WXLUA_DECLARE_BIND_WXMEDIA extern WXDLLIMPEXP_BINDWXMEDIA bool wxLuaBinding_wxmedia_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXMEDIA wxLuaBinding_wxmedia_init(); --- 249,255 ---- #define WXLUA_DECLARE_BIND_WXHTML #define WXLUA_IMPLEMENT_BIND_WXHTML ! #endif // wxLUA_USEBINDING_WXHTML && wxUSE_HTML ! #if wxLUA_USEBINDING_WXMEDIA && wxUSE_MEDIACTRL #define WXLUA_DECLARE_BIND_WXMEDIA extern WXDLLIMPEXP_BINDWXMEDIA bool wxLuaBinding_wxmedia_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXMEDIA wxLuaBinding_wxmedia_init(); *************** *** 244,264 **** #define WXLUA_DECLARE_BIND_WXMEDIA #define WXLUA_IMPLEMENT_BIND_WXMEDIA ! // warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0" ! #endif //wxUSE_MEDIACTRL ! #if wxUSE_GLCANVAS ! #define WXLUA_DECLARE_BIND_WXGL extern WXDLLIMPEXP_BINDWXGL bool wxLuaBinding_wxgl_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXGL wxLuaBinding_wxgl_init(); #else ! #define WXLUA_DECLARE_BIND_WXGL ! #define WXLUA_IMPLEMENT_BIND_WXGL ! // warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXGL is not used since wxUSE_GLCANVAS=0" ! #endif //wxUSE_GLCANVAS ! // Unfortunately there's no checks for this ! #define WXLUA_DECLARE_BIND_WXSTC extern WXDLLIMPEXP_BINDWXSTC bool wxLuaBinding_wxstc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXSTC wxLuaBinding_wxstc_init(); // ---------------------------------------------------------------------------- // Declare all the bindings --- 257,305 ---- #define WXLUA_DECLARE_BIND_WXMEDIA #define WXLUA_IMPLEMENT_BIND_WXMEDIA ! #endif // wxLUA_USEBINDING_WXMEDIA && wxUSE_MEDIACTRL ! #if wxLUA_USEBINDING_WXNET ! #define WXLUA_DECLARE_BIND_WXNET extern WXDLLIMPEXP_BINDWXNET bool wxLuaBinding_wxnet_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXNET wxLuaBinding_wxnet_init(); #else ! #define WXLUA_DECLARE_BIND_WXNET ! #define WXLUA_IMPLEMENT_BIND_WXNET ! #endif // wxLUA_USEBINDING_WXNET ! #if wxLUA_USEBINDING_WXRICHTEXT && wxUSE_RICHTEXT ! #define WXLUA_DECLARE_BIND_WXRICHTEXT extern WXDLLIMPEXP_BINDWXRICHTEXT bool wxLuaBinding_wxrichtext_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXRICHTEXT wxLuaBinding_wxrichtext_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXRICHTEXT ! #define WXLUA_IMPLEMENT_BIND_WXRICHTEXT ! #endif // wxLUA_USEBINDING_WXRICHTEXT && wxUSE_RICHTEXT ! ! #if wxLUA_USEBINDING_WXSTC ! #define WXLUA_DECLARE_BIND_WXSTC extern WXDLLIMPEXP_BINDWXSTC bool wxLuaBinding_wxstc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXSTC wxLuaBinding_wxstc_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXSTC ! #define WXLUA_IMPLEMENT_BIND_WXSTC ! #endif // wxLUA_USEBINDING_WXSTC ! ! #if wxLUA_USEBINDING_WXXML && wxUSE_XML ! #define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML bool wxLuaBinding_wxxml_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXXML ! #define WXLUA_IMPLEMENT_BIND_WXXML ! #endif // wxLUA_USEBINDING_WXXML && wxUSE_XML ! ! #if wxLUA_USEBINDING_WXXRC && wxUSE_XRC ! #define WXLUA_DECLARE_BIND_WXXRC extern WXDLLIMPEXP_BINDWXXRC bool wxLuaBinding_wxxrc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXRC wxLuaBinding_wxxrc_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXXRC ! #define WXLUA_IMPLEMENT_BIND_WXXRC ! #endif // wxLUA_USEBINDING_WXXRC && wxUSE_XRC // ---------------------------------------------------------------------------- + // Simplified macros to declare and implement the bindings + // Note the order of them which follows the C++ linking order. // Declare all the bindings Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxhtml_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxhtml_bind.h 10 Jan 2008 23:06:27 -0000 1.10 *************** *** 62,66 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) ! #include "wxbind/include/wxhtml_wxlhtmlwin.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) --- 62,66 ---- #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) ! #include "wxbind/include/wxhtml_wxlhtml.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) --- NEW FILE: wxcore_wxlcore.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: Wrappers around wxCore classes for wxLua // Author: J. Winwood // Created: July 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #ifndef WX_LUA_WXLCORE_H #define WX_LUA_WXLCORE_H #include "wx/print.h" #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" #if wxLUA_USE_wxLuaPrintout class WXDLLIMPEXP_WXLUA wxLuaObject; // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXCORE wxLuaPrintout : public wxPrintout { public: wxLuaPrintout(const wxLuaState& wxlState, const wxString& title = wxT("Printout"), wxLuaObject *pObject = NULL); // added function so you don't have to override GetPageInfo void SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo); // overrides virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo); virtual bool HasPage(int pageNum); virtual bool OnBeginDocument(int startPage, int endPage); virtual void OnEndDocument(); virtual void OnBeginPrinting(); virtual void OnEndPrinting(); virtual void OnPreparePrinting(); virtual bool OnPrintPage(int pageNumber); wxLuaObject *GetID() const { return m_pObject; } // Dummy test function to directly verify that the binding virtual functions really work. virtual wxString TestVirtualFunctionBinding(const wxString& val); static int ms_test_int; private: wxLuaState m_wxlState; wxLuaObject *m_pObject; int m_minPage; int m_maxPage; int m_pageFrom; int m_pageTo; DECLARE_ABSTRACT_CLASS(wxLuaPrintout) }; #endif //wxLUA_USE_wxLuaPrintout #if wxLUA_USE_wxArtProvider #include "wx/artprov.h" class WXDLLIMPEXP_BINDWXCORE wxLuaArtProvider : public wxArtProvider { public: wxLuaArtProvider(const wxLuaState& wxlState); // Get the default size of an icon for a specific client virtual wxSize DoGetSizeHint(const wxArtClient& client); // Derived classes must override this method to create requested // art resource. This method is called only once per instance's // lifetime for each requested wxArtID. virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size); private: wxLuaState m_wxlState; DECLARE_ABSTRACT_CLASS(wxLuaArtProvider) }; #endif // wxLUA_USE_wxArtProvider #endif //WX_LUA_WXLCORE_H |