[Wxlua-commit] wxLua/bindings Makefile, 1.4, 1.5 genwxbind.lua, 1.141, 1.142

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

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

Modified Files:
	Makefile genwxbind.lua 
Log Message:
Add wxAUI library and rebuild all build files
Cleanup Makefiles using wx-config and include common bits to simplify them


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	17 Jun 2007 17:17:36 -0000	1.4
--- Makefile	4 Jul 2007 05:39:13 -0000	1.5
***************
*** 16,20 ****
  endif
  
! all: wxwidgets wxstc wxlua wxluasocket wxluacan
  
  wxwidgets:
--- 16,20 ----
  endif
  
! all: wxwidgets wxstc wxaui wxlua wxluasocket wxluacan
  
  wxwidgets:
***************
*** 27,30 ****
--- 27,34 ----
  	@($(LUA) -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc/error.txt)
  
+ wxaui:
+ 	@echo Building wxAui
+ 	@($(LUA) -e"rulesFilename=\"wxaui/wxaui_rules.lua\"" genwxbind.lua > wxaui/error.txt)
+ 
  wxlua:
  	@echo Building wxLua

Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** genwxbind.lua	2 Jul 2007 17:06:03 -0000	1.141
--- genwxbind.lua	4 Jul 2007 05:39:13 -0000	1.142
***************
*** 719,722 ****
--- 719,723 ----
      preprocConditionTable["wxUSE_ANIMATIONCTRL"]           = "wxUSE_ANIMATIONCTRL"
      preprocConditionTable["wxUSE_APPLE_IEEE"]              = "wxUSE_APPLE_IEEE"
+     preprocConditionTable["wxUSE_AUI"]                     = "wxUSE_AUI"
      preprocConditionTable["wxUSE_BITMAPCOMBOBOX"]          = "wxUSE_BITMAPCOMBOBOX"
      preprocConditionTable["wxUSE_BMPBUTTON"]               = "wxUSE_BMPBUTTON"
***************
*** 918,921 ****
--- 919,923 ----
      preprocConditionTable["wxLUA_USE_wxArrayString"]           = "wxLUA_USE_wxArrayString"
      preprocConditionTable["wxLUA_USE_wxArtProvider"]           = "wxLUA_USE_wxArtProvider"
+     preprocConditionTable["wxLUA_USE_wxAUI"]                   = "wxLUA_USE_wxAUI"
      preprocConditionTable["wxLUA_USE_wxBitmap"]                = "wxLUA_USE_wxBitmap"
      preprocConditionTable["wxLUA_USE_wxBitmapComboBox"]        = "wxLUA_USE_wxBitmapComboBox"
***************
*** 3305,3308 ****
--- 3307,3313 ----
                              overload_argList = overload_argList.."&s_wxluaarg_Integer, "
                              argItem = "("..argType..")wxlua_getintegertype(L, "..argNum..")"
+                         elseif not numeric then
+                             overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(argType)..", "
+                             argItem = "*("..argTypeWithAttrib.."*)wxlState.GetUserDataType("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")"
                          else
                              overload_argList = overload_argList.."&s_wxluaarg_Number, "