[Wxlua-commit] wxLua/modules/wxbind/src datetime.cpp, 1.52, 1.53 gdi.cpp, 1.79, 1.80 wx_bind.cpp, 1.120, 1.121

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

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

Modified Files:
	datetime.cpp gdi.cpp wx_bind.cpp 
Log Message:
Unicode compilation fix for genwxbind
Add wxRenderer to bindings


Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** wx_bind.cpp	26 Jun 2007 22:16:38 -0000	1.120
--- wx_bind.cpp	27 Jun 2007 03:11:29 -0000	1.121
***************
*** 1067,1070 ****
--- 1067,1088 ----
  #endif // (wxCHECK_VERSION(2,8,1)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
  
+ #if wxLUA_USE_wxRenderer
+         { "wxCONTROL_CHECKABLE", wxCONTROL_CHECKABLE },
+         { "wxCONTROL_CHECKED", wxCONTROL_CHECKED },
+         { "wxCONTROL_CURRENT", wxCONTROL_CURRENT },
+         { "wxCONTROL_DIRTY", wxCONTROL_DIRTY },
+         { "wxCONTROL_DISABLED", wxCONTROL_DISABLED },
+         { "wxCONTROL_EXPANDED", wxCONTROL_EXPANDED },
+         { "wxCONTROL_FLAGS_MASK", wxCONTROL_FLAGS_MASK },
+         { "wxCONTROL_FOCUSED", wxCONTROL_FOCUSED },
+         { "wxCONTROL_ISDEFAULT", wxCONTROL_ISDEFAULT },
+         { "wxCONTROL_ISSUBMENU", wxCONTROL_ISSUBMENU },
+         { "wxCONTROL_PRESSED", wxCONTROL_PRESSED },
+         { "wxCONTROL_SELECTED", wxCONTROL_SELECTED },
+         { "wxCONTROL_SIZEGRIP", wxCONTROL_SIZEGRIP },
+         { "wxCONTROL_SPECIAL", wxCONTROL_SPECIAL },
+         { "wxCONTROL_UNDETERMINED", wxCONTROL_UNDETERMINED },
+ #endif // wxLUA_USE_wxRenderer
+ 
  #if wxLUA_USE_wxDC
          { "wxCOPY", wxCOPY },
***************
*** 1616,1619 ****
--- 1634,1647 ----
  #endif // !wxCHECK_VERSION(2,8,0)
  
+ #if (defined(wxHAS_NATIVE_RENDERER)) && (wxLUA_USE_wxRenderer)
+         { "wxHAS_NATIVE_RENDERER", 1 },
+ #endif // (defined(wxHAS_NATIVE_RENDERER)) && (wxLUA_USE_wxRenderer)
+ 
+ #if wxLUA_USE_wxRenderer
+         { "wxHDR_SORT_ICON_DOWN", wxHDR_SORT_ICON_DOWN },
+         { "wxHDR_SORT_ICON_NONE", wxHDR_SORT_ICON_NONE },
+         { "wxHDR_SORT_ICON_UP", wxHDR_SORT_ICON_UP },
+ #endif // wxLUA_USE_wxRenderer
+ 
          { "wxHELP", wxHELP },
  
***************
*** 5485,5489 ****
      int argCount = lua_gettop(L);
      // const wxChar domain = NULL
!     wxString  domain = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxEmptyString);
      // const wxString sz
      const wxString sz = wxlState.GetwxStringType(1);
--- 5513,5517 ----
      int argCount = lua_gettop(L);
      // const wxChar domain = NULL
!     wxString  domain = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));
      // const wxString sz
      const wxString sz = wxlState.GetwxStringType(1);
***************
*** 5533,5537 ****
      int argCount = lua_gettop(L);
      // const wxChar domain = NULL
!     wxString  domain = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxEmptyString);
      // size_t n
      size_t n = (size_t)wxlua_getnumbertype(L, 3);
--- 5561,5565 ----
      int argCount = lua_gettop(L);
      // const wxChar domain = NULL
!     wxString  domain = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString));
      // size_t n
      size_t n = (size_t)wxlua_getnumbertype(L, 3);
***************
*** 7351,7354 ****
--- 7379,7386 ----
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP)
  
+ #if wxLUA_USE_wxRenderer
+         { "wxHeaderButtonParams", wxHeaderButtonParams_methods, wxHeaderButtonParams_methodCount, NULL, &s_wxluatag_wxHeaderButtonParams, NULL, NULL ,s_wxluadefineArray_None, 0, }, 
+ #endif // wxLUA_USE_wxRenderer
+ 
  #if wxLUA_USE_wxHelpController && wxUSE_HELP
          { "wxHelpController", wxHelpController_methods, wxHelpController_methodCount, CLASSINFO(wxHelpController), &s_wxluatag_wxHelpController, "wxHelpControllerBase", NULL ,s_wxluadefineArray_None, 0, }, 
***************
*** 7786,7789 ****
--- 7818,7826 ----
  #endif // wxLUA_USE_wxRegion
  
+ #if wxLUA_USE_wxRenderer
+         { "wxRendererNative", wxRendererNative_methods, wxRendererNative_methodCount, NULL, &s_wxluatag_wxRendererNative, NULL, NULL ,s_wxluadefineArray_None, 0, }, 
+         { "wxRendererVersion", wxRendererVersion_methods, wxRendererVersion_methodCount, NULL, &s_wxluatag_wxRendererVersion, NULL, NULL ,wxRendererVersion_enums, wxRendererVersion_enumCount, }, 
+ #endif // wxLUA_USE_wxRenderer
+ 
  #if wxLUA_USE_wxSashWindow && wxUSE_SASH
          { "wxSashEvent", wxSashEvent_methods, wxSashEvent_methodCount, CLASSINFO(wxSashEvent), &s_wxluatag_wxSashEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, 
***************
*** 7877,7880 ****
--- 7914,7924 ----
  #if wxLUA_USE_wxSplitterWindow
          { "wxSplitterEvent", wxSplitterEvent_methods, wxSplitterEvent_methodCount, CLASSINFO(wxSplitterEvent), &s_wxluatag_wxSplitterEvent, "wxNotifyEvent", NULL ,s_wxluadefineArray_None, 0, }, 
+ #endif // wxLUA_USE_wxSplitterWindow
+ 
+ #if wxLUA_USE_wxRenderer
+         { "wxSplitterRenderParams", wxSplitterRenderParams_methods, wxSplitterRenderParams_methodCount, NULL, &s_wxluatag_wxSplitterRenderParams, NULL, NULL ,s_wxluadefineArray_None, 0, }, 
+ #endif // wxLUA_USE_wxRenderer
+ 
+ #if wxLUA_USE_wxSplitterWindow
          { "wxSplitterWindow", wxSplitterWindow_methods, wxSplitterWindow_methodCount, CLASSINFO(wxSplitterWindow), &s_wxluatag_wxSplitterWindow, "wxWindow", NULL ,s_wxluadefineArray_None, 0, }, 
  #endif // wxLUA_USE_wxSplitterWindow
***************
*** 8473,8476 ****
--- 8517,8528 ----
  
  
+ #if wxLUA_USE_wxRenderer
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxHeaderButtonParams, wxHeaderButtonParams)
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxRendererNative, wxRendererNative)
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxRendererVersion, wxRendererVersion)
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxSplitterRenderParams, wxSplitterRenderParams)
+ #endif // wxLUA_USE_wxRenderer
+ 
+ 
  #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH
  wxLUA_IMPLEMENT_ENCAPSULATION(wxStopWatch, wxStopWatch)
***************
*** 8500,8503 ****
--- 8552,8556 ----
  
  #if wxUSE_INTL
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxLanguageInfo, wxLanguageInfo)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxLocale, wxLocale)
  #endif // wxUSE_INTL

Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** gdi.cpp	25 Jun 2007 03:19:43 -0000	1.79
--- gdi.cpp	27 Jun 2007 03:11:29 -0000	1.80
***************
*** 15674,15675 ****
--- 15674,16803 ----
  #endif  // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
  
+ 
+ #if wxLUA_USE_wxRenderer
+ // ---------------------------------------------------------------------------
+ // Bind struct wxSplitterRenderParams
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxSplitterRenderParams'
[...1101 lines suppressed...]
+     { "GetDefault", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_GetDefault, 1, NULL },
+     { "GetGeneric", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_GetGeneric, 1, NULL },
+     { "GetHeaderButtonHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererNative_GetHeaderButtonHeight, 1, NULL },
+     { "GetSplitterParams", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererNative_GetSplitterParams, 1, NULL },
+     { "GetVersion", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererNative_GetVersion, 1, NULL },
+ 
+ #if ((wxLUA_USE_wxRenderer) && (wxUSE_DYNLIB_CLASS)) && (wxLUA_USE_wxRenderer)
+     { "Load", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_Load, 1, NULL },
+ #endif // ((wxLUA_USE_wxRenderer) && (wxUSE_DYNLIB_CLASS)) && (wxLUA_USE_wxRenderer)
+ 
+     { "Set", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_Set, 1, NULL },
+     { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxRendererNative_delete, 1, NULL },
+ 
+     { 0, 0, 0, 0 },
+ };
+ 
+ int wxRendererNative_methodCount = sizeof(wxRendererNative_methods)/sizeof(wxLuaBindMethod) - 1;
+ 
+ #endif  // wxLUA_USE_wxRenderer
+ 

Index: datetime.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** datetime.cpp	26 Jun 2007 16:15:48 -0000	1.52
--- datetime.cpp	27 Jun 2007 03:11:28 -0000	1.53
***************
*** 5407,5410 ****
--- 5407,5445 ----
  #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLanguageInfo_delete[] = { &s_wxluatag_wxLanguageInfo, NULL };
+ static int LUACALL wxLua_wxLanguageInfo_delete(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxLanguageInfo_delete[1] = {{ wxLua_wxLanguageInfo_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLanguageInfo_delete }};
+ static int LUACALL wxLua_wxLanguageInfo_delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxLanguageInfo * self = (wxLanguageInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxLanguageInfo);
+     // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
+     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
+     {
+         lua_pushnil(L);
+         lua_setmetatable(L, -2);
+     }
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxLanguageInfo_constructor(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxLanguageInfo_constructor[1] = {{ wxLua_wxLanguageInfo_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }};
+ //     wxLanguageInfo() // you must set all the values by hand
+ static int LUACALL wxLua_wxLanguageInfo_constructor(lua_State *L)
+ {
+     wxluabind_removetableforcall(L);
+     wxLuaState wxlState(L);
+     wxLanguageInfo *returns;
+     // call constructor
+     returns = new wxLanguageInfo();
+     // add to tracked memory list
+     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLanguageInfo((wxLanguageInfo *)returns));
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxLanguageInfo, returns);
+ 
+     return 1;
+ }
+ 
+ 
  
  
***************
*** 5439,5442 ****
--- 5474,5480 ----
  #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
  
+     { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLanguageInfo_delete, 1, NULL },
+     { "wxLanguageInfo", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLanguageInfo_constructor, 1, NULL },
+ 
      { 0, 0, 0, 0 },
  };