[Wxlua-commit] wxLua/modules/wxbindstc/src stc.cpp, 1.17, 1.18 wxstc_bind.cpp, 1.14, 1.15

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

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

Modified Files:
	stc.cpp wxstc_bind.cpp 
Log Message:
lots of little cleanups
Add wx.NULL to replace wx.wxNull (which still exists) to be more C like
Don't have static WXLUAMETHODs and then en extern pointer to them, just don't have them static
More variable/function name changes to make the code more readable


Index: wxstc_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxstc_bind.cpp	4 Dec 2006 05:54:41 -0000	1.14
--- wxstc_bind.cpp	12 Dec 2006 07:09:41 -0000	1.15
***************
*** 1498,1502 ****
      wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState"));
  
!     wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered);
      wxASSERT(!wxlState.GetLuaBinding(wxT("wxstc")));
  
--- 1498,1502 ----
      wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState"));
  
!     wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered);
      wxASSERT(!wxlState.GetLuaBinding(wxT("wxstc")));
  
***************
*** 1505,1509 ****
          return false;
  
!     wxlState.GetLuaStateData()->m_bindings.Append(new wxLuaBinding_wxstc());
  
      return true;
--- 1505,1509 ----
          return false;
  
!     wxlState.GetLuaStateData()->m_bindingList.Append(new wxLuaBinding_wxstc());
  
      return true;

Index: stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** stc.cpp	11 Oct 2006 03:24:02 -0000	1.17
--- stc.cpp	12 Dec 2006 07:09:41 -0000	1.18
***************
*** 6583,6587 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxStyledTextCtrl_methods[] = {
  
  #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush)
--- 6583,6587 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxStyledTextCtrl_methods[] = {
  
  #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush)
***************
*** 7178,7184 ****
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxStyledTextCtrl_methods = s_wxStyledTextCtrl_methods;
! int wxStyledTextCtrl_methodCount = sizeof(s_wxStyledTextCtrl_methods)/sizeof(s_wxStyledTextCtrl_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 7178,7182 ----
  };
  
! int wxStyledTextCtrl_methodCount = sizeof(wxStyledTextCtrl_methods)/sizeof(wxStyledTextCtrl_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 7869,7873 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxStyledTextEvent_methods[] = {
      { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetPosition", wxLua_wxStyledTextEvent_SetPosition, 1, 1, { &s_wxluaarg_Number, 0 } },
--- 7867,7871 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxStyledTextEvent_methods[] = {
      { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetPosition", wxLua_wxStyledTextEvent_SetPosition, 1, 1, { &s_wxluaarg_Number, 0 } },
***************
*** 7965,7970 ****
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxStyledTextEvent_methods = s_wxStyledTextEvent_methods;
! int wxStyledTextEvent_methodCount = sizeof(s_wxStyledTextEvent_methods)/sizeof(s_wxStyledTextEvent_methods[0]);
  
--- 7963,7966 ----
  };
  
! int wxStyledTextEvent_methodCount = sizeof(wxStyledTextEvent_methods)/sizeof(wxStyledTextEvent_methods[0]);