[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.27,1.28

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/modules/wxlua/src

Modified Files:
	internal.cpp 
Log Message:
-1 to wxID_ANY
match #if #endif with comment of #if statement
Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app
allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack)


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** internal.cpp	2 Feb 2006 20:07:13 -0000	1.27
--- internal.cpp	3 Feb 2006 04:53:58 -0000	1.28
***************
*** 32,49 ****
  #endif
  
- #include "wx/datetime.h"
- 
  #include "wxlua/include/internal.h"
  #include "wxlua/include/wxlcallb.h"
  #include "wxlua/include/wxlintrp.h"
  
- #include "wxluadebug/include/wxldebug.h" // FIXME for wxLuaDebugData
- 
- 
- //#ifdef FindText
- //# undef FindText
- //#endif
- 
- extern int s_wxluatag_wxBitmap;
  extern int s_wxluatag_wxEvtHandler;
  
--- 32,39 ----
***************
*** 486,489 ****
--- 476,494 ----
  }
  
+ // FIXME - this function copied from wxLuaDebugData to remove dependency
+ wxString wxLuaDebugData_MakeNumber(double dnum)
+ {
+     long num = (long) dnum;
+     if ((double) num == dnum)
+     {
+         if (num >= 0)
+             return wxString::Format(wxT("%lu (0x%lx)"), num, num);
+ 
+         return wxString::Format(wxT("%ld (0x%lx)"), num, num);
+     }
+ 
+     return wxString::Format(wxT("%g"), dnum);
+ }
+ 
  void wxLuaCheckStack::DumpType(lua_State *L, int index, wxString& type, wxString& value, wxString& info)
  {
***************
*** 506,510 ****
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = wxLuaDebugData::MakeNumber(lua_tonumber(L, index));
              break;
  
--- 511,515 ----
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = wxLuaDebugData_MakeNumber(lua_tonumber(L, index));
              break;
  
***************
*** 1037,1040 ****
--- 1042,1046 ----
  int LUACALL wxEvtHandler_ConnectEvent(lua_State *L)
  {
+     wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua"));
      wxLuaState wxlState(L);
      wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
***************
*** 1161,1226 ****
  }
  
- 
- int LUACALL CreateStandaloneBitmaps(lua_State *L)
- {
- #include "art/new.xpm"
- #include "art/open.xpm"
- #include "art/save.xpm"
- #include "art/saveall.xpm"
- #include "art/cut.xpm"
- #include "art/copy.xpm"
- #include "art/paste.xpm"
- #include "art/help.xpm"
- 
-     wxCHECK_MSG(s_wxluatag_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua"));
- 
-     wxLuaState wxlState(L);
-     wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
- 
-     wxBitmap *returns;
- 
-     returns = new wxBitmap(new_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "newBitmap");
- 
-     returns = new wxBitmap(open_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "openBitmap");
- 
-     returns = new wxBitmap(save_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "saveBitmap");
- 
-     returns = new wxBitmap(saveall_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "saveAllBitmap");
- 
-     returns = new wxBitmap(cut_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "cutBitmap");
- 
-     returns = new wxBitmap(copy_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "copyBitmap");
- 
-     returns = new wxBitmap(paste_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "pasteBitmap");
- 
-     returns = new wxBitmap(help_xpm);
-     wxlState.addToTrackedMemoryList(returns);
-     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
-     lua_setglobal(L, "helpBitmap");
- 
-     return 0;
- }
- 
  int LUACALL LuaError(lua_State *L, int status, int top)
  {
--- 1167,1170 ----