[Wxlua-commit] wxLua/apps/wxlua/src wxlua.cpp,1.3,1.4

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

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

Modified Files:
	wxlua.cpp 
Log Message:
wxLua app should probably always load standalone bitmaps for people
wrong \ in genwxbind.bat
hack to get genwxbind.lua to work with %enums, %builtin is still broken
have editor.wx.lua use new wxToolBar::AddTool method


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua.cpp	18 Jun 2005 20:45:46 -0000	1.3
--- wxlua.cpp	20 Jun 2005 06:55:22 -0000	1.4
***************
*** 140,143 ****
--- 140,153 ----
          RegisterClasses(m_luaState);
  
+         wxFileSystem::AddHandler(new wxMemoryFSHandler);
+ 
+         wxImage::AddHandler(new wxXPMHandler);
+         #include "../art/wxluasmall.xpm"
+         wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM);
+         m_fMemoryBitmapAdded = true;
+ 
+         lua_pushcfunction(m_luaState, CreateStandaloneBitmaps);
+         lua_setglobal(m_luaState, "standaloneLoadBitmaps");
+ 
          if (argc == 1)
          {
***************
*** 369,373 ****
  {
      #include "editor.h"
! 
      wxFileSystem::AddHandler(new wxMemoryFSHandler);
  
--- 379,383 ----
  {
      #include "editor.h"
! /*
      wxFileSystem::AddHandler(new wxMemoryFSHandler);
  
***************
*** 379,383 ****
      lua_pushcfunction(m_luaState, CreateStandaloneBitmaps);
      lua_setglobal(m_luaState, "standaloneLoadBitmaps");
! 
      return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName);
  }
--- 389,393 ----
      lua_pushcfunction(m_luaState, CreateStandaloneBitmaps);
      lua_setglobal(m_luaState, "standaloneLoadBitmaps");
! */
      return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName);
  }