[Wxlua-commit] wxLua/bindings/wxwidgets defsutil.i,1.7,1.8 wx.rules,1.9,1.10

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	defsutil.i wx.rules 
Log Message:
Fix Makefiles to use wx-config --exec-prefix for lib dir
remove wxLiaCheckRunError, make CheckRunError static in wxLuaState
Capitalize all functions in genwxbind.lua, provide means to dump data types
wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found
comment wx.rules and give better names to variables
move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX
move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** defsutil.i	28 Nov 2005 01:28:54 -0000	1.7
--- defsutil.i	12 Dec 2005 05:16:31 -0000	1.8
***************
*** 75,80 ****
  // Network, user, and OS functions

! !%wxchkver27 %builtin long wxGetFreeMemory()
! %wxchkver27 %builtin wxMemorySize wxGetFreeMemory()
  %builtin wxString wxGetFullHostName()
  //%builtin bool wxGetEmailAddress(const wxString& buf, int sz)
--- 75,81 ----
  // Network, user, and OS functions

! // !%wxchkver27 %builtin long wxGetFreeMemory() FIXME need to add wxLongLong - maybe always return longlong here?
! // %wxchkver27 %builtin wxMemorySize wxGetFreeMemory()
! 
  %builtin wxString wxGetFullHostName()
  //%builtin bool wxGetEmailAddress(const wxString& buf, int sz)

Index: wx.rules
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wx.rules	30 Nov 2005 04:46:16 -0000	1.9
--- wx.rules	12 Dec 2005 05:16:31 -0000	1.10
***************
*** 1,32 ****
! -- rules to build wxLua binding for parts/debuggermsw
! wxluapath="../"

! --cdluapath=wxluapath.."/parts/cdlua/" -- FIXME see genwxbind for this

! interfacedir    = wxluapath.."/bindings/wxwidgets"
! outputdir       = wxluapath.."/modules/wxbind/src"
! outputheaderdir = wxluapath.."/modules/wxbind/include"

! hook_namespace     = "wx"                             -- lua namespace
! hook_precmp_header = "wx/wxprec.h"                    -- always #include this
! hook_binding_class = hook_namespace.."_Binding"       -- wxLuaBinding class
  hook_define_file   = hook_namespace.."_define"
  hook_define_fn     = "wxLuaGetDefineList_"..hook_namespace
  hook_object_file   = hook_namespace.."_object"
  hook_object_fn     = "wxLuaGetObjectList_"..hook_namespace
  hook_event_file    = hook_namespace.."_event"
  hook_event_fn      = "wxLuaGetEventList_"..hook_namespace
  hook_builtin_file  = hook_namespace.."_builtin"
  hook_builtin_fn    = "wxLuaGetBuiltinList_"..hook_namespace
  hook_class_file    = hook_namespace.."_class"
  hook_class_fn      = "wxLuaGetClassList_"..hook_namespace
- hook_header_file   = "wxbind/include/wxbind.h"
- 
- override_file      = "override.hpp"                   -- bindings to override

  -- generate comments into code
  comment = true

! -- list of interface files to use to make the bindings
  interfaceFileList =
  {
--- 1,62 ----
! -------------------------------------------------------------------------------
! -- rules to build wxWidgets binding for wxLua (for genwxbind.lua)
! -------------------------------------------------------------------------------

! -------------------------------------------------------------------------------
! -- Set the root directory of the wxLua distribution, used only in this file
! wxlua_dir = "../"

! --cdluapath=wxlua_dir.."/parts/cdlua/" -- FIXME see genwxbind for this

! -------------------------------------------------------------------------------
! -- Set the bindings directory that contains the *.i interface files
! interface_dir     = wxlua_dir.."/bindings/wxwidgets"
! -- Set the directory to output the bindings to, both C++ header and source files
! output_dir        = wxlua_dir.."/modules/wxbind/src"
! output_header_dir = wxlua_dir.."/modules/wxbind/include"
! 
! -------------------------------------------------------------------------------
! -- Set the namespace that the bindings will be placed, eg. wx.wxWindow(...)
! hook_namespace       = "wx"
! -- Set any #includes or other C++ code to be placed verbatim at the top of
! --   every generated file or "" for none
! hook_header_includes = "#include \"wx/wxprec.h\"\n"
! -- Set the name of the subclassed wxLuaBinding class
! hook_binding_class   = hook_namespace.."_Binding"
! 
! -------------------------------------------------------------------------------
! -- Set the name of the header file that will have the #includes from the
! --   bindings in it. This will be used as #include "hook_header_file" in the C++
! --   wrapper files, so it must include the proper #include path.
! hook_header_file   = "wxbind/include/wxbind.h"
! 
! -------------------------------------------------------------------------------
! -- Set the files to output the structs of wrapped defined values, objects,
! --   events, builtin (static functionc), and classes
  hook_define_file   = hook_namespace.."_define"
  hook_define_fn     = "wxLuaGetDefineList_"..hook_namespace
+ 
  hook_object_file   = hook_namespace.."_object"
  hook_object_fn     = "wxLuaGetObjectList_"..hook_namespace
+ 
  hook_event_file    = hook_namespace.."_event"
  hook_event_fn      = "wxLuaGetEventList_"..hook_namespace
+ 
  hook_builtin_file  = hook_namespace.."_builtin"
  hook_builtin_fn    = "wxLuaGetBuiltinList_"..hook_namespace
+ 
  hook_class_file    = hook_namespace.."_class"
  hook_class_fn      = "wxLuaGetClassList_"..hook_namespace

+ -------------------------------------------------------------------------------
  -- generate comments into code
  comment = true

! -------------------------------------------------------------------------------
! -- Set the file that contains bindings that need to be overridden
! override_file = "override.hpp"
! 
! -------------------------------------------------------------------------------
! -- list of interface files to use to make the bindings in the "interfacedir"
  interfaceFileList =
  {
***************
*** 63,69 ****
  }

! -- wxLuaBinding OnRegister body
! --
! -- can load extra lua bindings here
  onregister =
  {
--- 93,99 ----
  }

! -------------------------------------------------------------------------------
! -- virtual wxLuaBinding::OnRegister body - can load extra lua bindings here
! 
  onregister =
  {
***************
*** 82,85 ****
  }

! -- you can add additional conditions here
! conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)"
--- 112,122 ----
  }

! -------------------------------------------------------------------------------
! -- Add additional conditions here
! 
! -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)"
! 
! -------------------------------------------------------------------------------
! -- Add additional data types here
! 
! -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false)