[Wxlua-commit] wxLua/bindings/wxstc Makefile, 1.5, 1.6 wxstc_datatypes.lua, 1.56, 1.57 wxstc_rules.lua, 1.18, 1.19

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

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

Modified Files:
	Makefile wxstc_datatypes.lua wxstc_rules.lua 
Log Message:
Changed the Delete() function from the %delete tag for classes to just
   delete() to avoid any future name clashes since delete() is never allowed
   to be a function name in C++.
Moved the wxStyledTextCtrl class and it's 1268 defines into the wxstc table.
Moved wxLuaObject, wxLuaDebugger (and friends) into the wxlua table and
   added more functions for inspecting userdata and the bindings.
Fix mismatches between the bindings base classes and what they really are.


Index: wxstc_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_rules.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxstc_rules.lua	9 Jun 2006 03:24:49 -0000	1.18
--- wxstc_rules.lua	14 Jun 2007 01:23:08 -0000	1.19
***************
*** 11,15 ****
  -- Set the lua namespace (lua table) that the bindings will be placed into.
  --   eg. wx.wxWindow(...)
! hook_lua_namespace = "wx"
  
  -- Set the C++ "namespace" that the bindings will be placed.
--- 11,15 ----
  -- Set the lua namespace (lua table) that the bindings will be placed into.
  --   eg. wx.wxWindow(...)
! hook_lua_namespace = "wxstc"
  
  -- Set the C++ "namespace" that the bindings will be placed.
***************
*** 134,138 ****
  -------------------------------------------------------------------------------
  -- Add additional data types here
! -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false)
  
  --=============================================================================
--- 134,138 ----
  -------------------------------------------------------------------------------
  -- Add additional data types here
! -- example: AllocDataType("wxArrayInt", "class",false)
  
  --=============================================================================

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	31 May 2007 17:18:46 -0000	1.5
--- Makefile	14 Jun 2007 01:23:08 -0000	1.6
***************
*** 11,18 ****
  WXLUA_DIR = ../..
  
- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst
- THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS))
- #DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxstc/override.hpp # $(THEWRAPPERS)
- 
  all: genwxbind
  
--- 11,14 ----

Index: wxstc_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** wxstc_datatypes.lua	13 Jun 2007 04:15:21 -0000	1.56
--- wxstc_datatypes.lua	14 Jun 2007 01:23:08 -0000	1.57
***************
*** 295,299 ****
    },
    wxBestHelpController = {
!     BaseClass = "wxHelpController",
      Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
--- 295,299 ----
    },
    wxBestHelpController = {
!     BaseClass = "wxHelpControllerBase",
      Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
***************
*** 997,1001 ****
    },
    wxExtHelpController = {
!     BaseClass = "wxHelpController",
      Condition = "(!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
--- 997,1001 ----
    },
    wxExtHelpController = {
!     BaseClass = "wxHelpControllerBase",
      Condition = "(!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
***************
*** 1165,1168 ****
--- 1165,1169 ----
    },
    wxFontData = {
+     BaseClass = "wxObject",
      Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog",
      DefType = "class",
***************
*** 1531,1535 ****
    },
    wxHelpController = {
!     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
      DefType = "class",
--- 1532,1536 ----
    },
    wxHelpController = {
!     BaseClass = "wxHelpControllerBase",
      Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
      DefType = "class",
***************
*** 1537,1540 ****
--- 1538,1548 ----
      Name = "wxHelpController",
    },
+   wxHelpControllerBase = {
+     BaseClass = "wxObject",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxHelpControllerBase",
+   },
    wxHelpControllerHelpProvider = {
      BaseClass = "wxSimpleHelpProvider",
***************
*** 1577,1580 ****
--- 1585,1589 ----
    },
    wxHtmlCell = {
+     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxHTML && wxUSE_HTML",
      DefType = "class",
***************
*** 1604,1608 ****
    },
    wxHtmlHelpController = {
!     BaseClass = "wxHelpController",
      Condition = "(wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
--- 1613,1617 ----
    },
    wxHtmlHelpController = {
!     BaseClass = "wxHelpControllerBase",
      Condition = "(wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
***************
*** 1624,1627 ****
--- 1633,1637 ----
    },
    wxHtmlParser = {
+     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxHTML && wxUSE_HTML",
      DefType = "class",
***************
*** 1637,1640 ****
--- 1647,1651 ----
    },
    wxHtmlTag = {
+     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxHTML && wxUSE_HTML",
      DefType = "class",
***************
*** 2076,2095 ****
      Name = "wxLuaHtmlWindow",
    },
-   wxLuaMethod_Type = {
-     DefType = "enum",
-     IsNumber = true,
-     Name = "wxLuaMethod_Type",
-   },
    wxLuaObject = {
-     BaseClass = "wxObject",
      DefType = "class",
      IsNumber = false,
      Name = "wxLuaObject",
    },
-   wxLuaObject_Type = {
-     DefType = "enum",
-     IsNumber = true,
-     Name = "wxLuaObject_Type",
-   },
    wxLuaPrintout = {
      BaseClass = "wxPrintout",
--- 2087,2095 ----
***************
*** 2099,2108 ****
      Name = "wxLuaPrintout",
    },
-   wxLuaState = {
-     BaseClass = "wxObject",
-     DefType = "class",
-     IsNumber = false,
-     Name = "wxLuaState",
-   },
    wxLuaTreeItemData = {
      BaseClass = "wxTreeItemData",
--- 2099,2102 ----
***************
*** 2199,2203 ****
    },
    wxMenuBar = {
!     BaseClass = "wxEvtHandler",
      Condition = "wxLUA_USE_wxMenu && wxUSE_MENUS",
      DefType = "class",
--- 2193,2197 ----
    },
    wxMenuBar = {
!     BaseClass = "wxWindow",
      Condition = "wxLUA_USE_wxMenu && wxUSE_MENUS",
      DefType = "class",
***************
*** 2523,2527 ****
    },
    wxPreviewCanvas = {
!     BaseClass = "wxScrolledWindow",
      Condition = "wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE",
      DefType = "class",
--- 2517,2521 ----
    },
    wxPreviewCanvas = {
!     BaseClass = "wxWindow",
      Condition = "wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE",
      DefType = "class",
***************
*** 2530,2534 ****
    },
    wxPreviewControlBar = {
!     BaseClass = "wxPanel",
      Condition = "wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE",
      DefType = "class",
--- 2524,2528 ----
    },
    wxPreviewControlBar = {
!     BaseClass = "wxWindow",
      Condition = "wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE",
      DefType = "class",
***************
*** 3005,3009 ****
    },
    wxSplitterEvent = {
!     BaseClass = "wxCommandEvent",
      Condition = "wxLUA_USE_wxSplitterWindow",
      DefType = "class",
--- 2999,3003 ----
    },
    wxSplitterEvent = {
!     BaseClass = "wxNotifyEvent",
      Condition = "wxLUA_USE_wxSplitterWindow",
      DefType = "class",
***************
*** 3285,3289 ****
    },
    wxTimer = {
!     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER",
      DefType = "class",
--- 3279,3283 ----
    },
    wxTimer = {
!     BaseClass = "wxEvtHandler",
      Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER",
      DefType = "class",
***************
*** 3334,3337 ****
--- 3328,3332 ----
    },
    wxToolBarToolBase = {
+     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxToolbar",
      DefType = "class",
***************
*** 3528,3532 ****
    },
    wxWinHelpController = {
!     BaseClass = "wxHelpController",
      Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
--- 3523,3527 ----
    },
    wxWinHelpController = {
!     BaseClass = "wxHelpControllerBase",
      Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
      DefType = "class",
***************
*** 3541,3545 ****
    },
    wxWindowCreateEvent = {
!     BaseClass = "wxCommandEvent",
      DefType = "class",
      IsNumber = false,
--- 3536,3540 ----
    },
    wxWindowCreateEvent = {
!     BaseClass = "wxEvent",
      DefType = "class",
      IsNumber = false,
***************
*** 3554,3558 ****
    },
    wxWindowDestroyEvent = {
!     BaseClass = "wxCommandEvent",
      DefType = "class",
      IsNumber = false,
--- 3549,3553 ----
    },
    wxWindowDestroyEvent = {
!     BaseClass = "wxEvent",
      DefType = "class",
      IsNumber = false,
***************
*** 3623,3626 ****
--- 3618,3622 ----
    },
    wxXmlDocument = {
+     BaseClass = "wxObject",
      Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML",
      DefType = "class",