wxlua-commit

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

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

Modified Files:
	editor.wx.lua 
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: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor.wx.lua	7 Jun 2005 05:37:45 -0000	1.1
--- editor.wx.lua	20 Jun 2005 06:55:23 -0000	1.2
***************
*** 110,136 ****
      end
  
!     local bitmapPath = getPath().."/bitmaps/"
!     newBitmap     = wx.wxBitmapFromFile(bitmapPath.."new.bmp",     wx.wxBITMAP_TYPE_BMP)
!     openBitmap    = wx.wxBitmapFromFile(bitmapPath.."open.bmp",    wx.wxBITMAP_TYPE_BMP)
!     saveBitmap    = wx.wxBitmapFromFile(bitmapPath.."save.bmp",    wx.wxBITMAP_TYPE_BMP)
!     saveAllBitmap = wx.wxBitmapFromFile(bitmapPath.."saveall.bmp", wx.wxBITMAP_TYPE_BMP)
!     cutBitmap     = wx.wxBitmapFromFile(bitmapPath.."cut.bmp",     wx.wxBITMAP_TYPE_BMP)
!     copyBitmap    = wx.wxBitmapFromFile(bitmapPath.."copy.bmp",    wx.wxBITMAP_TYPE_BMP)
!     pasteBitmap   = wx.wxBitmapFromFile(bitmapPath.."paste.bmp",   wx.wxBITMAP_TYPE_BMP)
!     helpBitmap    = wx.wxBitmapFromFile(bitmapPath.."help.bmp",    wx.wxBITMAP_TYPE_BMP)
  else
      standaloneLoadBitmaps()
  end
  
! toolBar:AddTool(wx.wxID_NEW,   newBitmap,     wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Creates an empty document")
! toolBar:AddTool(wx.wxID_OPEN,  openBitmap,    wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Opens an existing document")
! toolBar:AddTool(wx.wxID_SAVE,  saveBitmap,    wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Saves the document")
! toolBar:AddTool(wxID_SAVEALL,  saveAllBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Saves the document")
  toolBar:AddSeparator()
! toolBar:AddTool(wx.wxID_CUT,   cutBitmap,     wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Cut the selection")
! toolBar:AddTool(wx.wxID_COPY,  copyBitmap,    wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Copy the selection")
! toolBar:AddTool(wx.wxID_PASTE, pasteBitmap,   wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Paste the clipboard")
  toolBar:AddSeparator()
! toolBar:AddTool(wx.wxID_HELP,  helpBitmap,    wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Display the About box")
  toolBar:Realize()
  
--- 110,137 ----
      end
  
!     local bitmapPath = getPath().."./art/"
!     print(bitmapPath )
!     newBitmap     = wx.wxBitmapFromFile(bitmapPath.."new.xpm",     wx.wxBITMAP_TYPE_XPM)
!     openBitmap    = wx.wxBitmapFromFile(bitmapPath.."open.xpm",    wx.wxBITMAP_TYPE_XPM)
!     saveBitmap    = wx.wxBitmapFromFile(bitmapPath.."save.xpm",    wx.wxBITMAP_TYPE_XPM)
!     saveAllBitmap = wx.wxBitmapFromFile(bitmapPath.."saveall.xpm", wx.wxBITMAP_TYPE_XPM)
!     cutBitmap     = wx.wxBitmapFromFile(bitmapPath.."cut.xpm",     wx.wxBITMAP_TYPE_XPM)
!     copyBitmap    = wx.wxBitmapFromFile(bitmapPath.."copy.xpm",    wx.wxBITMAP_TYPE_XPM)
!     pasteBitmap   = wx.wxBitmapFromFile(bitmapPath.."paste.xpm",   wx.wxBITMAP_TYPE_XPM)
!     helpBitmap    = wx.wxBitmapFromFile(bitmapPath.."help.xpm",    wx.wxBITMAP_TYPE_XPM)
  else
      standaloneLoadBitmaps()
  end
  
! toolBar:AddToolSimple(wx.wxID_NEW,   "New",      newBitmap,     "Creates an empty document")
! toolBar:AddToolSimple(wx.wxID_OPEN,  "Open",     openBitmap,    "Opens an existing document")
! toolBar:AddToolSimple(wx.wxID_SAVE,  "Save",     saveBitmap,    "Saves the document")
! toolBar:AddToolSimple(wxID_SAVEALL,  "Save All", saveAllBitmap, "Saves all documents")
  toolBar:AddSeparator()
! toolBar:AddToolSimple(wx.wxID_CUT,   "Cut",      cutBitmap,     "Cut the selection")
! toolBar:AddToolSimple(wx.wxID_COPY,  "Copy",     copyBitmap,    "Copy the selection")
! toolBar:AddToolSimple(wx.wxID_PASTE, "Paste",    pasteBitmap,   "Paste the clipboard")
  toolBar:AddSeparator()
! toolBar:AddToolSimple(wx.wxID_HELP,  "Help",     helpBitmap,    "Display the About box")
  toolBar:Realize()