[Wxlua-commit] wxLua/modules/wxbind/src socket.cpp, 1.19, 1.20 wxlhtmlwin.cpp, 1.12, 1.13 wxlprint.cpp, 1.11, 1.12

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

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

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


Index: wxlprint.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlprint.cpp	12 Dec 2006 01:23:40 -0000	1.11
--- wxlprint.cpp	13 Dec 2006 06:57:50 -0000	1.12
***************
*** 31,35 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaPrintout, wxPrintout)
  
  wxLuaPrintout::wxLuaPrintout(const wxLuaState& wxlState,
--- 31,35 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaPrintout, wxPrintout)
  
  wxLuaPrintout::wxLuaPrintout(const wxLuaState& wxlState,

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** socket.cpp	12 Dec 2006 07:09:39 -0000	1.19
--- socket.cpp	13 Dec 2006 06:57:49 -0000	1.20
***************
*** 365,369 ****
      wxLuaState wxlState(L);
      // wxSocketEventFlags flags
!     wxSocketEventFlags flags = (wxSocketEventFlags)wxlState.GetNumberType(2);
      // get this
      wxSocketBase * self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
--- 365,369 ----
      wxLuaState wxlState(L);
      // wxSocketEventFlags flags
!     wxSocketEventFlags flags = (wxSocketEventFlags)wxlState.GetEnumerationType(2);
      // get this
      wxSocketBase * self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
***************
*** 637,641 ****
      { LuaMethod, "SetEventHandler", wxLua_wxSocketBase_SetEventHandler, 2, 1, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetFlags", wxLua_wxSocketBase_SetFlags, 1, 1, { &s_wxluaarg_Enumeration, 0 } },
!     { LuaMethod, "SetNotify", wxLua_wxSocketBase_SetNotify, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetTimeout", wxLua_wxSocketBase_SetTimeout, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "Peek", wxLua_wxSocketBase_Peek, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } },
--- 637,641 ----
      { LuaMethod, "SetEventHandler", wxLua_wxSocketBase_SetEventHandler, 2, 1, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetFlags", wxLua_wxSocketBase_SetFlags, 1, 1, { &s_wxluaarg_Enumeration, 0 } },
!     { LuaMethod, "SetNotify", wxLua_wxSocketBase_SetNotify, 1, 1, { &s_wxluaarg_Enumeration, 0 } },
      { LuaMethod, "SetTimeout", wxLua_wxSocketBase_SetTimeout, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "Peek", wxLua_wxSocketBase_Peek, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } },

Index: wxlhtmlwin.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxlhtmlwin.cpp	12 Dec 2006 01:23:40 -0000	1.12
--- wxlhtmlwin.cpp	13 Dec 2006 06:57:50 -0000	1.13
***************
*** 21,26 ****
  
  #include "wxbind/include/wxlhtmlwin.h"
! #include "wxlua/include/wxlstate.h"
! #include "wxlua/include/wxlcallb.h"
  
  #if wxLUA_USE_wxHTML
--- 21,25 ----
  
  #include "wxbind/include/wxlhtmlwin.h"
! //#include "wxlua/include/wxlcallb.h"
  
  #if wxLUA_USE_wxHTML
***************
*** 37,53 ****
  // wxLuaHtmlWindow
  // ----------------------------------------------------------------------------
! 
! IMPLEMENT_CLASS(wxLuaHtmlWindow, wxHtmlWindow)
! 
! BEGIN_EVENT_TABLE(wxLuaHtmlWindow, wxHtmlWindow)
! END_EVENT_TABLE()
! 
! wxLuaHtmlWindow::wxLuaHtmlWindow() : wxHtmlWindow()
! {
! }
! 
! wxLuaHtmlWindow::~wxLuaHtmlWindow()
! {
! }
  
  wxLuaHtmlWindow::wxLuaHtmlWindow(const wxLuaState& wxlState,
--- 36,40 ----
  // wxLuaHtmlWindow
  // ----------------------------------------------------------------------------
! IMPLEMENT_ABSTRACT_CLASS(wxLuaHtmlWindow, wxHtmlWindow)
  
  wxLuaHtmlWindow::wxLuaHtmlWindow(const wxLuaState& wxlState,
***************
*** 71,74 ****
--- 58,62 ----
      bool ret = false;
  #endif
+ 
      if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() &&
          m_wxlState.HasDerivedMethod(this, "OnCellClicked"))
***************
*** 88,101 ****
--- 76,93 ----
  
          if (fResult)
+         {
  #if wxCHECK_VERSION(2,7,0)
              ret =
  #endif
                  wxHtmlWindow::OnCellClicked(cell, x, y, event);
+         }
      }
      else
+     {
  #if wxCHECK_VERSION(2,7,0)
          ret =
  #endif
              wxHtmlWindow::OnCellClicked(cell, x, y, event);
+     }
  
      m_wxlState.SetCallBaseClassFunction(false); // clear flag always
***************
*** 173,179 ****
      wxLuaHtmlWinTagHandler() {}
  
!     wxString GetSupportedTags() { return wxString(wxT("LUA")); }
  
!     bool HandleTag(const wxHtmlTag& tag)
      {
          wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
--- 165,171 ----
      wxLuaHtmlWinTagHandler() {}
  
!     virtual wxString GetSupportedTags() { return wxT("LUA"); }
  
!     virtual bool HandleTag(const wxHtmlTag& tag)
      {
          wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
***************
*** 183,187 ****
              return htmlEvent.GetParseInnerCalled();
  
!         return FALSE;
      }
  };
--- 175,179 ----
              return htmlEvent.GetParseInnerCalled();
  
!         return false;
      }
  };
***************
*** 191,195 ****
      DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule)
  public:
!     void FillHandlersTable(wxHtmlWinParser *parser)
      {
          parser->AddTagHandler(new wxLuaHtmlWinTagHandler);
--- 183,187 ----
      DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule)
  public:
!     virtual void FillHandlersTable(wxHtmlWinParser *parser)
      {
          parser->AddTagHandler(new wxLuaHtmlWinTagHandler);
***************
*** 205,222 ****
  IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent)
  
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent()
!                      :m_pHtmlTag(NULL), m_pHtmlParser(NULL),
!                       m_fParseInnerCalled(false)
! {
! }
! 
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(int eventType)
!                      :m_pHtmlTag(NULL), m_pHtmlParser(NULL),
!                       m_fParseInnerCalled(false)
  {
-     SetEventType(eventType);
  }
  
! wxLuaHtmlWinTagEvent::~wxLuaHtmlWinTagEvent()
  {
  }
--- 197,210 ----
  IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent)
  
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(wxEventType eventType)
!                      :wxEvent(wxID_ANY, eventType), m_pHtmlTag(NULL),
!                       m_pHtmlParser(NULL), m_fParseInnerCalled(false)
  {
  }
  
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(const wxLuaHtmlWinTagEvent& event)
!                      :wxEvent(event), m_pHtmlTag(event.m_pHtmlTag),
!                       m_pHtmlParser(event.m_pHtmlParser),
!                       m_fParseInnerCalled(event.m_fParseInnerCalled)
  {
  }
***************
*** 229,263 ****
  }
  
- wxEvent* wxLuaHtmlWinTagEvent::Clone() const
- {
-     wxLuaHtmlWinTagEvent *pEvent = new wxLuaHtmlWinTagEvent(GetEventType());
-     if (pEvent != NULL)
-     {
-         pEvent->m_pHtmlTag          = m_pHtmlTag;
-         pEvent->m_pHtmlParser       = m_pHtmlParser;
-         pEvent->m_fParseInnerCalled = m_fParseInnerCalled;
-     }
-     return pEvent;
- }
- 
- const wxHtmlTag *wxLuaHtmlWinTagEvent::GetHtmlTag() const
- {
-     return m_pHtmlTag;
- }
- 
- wxHtmlWinParser *wxLuaHtmlWinTagEvent::GetHtmlParser() const
- {
-     return m_pHtmlParser;
- }
- 
- bool wxLuaHtmlWinTagEvent::GetParseInnerCalled() const
- {
-     return m_fParseInnerCalled;
- }
- 
- void wxLuaHtmlWinTagEvent::SetParseInnerCalled(bool fParseInnerCalled)
- {
-     m_fParseInnerCalled = fParseInnerCalled;
- }
- 
  #endif //wxLUA_USE_wxHTML
--- 217,219 ----