[Wxlua-commit] wxLua/modules/wxbind/src gdi.cpp,1.34,1.35

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

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

Modified Files:
	gdi.cpp 
Log Message:
fix wxBitmapFromFile constructor
some cleanup to genwxbind


Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** gdi.cpp	22 Nov 2006 06:08:33 -0000	1.34
--- gdi.cpp	30 Nov 2006 05:56:31 -0000	1.35
***************
*** 5703,5713 ****
  }
  
! //     %constructor wxBitmapFromFile( const wxString& name, long type)
  static int LUACALL wxLua_wxBitmapFromFile_constructor(lua_State *L)
  {
      wxLuaState wxlState(L);
      wxBitmap *returns;
!     // long type
!     long type = (long)wxlState.GetNumberType(2);
      // const wxString name
      const wxString name = lua2wx(wxlState.GetStringType(1));
--- 5703,5715 ----
  }
  
! //     %constructor wxBitmapFromFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY)
  static int LUACALL wxLua_wxBitmapFromFile_constructor(lua_State *L)
  {
      wxLuaState wxlState(L);
      wxBitmap *returns;
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // wxBitmapType type = wxBITMAP_TYPE_ANY
!     wxBitmapType type = (argCount >= 2 ? (wxBitmapType)wxlState.GetEnumerationType(2) : wxBITMAP_TYPE_ANY);
      // const wxString name
      const wxString name = lua2wx(wxlState.GetStringType(1));
***************
*** 5978,5982 ****
      { LuaConstructor, "wxBitmapCopy", wxLua_wxBitmapCopy_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } },
      { LuaConstructor, "wxEmptyBitmap", wxLua_wxEmptyBitmap_constructor, 3, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
!     { LuaConstructor, "wxBitmapFromFile", wxLua_wxBitmapFromFile_constructor, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } },
      { LuaConstructor, "wxBitmapFromXPMData", wxLua_wxBitmapFromXPMData_constructor, 1, 1, { &s_wxluaarg_LightUserData, 0 } },
      { LuaMethod, "Create", wxLua_wxBitmap_Create, 3, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
--- 5980,5984 ----
      { LuaConstructor, "wxBitmapCopy", wxLua_wxBitmapCopy_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } },
      { LuaConstructor, "wxEmptyBitmap", wxLua_wxEmptyBitmap_constructor, 3, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
!     { LuaConstructor, "wxBitmapFromFile", wxLua_wxBitmapFromFile_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } },
      { LuaConstructor, "wxBitmapFromXPMData", wxLua_wxBitmapFromXPMData_constructor, 1, 1, { &s_wxluaarg_LightUserData, 0 } },
      { LuaMethod, "Create", wxLua_wxBitmap_Create, 3, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },