[Wxlua-commit] wxLua/bindings genwxbind.bat,1.1,1.2 genwxbind.lua,1.1,1.2

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

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

Modified Files:
	genwxbind.bat genwxbind.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: genwxbind.bat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** genwxbind.bat	18 Jun 2005 20:53:41 -0000	1.1
--- genwxbind.bat	20 Jun 2005 06:55:23 -0000	1.2
***************
*** 5,9 ****
  
  echo Generating wxWidgets Binding
! %LUA% -e"rulesFilename=\"wxwidgets\wx.rules\"" genwxbind.lua > wxwidgets\error.txt
  echo Done.
  
--- 5,9 ----
  
  echo Generating wxWidgets Binding
! %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt
  echo Done.
  

Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** genwxbind.lua	18 Jun 2005 20:53:41 -0000	1.1
--- genwxbind.lua	20 Jun 2005 06:55:23 -0000	1.2
***************
*** 1228,1231 ****
--- 1228,1233 ----
      table.insert(parseState.ObjectStack, 1, globals)
  
+     local enumType = "" -- FIXME temp fix
+ 
      local lineCount = table.getn(interfaceData)
      for l=1, lineCount do 
***************
*** 1401,1404 ****
--- 1403,1408 ----
                          end
                          
+                         enumType = ""
+                         
                          table.insert(objectList, parseState.ObjectStack[1])
                          table.remove(parseState.ObjectStack, 1)
***************
*** 1577,1580 ****
--- 1581,1585 ----
                                      lineState.DefType = "enum"
                                      lineState.Name = tag
+                                     lineState.DataType = enumType
  
                                      local member= AllocMember(lineState)
***************
*** 1668,1675 ****
                              lineState.ActionMandatory = false
                          elseif lineState.Action == "enumname" then
!                          -- FIXME THIS IS THE NAME OF THE ENUM!!! 
!                             print("ENUMNAME ", tag)
                              parseState.ObjectStack[1].Name = tag
!                             
                              lineState.Action = nil
                              lineState.ActionMandatory = false
--- 1673,1683 ----
                              lineState.ActionMandatory = false
                          elseif lineState.Action == "enumname" then
!                             -- FIXME THIS IS THE NAME OF THE ENUM!!! 
!                             -- print("ENUMNAME ", tag)
                              parseState.ObjectStack[1].Name = tag
! 
!                             lineState.DataType = tag
!                             enumType = tag
! 
                              lineState.Action = nil
                              lineState.ActionMandatory = false
***************
*** 2521,2528 ****
              elseif member.DefType == "enum" then
                  -- FIXME - write enum as enumType::enumValue
!                 print(member.Name, member.DataType, member.DefType, member.TypedDataTypeWithAttrib, TypedDataType)
                  local enumBinding = 
                  { 
!                     Map = "        { \""..member.Name.."\", false, "..member.Name..", 0 },\n",
                      Condition = fullcondition
                  }
--- 2529,2545 ----
              elseif member.DefType == "enum" then
                  -- FIXME - write enum as enumType::enumValue
!                 print(member.Name, member.DataType, member.DefType, member.TypedDataTypeWithAttrib, member.TypedDataType)
!                 
!                 -- if we have wxDateTime::TZ, only take the wxDateTime part
!                 local dataType = member.DataType or ""
!                 local pos = string.find(dataType, "::")
!                 local namespace = ""
!                 if pos then
!                     namespace = string.sub(dataType, 0, pos - 1) .. "::"
!                 end
! 
                  local enumBinding = 
                  { 
!                     Map = "        { \""..member.Name.."\", false, "..namespace..member.Name..", 0 },\n",
                      Condition = fullcondition
                  }