[Wxlua-commit] wxLua/modules/wxbind/src file.cpp,1.18,1.19 gdi.cpp,1.25,1.26 menutool.cpp,1.15,1.16

[Francesco M. <fr...@us...>]

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

Modified Files:
	file.cpp gdi.cpp menutool.cpp 
Log Message:
fixing borland builds

Index: menutool.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** menutool.cpp	15 May 2006 21:55:35 -0000	1.15
--- menutool.cpp	24 May 2006 17:02:41 -0000	1.16
***************
*** 71,75 ****
      long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0);
      // const wxString& title = ""
!     wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT(""));
      // int table
      if (lua_istable(L, 1))
--- 71,75 ----
      long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0);
      // const wxString& title = ""
!     wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT("")));
      // int table
      if (lua_istable(L, 1))

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** file.cpp	24 May 2006 15:45:52 -0000	1.18
--- file.cpp	24 May 2006 17:02:41 -0000	1.19
***************
*** 2074,2078 ****
      int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT(""));
      // wxString * filename
      wxString filename;
--- 2074,2078 ----
      int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT("")));
      // wxString * filename
      wxString filename;

Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** gdi.cpp	18 May 2006 05:47:39 -0000	1.25
--- gdi.cpp	24 May 2006 17:02:41 -0000	1.26
***************
*** 3281,3285 ****
      bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true);
      // const wxString &faceName = wxEmptyString
!     wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxT(""));
      // wxFontEncoding *altEncoding
      wxFontEncoding altEncoding;
--- 3281,3285 ----
      bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true);
      // const wxString &faceName = wxEmptyString
!     wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT("")));
      // wxFontEncoding *altEncoding
      wxFontEncoding altEncoding;