[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h, 1.45, 1.46 wxlhtmlwin.h, 1.6, 1.7 wxlprint.h, 1.7, 1.8

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18568/wxLua/modules/wxbind/include

Modified Files:
	wxbind.h wxlhtmlwin.h wxlprint.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxlhtmlwin.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlhtmlwin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlhtmlwin.h	12 Dec 2006 01:23:40 -0000	1.6
--- wxlhtmlwin.h	13 Dec 2006 06:57:49 -0000	1.7
***************
*** 10,19 ****
  #define WX_LUA_HTML_WINDOW_H
  
  #include "wxlua/include/wxldefs.h"
  #include "wxlua/include/wxlstate.h"
  #include "wxbind/include/wxbinddefs.h"
- #include "wx/print.h"
- #include "wx/html/htmlwin.h"
- #include "wx/html/htmlcell.h"
  #include "wxluasetup.h"
  
--- 10,19 ----
  #define WX_LUA_HTML_WINDOW_H
  
+ #include "wx/html/htmlwin.h"
+ #include "wx/html/htmlcell.h"
+ 
  #include "wxlua/include/wxldefs.h"
  #include "wxlua/include/wxlstate.h"
  #include "wxbind/include/wxbinddefs.h"
  #include "wxluasetup.h"
  
***************
*** 27,37 ****
  {
  public:
- 
-     wxLuaHtmlWindow();
-     virtual ~wxLuaHtmlWindow();
- 
      wxLuaHtmlWindow(const wxLuaState& wxlState,
!                     wxWindow *parent,
!                     wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
--- 27,32 ----
  {
  public:
      wxLuaHtmlWindow(const wxLuaState& wxlState,
!                     wxWindow *parent, wxWindowID id = wxID_ANY,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
***************
*** 39,42 ****
--- 34,39 ----
                      const wxString& name = wxT("wxLuaHtmlWindow"));
  
+     virtual ~wxLuaHtmlWindow() {}
+ 
  #if wxCHECK_VERSION(2, 7, 0)
      virtual bool
***************
*** 52,57 ****
      wxLuaState m_wxlState;
  
!     DECLARE_EVENT_TABLE()
!     DECLARE_CLASS (wxLuaHtmlWindow)
  };
  
--- 49,53 ----
      wxLuaState m_wxlState;
  
!     DECLARE_ABSTRACT_CLASS(wxLuaHtmlWindow)
  };
  
***************
*** 63,79 ****
  {
  public:
!     wxLuaHtmlWinTagEvent();
!     wxLuaHtmlWinTagEvent(int eventType);
!     virtual ~wxLuaHtmlWinTagEvent();
  
      void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser);
  
!     const wxHtmlTag *GetHtmlTag() const;
!     wxHtmlWinParser *GetHtmlParser() const;
!     void             SetParseInnerCalled(bool fParseInnerCalled);
!     bool             GetParseInnerCalled() const;
  
  protected:
!     virtual wxEvent* Clone() const;
  
  private:
--- 59,77 ----
  {
  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:
***************
*** 90,94 ****
  END_DECLARE_EVENT_TYPES()
  
! #define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL),
  
  #endif // wxLUA_USE_wxHTML
--- 88,92 ----
  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

Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxbind.h	13 Dec 2006 00:27:56 -0000	1.45
--- wxbind.h	13 Dec 2006 06:57:49 -0000	1.46
***************
*** 39,45 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 1
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 1
  
  // binding class
--- 39,45 ----
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 2
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 2
  
  // binding class

Index: wxlprint.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlprint.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlprint.h	12 Dec 2006 01:23:40 -0000	1.7
--- wxlprint.h	13 Dec 2006 06:57:49 -0000	1.8
***************
*** 28,36 ****
  public:
      wxLuaPrintout(const wxLuaState& wxlState,
!                   const wxString& title = _("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);
--- 28,37 ----
  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);
***************
*** 52,56 ****
      int          m_pageFrom;
      int          m_pageTo;
!     DECLARE_DYNAMIC_CLASS(wxLuaPrintout)
  };
  
--- 53,57 ----
      int          m_pageFrom;
      int          m_pageTo;
!     DECLARE_ABSTRACT_CLASS(wxLuaPrintout)
  };