wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/bindings/wxwidgets wxcore_gdi.i,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2076/wxLua/bindings/wxwidgets

Modified Files:
	wxcore_gdi.i 
Log Message:
Small binding generator fixes for special cases, added op_cast.


Index: wxcore_gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxcore_gdi.i	22 Oct 2008 05:31:45 -0000	1.5
--- wxcore_gdi.i	24 Oct 2008 04:40:12 -0000	1.6
***************
*** 52,56 ****
      %operator wxPoint operator-(const wxSize& s) const //{ return wxPoint(x - s.GetWidth(), y - s.GetHeight()); }
  
!     %operator wxPoint operator-() const { return wxPoint(-x, -y); }
  %endclass
  
--- 52,56 ----
      %operator wxPoint operator-(const wxSize& s) const //{ return wxPoint(x - s.GetWidth(), y - s.GetHeight()); }
  
!     %operator wxPoint operator-() const //{ return wxPoint(-x, -y); }
  %endclass
  

[Wxlua-commit] wxLua/modules/wxbind/src wxcore_geometry.cpp, 1.11, 1.12

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/modules/wxbind/src

Modified Files:
	wxcore_geometry.cpp 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: wxcore_geometry.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_geometry.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxcore_geometry.cpp	29 Jan 2008 04:22:53 -0000	1.11
--- wxcore_geometry.cpp	22 Oct 2008 05:31:45 -0000	1.12
***************
*** 220,224 ****
  {
      // get the number value
!     int val = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DInt *self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt);
--- 220,224 ----
  {
      // get the number value
!     wxInt32 val = (wxInt32)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DInt *self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt);
***************
*** 235,239 ****
  {
      // get the number value
!     int val = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DInt *self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt);
--- 235,239 ----
  {
      // get the number value
!     wxInt32 val = (wxInt32)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DInt *self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt);
***************
*** 677,681 ****
  {
      // get the number value
!     double val = (double)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DDouble *self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble);
--- 677,681 ----
  {
      // get the number value
!     wxDouble val = (wxDouble)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DDouble *self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble);
***************
*** 692,696 ****
  {
      // get the number value
!     double val = (double)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DDouble *self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble);
--- 692,696 ----
  {
      // get the number value
!     wxDouble val = (wxDouble)wxlua_getnumbertype(L, 2);
      // get this
      wxPoint2DDouble *self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble);
***************
*** 1678,1682 ****
  {
      // get the number value
!     double val = (double)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
--- 1678,1682 ----
  {
      // get the number value
!     wxDouble val = (wxDouble)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
***************
*** 1805,1809 ****
  {
      // get the number value
!     double val = (double)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
--- 1805,1809 ----
  {
      // get the number value
!     wxDouble val = (wxDouble)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
***************
*** 1820,1824 ****
  {
      // get the number value
!     double val = (double)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
--- 1820,1824 ----
  {
      // get the number value
!     wxDouble val = (wxDouble)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
***************
*** 1835,1839 ****
  {
      // get the number value
!     double val = (double)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
--- 1835,1839 ----
  {
      // get the number value
!     wxDouble val = (wxDouble)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DDouble *self = (wxRect2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DDouble);
***************
*** 2763,2767 ****
  {
      // get the number value
!     int val = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
--- 2763,2767 ----
  {
      // get the number value
!     wxInt32 val = (wxInt32)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
***************
*** 2890,2894 ****
  {
      // get the number value
!     int val = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
--- 2890,2894 ----
  {
      // get the number value
!     wxInt32 val = (wxInt32)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
***************
*** 2905,2909 ****
  {
      // get the number value
!     int val = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
--- 2905,2909 ----
  {
      // get the number value
!     wxInt32 val = (wxInt32)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
***************
*** 2920,2924 ****
  {
      // get the number value
!     int val = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);
--- 2920,2924 ----
  {
      // get the number value
!     wxInt32 val = (wxInt32)wxlua_getnumbertype(L, 2);
      // get this
      wxRect2DInt *self = (wxRect2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect2DInt);

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.169,1.170

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

Update of /cvsroot/wxlua/wxLua/bindings
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** genwxbind.lua	21 Oct 2008 04:23:18 -0000	1.169
--- genwxbind.lua	22 Oct 2008 05:31:45 -0000	1.170
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 23 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
--- 18,22 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 24 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
***************
*** 395,406 ****
  
  -- ---------------------------------------------------------------------------
- -- Get base type for a data type that is a typedef
- -- ---------------------------------------------------------------------------
- function GetTypeDef(datatype)
-     -- if typedef is found, replace type with replacement typedef
-     return typedefTable[datatype] or datatype
- end
- 
- -- ---------------------------------------------------------------------------
  -- Get the dataTypeTable[typedefinition] from a string after removing delimiters
  -- ---------------------------------------------------------------------------
--- 395,398 ----
***************
*** 420,424 ****
  -- Get the base dataTypeTable[typedefinition] by translating typedefs
  -- ---------------------------------------------------------------------------
! function GetDataTypeBase(datatype)
      if dataTypeTable[datatype] then
          return dataTypeTable[datatype]
--- 412,416 ----
  -- Get the base dataTypeTable[typedefinition] by translating typedefs
  -- ---------------------------------------------------------------------------
! function GetDataTypedefBase(datatype)
      if dataTypeTable[datatype] then
          return dataTypeTable[datatype]
***************
*** 433,437 ****
      end
  
!     print("ERROR: Missing data type '"..tostring(datatype).."' in GetDataTypeBase.")
  
      return nil
--- 425,429 ----
      end
  
!     print("ERROR: Missing data type '"..tostring(datatype).."' in GetDataTypedefBase.")
  
      return nil
***************
*** 465,469 ****
  -- ---------------------------------------------------------------------------
  function GetDataTypeCondition(datatype)
!     local dtype = GetDataTypeBase(datatype)
      if dtype then
          return dtype.Condition
--- 457,461 ----
  -- ---------------------------------------------------------------------------
  function GetDataTypeCondition(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return dtype.Condition
***************
*** 479,483 ****
  -- ---------------------------------------------------------------------------
  function IsDataTypeNumeric(datatype)
!     local dtype = GetDataTypeBase(datatype)
      if dtype then
          return dtype.IsNumber
--- 471,475 ----
  -- ---------------------------------------------------------------------------
  function IsDataTypeNumeric(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return dtype.IsNumber
***************
*** 493,497 ****
  -- ---------------------------------------------------------------------------
  function IsDataTypeEnum(datatype)
!     local dtype = GetDataTypeBase(datatype)
      if dtype then
          return (dtype.ValueType == "enum")
--- 485,489 ----
  -- ---------------------------------------------------------------------------
  function IsDataTypeEnum(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return (dtype.ValueType == "enum")
***************
*** 1656,1659 ****
--- 1648,1653 ----
          local action    = nil -- what to look for next
  
+         local typedefTable = {}
+ 
          for t = 1, #lineTags do
              local tag = lineTags[t]
***************
*** 1682,1685 ****
--- 1676,1681 ----
                      elseif tag == "%enum" then
                          action = "find_enumname"
+                     elseif tag == "%typedef" then
+                         action = "find_typedef"
                      end
                  end
***************
*** 1723,1729 ****
--- 1719,1743 ----
  
                      action = nil
+                 elseif action == "find_typedef" then
+                     table.insert(typedefTable, tag)
+ 
+                 end
+             end
+         end
+ 
+         if #typedefTable > 0 then
+             local typedef_name = typedefTable[#typedefTable]
+             local typedef_type = table.concat(typedefTable, " ", 1, #typedefTable-1)
+             local dt = false
+             for i = 1,#typedefTable-1 do
+                 -- increment forward until we know the type, skipping const and other attribs
+                 dt = dataTypeTable[table.concat(typedefTable, " ", i, #typedefTable-1)]
+                 if dt then
+                     AllocDataType(typedef_name, dt.ValueType, dt.IsNumber)
+                     break
                  end
              end
          end
+ 
      end
  end
***************
*** 2278,2286 ****
                          elseif lineState.Action == "action_typedef" then
                              lineState.Name = tag
  
                              lineState.Action = "action_typedefvalue"
                              lineState.ActionMandatory = true
                          elseif lineState.Action == "action_typedefvalue" then
!                             lineState.RValue = SpaceSeparateStrings(lineState.RValue, tag)
  
                              lineState.Action = "action_typedefvalue" -- allow more than one word
--- 2292,2303 ----
                          elseif lineState.Action == "action_typedef" then
                              lineState.Name = tag
+                             lineState.RValue = {}
+                             table.insert(lineState.RValue, tag)
  
                              lineState.Action = "action_typedefvalue"
                              lineState.ActionMandatory = true
                          elseif lineState.Action == "action_typedefvalue" then
!                             --lineState.RValue = SpaceSeparateStrings(lineState.RValue, tag)
!                             table.insert(lineState.RValue, tag)
  
                              lineState.Action = "action_typedefvalue" -- allow more than one word
***************
*** 2597,2602 ****
          -- set line definition data
          if lineState.DefType == "deftype_%typedef" then
!             -- line is a typedef
!             typedefTable[lineState.Name] = lineState.RValue
  
          elseif lineState.DefType == "deftype_%if" then
--- 2614,2622 ----
          -- set line definition data
          if lineState.DefType == "deftype_%typedef" then
!             -- line is in the form: typedef [unsigned int] wxUInt32
!             local typedef_name = lineState.RValue[#lineState.RValue]
!             local typedef_type = table.concat(lineState.RValue, " ", 1, #lineState.RValue-1)
! 
!             typedefTable[typedef_name] = typedef_type
  
          elseif lineState.DefType == "deftype_%if" then
***************
*** 2803,2807 ****
              -- ---------------------------------------------------------------
              if (member.DefType == "deftype_%member") or (member.DefType == "deftype_%member_func") then
!                 local memberType = GetTypeDef(member.DataType)
                  local memberGetFunc = "Get_"..member.Name
                  local memberSetFunc = "Set_"..member.Name
--- 2823,2827 ----
              -- ---------------------------------------------------------------
              if (member.DefType == "deftype_%member") or (member.DefType == "deftype_%member_func") then
!                 local memberType    = member.DataType
                  local memberGetFunc = "Get_"..member.Name
                  local memberSetFunc = "Set_"..member.Name
***************
*** 3772,3777 ****
                              end
  
!                             if dataTypeTable[memberType]["%encapsulate"] then
!                                 table.insert(codeList, "    wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_"..MakeVar(memberType).."(("..returnCast..")returns));\n")
                              else
                                  table.insert(codeList, "    wxluaO_addgcobject(L, ("..returnCast..")returns);\n")
--- 3792,3799 ----
                              end
  
!                             local member_DataType = GetDataTypedefBase(memberType)
! 
!                             if member_DataType["%encapsulate"] then
!                                 table.insert(codeList, "    wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_"..MakeVar(member_DataType.Name).."(("..returnCast..")returns));\n")
                              else
                                  table.insert(codeList, "    wxluaO_addgcobject(L, ("..returnCast..")returns);\n")

[Wxlua-commit] wxLua/modules/wxbind/include wxadv_bind.h, 1.14, 1.15 wxaui_bind.h, 1.14, 1.15 wxbase_bind.h, 1.14, 1.15 wxcore_bind.h, 1.15, 1.16 wxgl_bind.h, 1.13, 1.14 wxhtml_bind.h, 1.14, 1.15 wxmedia_bind.h, 1.13, 1.14 wxnet_bind.h, 1.13, 1.14 wxrichtext_bind.h, 1.13, 1.14 wxstc_bind.h, 1.13, 1.14 wxxml_bind.h, 1.13, 1.14 wxxrc_bind.h, 1.13, 1.14

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/modules/wxbind/include

Modified Files:
	wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h 
	wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h 
	wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: wxadv_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxadv_bind.h	31 Jan 2008 04:34:06 -0000	1.14
--- wxadv_bind.h	22 Oct 2008 05:31:45 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxcore_bind.h	21 Oct 2008 04:23:18 -0000	1.15
--- wxcore_bind.h	22 Oct 2008 05:31:45 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxrichtext_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxrichtext_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxrichtext_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxxrc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxxrc_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxxrc_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxnet_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxnet_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxnet_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxbase_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxbase_bind.h	29 Jan 2008 00:49:11 -0000	1.14
--- wxbase_bind.h	22 Oct 2008 05:31:45 -0000	1.15
***************
*** 19,25 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 19,25 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxmedia_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxmedia_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxmedia_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxgl_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxgl_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxgl_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxstc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxstc_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxstc_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxaui_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxaui_bind.h	29 Jan 2008 00:49:11 -0000	1.14
--- wxaui_bind.h	22 Oct 2008 05:31:45 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxhtml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxhtml_bind.h	29 Jan 2008 00:49:11 -0000	1.14
--- wxhtml_bind.h	22 Oct 2008 05:31:45 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

Index: wxxml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxxml_bind.h	29 Jan 2008 00:49:11 -0000	1.13
--- wxxml_bind.h	22 Oct 2008 05:31:45 -0000	1.14
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/docs binding.html, 1.28, 1.29 changelog.txt, 1.63, 1.64

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

Update of /cvsroot/wxlua/wxLua/docs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/docs

Modified Files:
	binding.html changelog.txt 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** changelog.txt	2 Feb 2008 17:10:12 -0000	1.63
--- changelog.txt	22 Oct 2008 05:31:45 -0000	1.64
***************
*** 2,5 ****
--- 2,13 ----
   ===============
  
+  version 2.8.9.0
+  --------------------------------------------------------------------
+ 
+  * Changed the %typedef binding to work as the C/C++ typedefs work.
+    The usage is reversed from how it was in previous versions.
+    You will need to swap the parameters for it in your bindings.
+    Example: %typedef long wxTextCoord
+ 
   version 2.8.7.0  (released 02/02/2008)
   --------------------------------------------------------------------

Index: binding.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** binding.html	21 Oct 2008 04:23:18 -0000	1.28
--- binding.html	22 Oct 2008 05:31:45 -0000	1.29
***************
*** 786,798 ****
  single line or a
  whole class.</li>
! </ul><i><b>%typedef
! UNKNOWN_CLASS KNOWN_CLASS</b></i><br>
! <ul> <li>Declares to the binding that the <i>UNKNOWN_CLASS</i>
! should be treated as <i>KNOWN_CLASS</i>. </li> <li>An
  example of
! this is <i>"%typedef wxNotebookPage wxWindow"</i> where
! the wxNotebookPage is really just a typedef to a wxWindow in C++ and so
! there's no reason to actually declare the %class wxNotebookPage for
! wxLua.</li>
  </ul><b><i>%ungc</i></b><i><br>
  </i><ul> <li>For use before a userdata parameter of
--- 786,798 ----
  single line or a
  whole class.</li>
! </ul><i><b>%typedef&nbsp;KNOWN_DATATYPE</b></i> <i><b>UNKNOWN_DATATYPE</b></i>
! <ul> <li>Declares to the binding that the <i>UNKNOWN_DATATYPE</i>
! should be treated as <i>KNOWN_DATATYPE</i>. </li> <li>An
  example of
! this is <i>"%typedef long wxTextCoord"</i> where
! the wxTextCoord is&nbsp;just a long integer.</li><li>Without
! the %typedef the binding generator would give an error about an unknown
! data type, since it would assume that a typo or an error in the
! interface file has been made.</li>
  </ul><b><i>%ungc</i></b><i><br>
  </i><ul> <li>For use before a userdata parameter of

[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.94, 1.95 wxbase_base.i, 1.3, 1.4 wxbase_datetime.i, 1.2, 1.3 wxcore_controls.i, 1.6, 1.7 wxcore_gdi.i, 1.4, 1.5 wxcore_geometry.i, 1.1, 1.2 wxcore_image.i, 1.3, 1.4 wxcore_print.i, 1.5, 1.6 wxcore_windows.i, 1.4, 1.5

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/bindings/wxwidgets

Modified Files:
	wx_datatypes.lua wxbase_base.i wxbase_datetime.i 
	wxcore_controls.i wxcore_gdi.i wxcore_geometry.i 
	wxcore_image.i wxcore_print.i wxcore_windows.i 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: wxcore_gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxcore_gdi.i	22 Jan 2008 04:04:24 -0000	1.4
--- wxcore_gdi.i	22 Oct 2008 05:31:45 -0000	1.5
***************
*** 829,833 ****
  
  %if wxLUA_USE_wxIcon
! %typedef WXHANDLE void*
  
  %class %delete wxIcon, wxGDIObject
--- 829,833 ----
  
  %if wxLUA_USE_wxIcon
! %typedef void* WXHANDLE
  
  %class %delete wxIcon, wxGDIObject
***************
*** 952,956 ****
  %if wxLUA_USE_wxCursor
  
! //%typedef WXHANDLE void*
  
  %include "wx/cursor.h"
--- 952,956 ----
  %if wxLUA_USE_wxCursor
  
! //%typedef void* WXHANDLE
  
  %include "wx/cursor.h"

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** wx_datatypes.lua	21 Oct 2008 04:23:18 -0000	1.94
--- wx_datatypes.lua	22 Oct 2008 05:31:45 -0000	1.95
***************
*** 1132,1135 ****
--- 1132,1140 ----
      ValueType = "enum",
    },
+   ["wxDateTime::wxDateTime_t"] = {
+     IsNumber = true,
+     Name = "wxDateTime::wxDateTime_t",
+     ValueType = "number",
+   },
    wxDateTimeArray = {
      ["%encapsulate"] = true,
***************
*** 2586,2589 ****
--- 2591,2599 ----
      ValueType = "class",
    },
+   wxLogLevel = {
+     IsNumber = true,
+     Name = "wxLogLevel",
+     ValueType = "number",
+   },
    wxLogNull = {
      ["%encapsulate"] = true,
***************
*** 2920,2923 ****
--- 2930,2938 ----
      ValueType = "class",
    },
+   wxNotebookPage = {
+     IsNumber = false,
+     Name = "wxNotebookPage",
+     ValueType = "class",
+   },
    wxNotebookSizer = {
      BaseClass = "wxSizer",
***************
*** 4086,4089 ****
--- 4101,4109 ----
      ValueType = "class",
    },
+   wxTraceMask = {
+     IsNumber = true,
+     Name = "wxTraceMask",
+     ValueType = "number",
+   },
    wxTreeCtrl = {
      BaseClass = "wxControl",

Index: wxcore_geometry.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_geometry.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_geometry.i	16 Jul 2007 19:34:25 -0000	1.1
--- wxcore_geometry.i	22 Oct 2008 05:31:45 -0000	1.2
***************
*** 10,15 ****
  %if wxLUA_USE_Geometry && wxUSE_GEOMETRY
  
! %typedef wxInt32 int
! %typedef wxDouble double
  
  %enum wxOutCode
--- 10,15 ----
  %if wxLUA_USE_Geometry && wxUSE_GEOMETRY
  
! %typedef int wxInt32
! %typedef double wxDouble
  
  %enum wxOutCode

Index: wxcore_print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_print.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxcore_print.i	10 Jan 2008 23:06:23 -0000	1.5
--- wxcore_print.i	22 Oct 2008 05:31:45 -0000	1.6
***************
*** 10,14 ****
  %if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE
  
! %typedef wxPreviewWindow wxScrolledWindow
  
  %include "wx/print.h"
--- 10,14 ----
  %if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE
  
! %typedef wxScrolledWindow wxPreviewWindow
  
  %include "wx/print.h"
***************
*** 397,401 ****
  %include "wx/printdlg.h"
  
! //%typedef wxPageSetupDialog wxPageSetupDialogBase
  
  %class wxPageSetupDialog, wxObject // NOT a wxDialog in 2.6
--- 397,401 ----
  %include "wx/printdlg.h"
  
! //%typedef wxPageSetupDialogBase wxPageSetupDialog
  
  %class wxPageSetupDialog, wxObject // NOT a wxDialog in 2.6

Index: wxbase_base.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_base.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxbase_base.i	22 Dec 2007 06:07:08 -0000	1.3
--- wxbase_base.i	22 Oct 2008 05:31:45 -0000	1.4
***************
*** 346,351 ****
  // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated
  
! %typedef wxTraceMask unsigned long
! %typedef wxLogLevel unsigned long
  
  %enum // wxLogLevel - uses these enums
--- 346,351 ----
  // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated
  
! %typedef unsigned long wxTraceMask
! %typedef unsigned long wxLogLevel
  
  %enum // wxLogLevel - uses these enums

Index: wxcore_image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_image.i	18 Dec 2007 01:03:32 -0000	1.3
--- wxcore_image.i	22 Oct 2008 05:31:45 -0000	1.4
***************
*** 467,472 ****
  %include "wx/artprov.h"
  
! //%typedef wxArtClient wxString   Just treat these as wxStrings
! //%typedef wxArtID wxString
  
  // ----------------------------------------------------------------------------
--- 467,472 ----
  %include "wx/artprov.h"
  
! //%typedef wxString wxArtClient   Just treat these as wxStrings
! //%typedef wxString wxArtID
  
  // ----------------------------------------------------------------------------

Index: wxcore_windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_windows.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxcore_windows.i	17 Jan 2008 22:37:29 -0000	1.4
--- wxcore_windows.i	22 Oct 2008 05:31:45 -0000	1.5
***************
*** 90,97 ****
  %endenum
  
! //%mac|%x11|%motif %typedef WXWidget void*
! //%gtk %typedef WXWidget unsigned long // GtkWidget* what could you do with it?
! //%mgl %typedef WXWidget  window_t
! //%msw|%os2 %typedef WXWidget  unsigned long
  
  %class %delete %noclassinfo %encapsulate wxVisualAttributes
--- 90,97 ----
  %endenum
  
! //%mac|%x11|%motif %typedef void* WXWidget
! //%gtk %typedef unsigned long WXWidget // GtkWidget* what could you do with it?
! //%mgl %typedef window_t WXWidget
! //%msw|%os2 %typedef unsigned long WXWidget
  
  %class %delete %noclassinfo %encapsulate wxVisualAttributes
***************
*** 490,494 ****
  %endenum
  
! %typedef wxNotebookPage wxWindow
  
  %class wxNotebook, wxBookCtrlBase
--- 490,494 ----
  %endenum
  
! %typedef wxWindow wxNotebookPage
  
  %class wxNotebook, wxBookCtrlBase

Index: wxbase_datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_datetime.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxbase_datetime.i	18 Dec 2007 01:03:32 -0000	1.2
--- wxbase_datetime.i	22 Oct 2008 05:31:45 -0000	1.3
***************
*** 132,136 ****
  %endenum
  
! %typedef wxDateTime::wxDateTime_t unsigned short
  
  %class %delete %noclassinfo %encapsulate wxDateTime
--- 132,136 ----
  %endenum
  
! %typedef unsigned short wxDateTime::wxDateTime_t
  
  %class %delete %noclassinfo %encapsulate wxDateTime

Index: wxcore_controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxcore_controls.i	26 Mar 2008 05:01:31 -0000	1.6
--- wxcore_controls.i	22 Oct 2008 05:31:45 -0000	1.7
***************
*** 830,834 ****
  %endenum
  
! %typedef wxTextCoord long
  %define wxOutOfRangeTextCoord
  %define wxInvalidTextCoord
--- 830,834 ----
  %endenum
  
! %typedef long wxTextCoord
  %define wxOutOfRangeTextCoord
  %define wxInvalidTextCoord

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan_bind.h,1.2,1.3

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan_bind.h 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: wxluacan_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxluacan_bind.h	29 Jan 2008 00:49:10 -0000	1.2
--- wxluacan_bind.h	22 Oct 2008 05:31:45 -0000	1.3
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h, 1.43, 1.44 wxlua_bind.h, 1.14, 1.15

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/modules/wxlua/include

Modified Files:
	wxldefs.h wxlua_bind.h 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wxldefs.h	24 Jan 2008 00:18:17 -0000	1.43
--- wxldefs.h	22 Oct 2008 05:31:46 -0000	1.44
***************
*** 36,42 ****
  #define wxLUA_MAJOR_VERSION       2
  #define wxLUA_MINOR_VERSION       8
! #define wxLUA_RELEASE_NUMBER      7
  #define wxLUA_SUBRELEASE_NUMBER   0
! #define wxLUA_VERSION_STRING      wxT("wxLua 2.8.7.0")
  
  // For non-Unix systems (i.e. when building without a configure script),
--- 36,42 ----
  #define wxLUA_MAJOR_VERSION       2
  #define wxLUA_MINOR_VERSION       8
! #define wxLUA_RELEASE_NUMBER      9
  #define wxLUA_SUBRELEASE_NUMBER   0
! #define wxLUA_VERSION_STRING      wxT("wxLua 2.8.9.0")
  
  // For non-Unix systems (i.e. when building without a configure script),
***************
*** 65,69 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 23
  
  // ----------------------------------------------------------------------------
--- 65,69 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 24
  
  // ----------------------------------------------------------------------------

Index: wxlua_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxlua_bind.h	29 Jan 2008 00:49:15 -0000	1.14
--- wxlua_bind.h	22 Oct 2008 05:31:46 -0000	1.15
***************
*** 17,23 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 17,23 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.35, 1.36

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/modules/wxluasocket/include

Modified Files:
	wxluasocket_bind.h 
Log Message:
Swap parameters to the %typedef tag to follow C/C++ nomenclature
Call AllocDataType in genwxbind.lua for the %typedef automatically.


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxluasocket_bind.h	29 Jan 2008 00:49:16 -0000	1.35
--- wxluasocket_bind.h	22 Oct 2008 05:31:46 -0000	1.36
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 23
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 23
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxbind/include wxcore_bind.h, 1.14, 1.15

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23977/wxLua/modules/wxbind/include

Modified Files:
	wxcore_bind.h 
Log Message:
Add operators for <<, >>, %, ~


Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxcore_bind.h	29 Jan 2008 00:49:11 -0000	1.14
--- wxcore_bind.h	21 Oct 2008 04:23:18 -0000	1.15
***************
*** 1133,1136 ****
--- 1133,1139 ----
      extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxClipboard_methods[];
      extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxClipboard_methodCount;
+     extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxClipboardLocker;
+     extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxClipboardLocker_methods[];
+     extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxClipboardLocker_methodCount;
  #endif // wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
  
***************
*** 1857,1860 ****
--- 1860,1867 ----
  #endif // wxLUA_USE_wxCaret && wxUSE_CARET
  
+ #if wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxClipboardLocker, wxClipboardLocker)
+ #endif // wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
+ 
  #if wxLUA_USE_wxColourPenBrush
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxColourDatabase, wxColourDatabase)

[Wxlua-commit] wxLua/docs binding.html, 1.27, 1.28 wxlua.html, 1.37, 1.38 wxluaref.html, 1.50, 1.51

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

Update of /cvsroot/wxlua/wxLua/docs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23977/wxLua/docs

Modified Files:
	binding.html wxlua.html wxluaref.html 
Log Message:
Add operators for <<, >>, %, ~


Index: wxluaref.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** wxluaref.html	31 Jan 2008 05:09:19 -0000	1.50
--- wxluaref.html	21 Oct 2008 04:23:18 -0000	1.51
***************
*** 449,452 ****
--- 449,457 ----
  <td>&nbsp;
  <tr>
+ <td><a href="#wxClipboardLocker">wxClipboardLocker</a>
+ <td bgcolor=FFAAAA>&nbsp;
+ <td align="center" bgcolor=AAFFAA>X
+ <td>&nbsp;
+ <tr>
  <td><a href="#wxClipboardTextEvent">wxClipboardTextEvent</a>
  <td align="center" bgcolor=AAFFAA>X
***************
*** 1914,1927 ****
  <td>&nbsp;
  <tr>
- <td><a href="#wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>
- <td bgcolor=FFAAAA>&nbsp;
- <td align="center" bgcolor=AAFFAA>X
- <td>&nbsp;
- <tr>
- <td><a href="#wxLuaDebuggerServer">wxLuaDebuggerServer</a>
- <td bgcolor=FFAAAA>&nbsp;
- <td align="center" bgcolor=AAFFAA>X
- <td>&nbsp;
- <tr>
  <td><a href="#wxLuaGridTableBase">wxLuaGridTableBase</a>
  <td bgcolor=FFAAAA>&nbsp;
--- 1919,1922 ----
***************
*** 1949,1957 ****
  <td>&nbsp;
  <tr>
- <td><a href="#wxLuaState">wxLuaState</a>
- <td bgcolor=FFAAAA>&nbsp;
- <td align="center" bgcolor=AAFFAA>X
- <td>&nbsp;
- <tr>
  <td><a href="#wxLuaTreeItemData">wxLuaTreeItemData</a>
  <td bgcolor=FFAAAA>&nbsp;
--- 1944,1947 ----
***************
*** 3457,3462 ****
  <a href="#wxLocaleInfo">wxLocaleInfo</a><br>
  <a href="#wxLocaleInitFlags">wxLocaleInitFlags</a><br>
- <a href="#wxLuaMethod_Type">wxLuaMethod_Type</a><br>
- <a href="#wxLuaObject_Type">wxLuaObject_Type</a><br>
  <a href="#wxMediaCtrlPlayerControls">wxMediaCtrlPlayerControls</a><br>
  <a href="#wxMediaState">wxMediaState</a><br>
--- 3447,3450 ----
***************
*** 6127,6130 ****
--- 6115,6119 ----
      static <a href="#wxString">wxString</a> GetPathSeparators(<a href="#wxPathFormat">wxPathFormat</a> format = wxPATH_NATIVE)<br>
      static <a href="#wxString">wxString</a>  GetPathTerminators(<a href="#wxPathFormat">wxPathFormat</a> format = wxPATH_NATIVE)<br>
+     <a href="#wxString">wxString</a> GetPathWithSep(<a href="#wxPathFormat">wxPathFormat</a> format = wxPATH_NATIVE ) const<br>
      <a href="#wxString">wxString</a> GetShortPath() const<br>
  <br>
***************
*** 6173,6176 ****
--- 6162,6166 ----
      void PrependDir(const <a href="#wxString">wxString</a>&amp; dir)<br>
      void RemoveDir(int pos)<br>
+     void RemoveLastDir()<br>
      bool Rmdir()<br>
      static bool Rmdir(const <a href="#wxString">wxString</a>&amp; dir)<br>
***************
*** 7266,7274 ****
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
! <font color=#009900>// wxClipboardLocker</font><br>
  <br>
! <font color=#009900>// Since the Lua garbage collector runs whenever necessary this class doesn't</font><br>
! <font color=#009900>// serve its purpose of closing the clipboard when it goes out of scope as it</font><br>
! <font color=#009900>// does in C++.</font><br>
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
--- 7256,7268 ----
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
! <font color=#009900>// <a href="#wxClipboardLocker">wxClipboardLocker</a></font><br>
  <br>
! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxClipboardLocker">wxClipboardLocker</a></font></b>
! <blockquote>
!     <font color=#009900>// NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough</font><br>
!     <a href="#wxClipboardLocker">wxClipboardLocker</a>(<a href="#wxClipboard">wxClipboard</a> *clipboard = NULL)<br>
! <br>
!     <i>%operator</i> bool operator!() const<br>
! </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br>
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
***************
*** 8479,8482 ****
--- 8473,8477 ----
      virtual bool CanRedo()<br>
      virtual bool CanUndo()<br>
+     virtual void ChangeValue(const <a href="#wxString">wxString</a>&amp; value)<br>
      virtual void Clear()<br>
      virtual void Copy()<br>
***************
*** 11036,11040 ****
  <font color=#009900>// <a href="#wxPaintEvent">wxPaintEvent</a> -</font><br>
  <font color=#009900>//</font><br>
! <font color=#009900>// Note: You must ALWAYS create a <a href="#wxPaintDC">wxPaintDC</a> for the window abd delete() when</font><br>
  <font color=#009900>// done to have the exposed area marked as painted, otherwise you'll continue</font><br>
  <font color=#009900>// to get endless paint events.</font><br>
--- 11031,11035 ----
  <font color=#009900>// <a href="#wxPaintEvent">wxPaintEvent</a> -</font><br>
  <font color=#009900>//</font><br>
! <font color=#009900>// Note: You must ALWAYS create a <a href="#wxPaintDC">wxPaintDC</a> for the window and delete() when</font><br>
  <font color=#009900>// done to have the exposed area marked as painted, otherwise you'll continue</font><br>
  <font color=#009900>// to get endless paint events.</font><br>
***************
*** 14252,14256 ****
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaArtProvider">wxLuaArtProvider</a>, <a href="#wxArtProvider">wxArtProvider</a></font></b>
  <blockquote>
! <font color=#BB0055>    <font color=#009900>// <i>%override</i> - the C++ function takes the <a href="#wxLuaState">wxLuaState</a> as the first param</font></font><br>
      <a href="#wxLuaArtProvider">wxLuaArtProvider</a>()<br>
  <br>
--- 14247,14251 ----
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaArtProvider">wxLuaArtProvider</a>, <a href="#wxArtProvider">wxArtProvider</a></font></b>
  <blockquote>
! <font color=#BB0055>    <font color=#009900>// <i>%override</i> - the C++ function takes the wxLuaState as the first param</font></font><br>
      <a href="#wxLuaArtProvider">wxLuaArtProvider</a>()<br>
  <br>
***************
*** 14821,14824 ****
--- 14816,14828 ----
      <font color=#009900>// void SetName(const <a href="#wxString">wxString</a>&amp; text) const - deprecated</font><br>
      <i>%win</i> void SetTextColour(const <a href="#wxColour">wxColour</a>&amp; colour) const<br>
+     <br>
+     <i>%if</i> <i>%wxchkver_2_8</i><br>
+         void SetItemLabel(const <a href="#wxString">wxString</a>&amp; str)<br>
+         <a href="#wxString">wxString</a> GetItemLabel() const<br>
+         <a href="#wxString">wxString</a> GetItemLabelText() const <br>
+ <br>
+         static <a href="#wxString">wxString</a> GetLabelText(const <a href="#wxString">wxString</a>&amp; label)<br>
+     <i>%endif</i><br>
+     <br>
  </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br>
  <br>
***************
*** 15417,15421 ****
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaPrintout">wxLuaPrintout</a>, <a href="#wxPrintout">wxPrintout</a></font></b>
  <blockquote>
! <font color=#BB0055>    <font color=#009900>// <i>%override</i> - the C++ function takes the <a href="#wxLuaState">wxLuaState</a> as the first param</font></font><br>
      <a href="#wxLuaPrintout">wxLuaPrintout</a>(const <a href="#wxString">wxString</a>&amp; title = "Printout", <a href="#wxLuaObject">wxLuaObject</a> *pObject = NULL)<br>
  <br>
--- 15421,15425 ----
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaPrintout">wxLuaPrintout</a>, <a href="#wxPrintout">wxPrintout</a></font></b>
  <blockquote>
! <font color=#BB0055>    <font color=#009900>// <i>%override</i> - the C++ function takes the wxLuaState as the first param</font></font><br>
      <a href="#wxLuaPrintout">wxLuaPrintout</a>(const <a href="#wxString">wxString</a>&amp; title = "Printout", <a href="#wxLuaObject">wxLuaObject</a> *pObject = NULL)<br>
  <br>
***************
*** 18292,18295 ****
--- 18296,18302 ----
      void IncRef()<br>
      void DecRef()<br>
+ <br>
+     int GetRef() const <font color=#009900>// wxLua added function to help track if it needs to be refed</font><br>
+ <br>
      virtual void SetParameters(const <a href="#wxString">wxString</a>&amp; params)<br>
  </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br>
***************
*** 18588,18592 ****
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaGridTableBase">wxLuaGridTableBase</a>, <a href="#wxGridTableBase">wxGridTableBase</a></font></b>
  <blockquote>
! <font color=#BB0055>    <font color=#009900>// <i>%override</i> - the C++ function takes the <a href="#wxLuaState">wxLuaState</a> as the first param</font></font><br>
      <a href="#wxLuaGridTableBase">wxLuaGridTableBase</a>()<br>
  <br>
--- 18595,18599 ----
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaGridTableBase">wxLuaGridTableBase</a>, <a href="#wxGridTableBase">wxGridTableBase</a></font></b>
  <blockquote>
! <font color=#BB0055>    <font color=#009900>// <i>%override</i> - the C++ function takes the wxLuaState as the first param</font></font><br>
      <a href="#wxLuaGridTableBase">wxLuaGridTableBase</a>()<br>
  <br>
***************
*** 24864,24867 ****
--- 24871,24889 ----
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
+ <font color=#009900>// Force the Lua garbage collector to act or ignore object *DANGEROUS*</font><br>
+ <font color=#009900>//</font><br>
+ <font color=#009900>// These are *only* meant for very special cases and should NOT be used unless</font><br>
+ <font color=#009900>// you have an initmate knowledge about the object and how it will be treated</font><br>
+ <font color=#009900>// by wxWidgets, wxLua, and Lua.</font><br>
+ <br>
+ <font color=#009900>// Add the userdata object to the list of objects that will be deleted when</font><br>
+ <font color=#009900>// it does out of scope and the Lua garbage collector runs.</font><br>
+ <font color=#009900>// <i>%function</i> bool gcobject(void* object)</font><br>
+ <br>
+ <font color=#009900>// Remove the userdata object from the list of objects that will be deleted when</font><br>
+ <font color=#009900>// it does out of scope and the Lua garbage collector runs.</font><br>
+ <font color=#AA0000><i>%function</i> bool ungcobject(void* object)</font><br>
+ <br>
+ <font color=#009900>// ---------------------------------------------------------------------------</font><br>
  <font color=#009900>// Type information about the bindings or current userdata</font><br>
  <br>
***************
*** 25021,25025 ****
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
! <font color=#009900>// <a href="#wxLuaState">wxLuaState</a></font><br>
  <br>
  <i>%include</i> "wxlua/include/wxlstate.h"<br>
--- 25043,25047 ----
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
! <font color=#009900>// wxLuaState</font><br>
  <br>
  <i>%include</i> "wxlua/include/wxlstate.h"<br>
***************
*** 25028,25033 ****
  <blockquote>
  <font color=#888888>/*<br>
!     <a href="#wxLuaState">wxLuaState</a>(bool create = false)<br>
!     <a href="#wxLuaState">wxLuaState</a>(<a href="#wxEvtHandler">wxEvtHandler</a> *handler, wxWindowID id = wxID_ANY)<br>
  <br>
      bool Ok() const<br>
--- 25050,25055 ----
  <blockquote>
  <font color=#888888>/*<br>
!     wxLuaState(bool create = false)<br>
!     wxLuaState(<a href="#wxEvtHandler">wxEvtHandler</a> *handler, wxWindowID id = wxID_ANY)<br>
  <br>
      bool Ok() const<br>
***************
*** 25064,25068 ****
  <blockquote>
  <font color=#BB0055>    <font color=#009900>// <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font></font><br>
!     <font color=#009900>// C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const <a href="#wxLuaState">wxLuaState</a>&amp; wxlState, int stack_idx = 1)</font><br>
      <font color=#009900>// Wrap the single value passed in with a <a href="#wxLuaObject">wxLuaObject</a></font><br>
      <a href="#wxLuaObject">wxLuaObject</a>()<br>
--- 25086,25090 ----
  <blockquote>
  <font color=#BB0055>    <font color=#009900>// <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font></font><br>
!     <font color=#009900>// C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const wxLuaState&amp; wxlState, int stack_idx = 1)</font><br>
      <font color=#009900>// Wrap the single value passed in with a <a href="#wxLuaObject">wxLuaObject</a></font><br>
      <a href="#wxLuaObject">wxLuaObject</a>()<br>
***************
*** 25120,25124 ****
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerServer">wxLuaDebuggerServer</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b>
  <blockquote>
!     <a href="#wxLuaDebuggerServer">wxLuaDebuggerServer</a>(int portNumber)<br>
  <br>
      bool StartServer()<br>
--- 25142,25146 ----
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerServer">wxLuaDebuggerServer</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b>
  <blockquote>
!     wxLuaDebuggerServer(int portNumber)<br>
  <br>
      bool StartServer()<br>
***************
*** 25129,25133 ****
      bool RemoveBreakPoint(const <a href="#wxString">wxString</a> &amp;fileName, int lineNumber)<br>
      bool ClearAllBreakPoints()<br>
!     bool Run(const <a href="#wxString">wxString</a> &amp;file, const <a href="#wxString">wxString</a> &amp;fileName)<br>
      bool Step()<br>
      bool StepOver()<br>
--- 25151,25155 ----
      bool RemoveBreakPoint(const <a href="#wxString">wxString</a> &amp;fileName, int lineNumber)<br>
      bool ClearAllBreakPoints()<br>
!     bool Run(const <a href="#wxString">wxString</a> &amp;fileName, const <a href="#wxString">wxString</a> &amp;buffer)<br>
      bool Step()<br>
      bool StepOver()<br>
***************
*** 25154,25158 ****
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
! <font color=#009900>// <a href="#wxLuaDebuggerEvent">wxLuaDebuggerEvent</a></font><br>
  <br>
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>, <a href="#wxEvent">wxEvent</a></font></b>
--- 25176,25180 ----
  <br>
  <font color=#009900>// ---------------------------------------------------------------------------</font><br>
! <font color=#009900>// wxLuaDebuggerEvent</font><br>
  <br>
  <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>, <a href="#wxEvent">wxEvent</a></font></b>

Index: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxlua.html	24 Jan 2008 04:53:47 -0000	1.37
--- wxlua.html	21 Oct 2008 04:23:18 -0000	1.38
***************
*** 3,7 ****
  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title>
  
! <meta content="John Labenski" name="author"></head>
  <body>
  <h2><u>wxLua
--- 3,8 ----
  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title>
  
! <meta content="John Labenski" name="author">
! </head>
  <body>
  <h2><u>wxLua
***************
*** 16,20 ****
  running
  standalone wxLua
! scripts (wxLuaFreeze), a Lua module to load using&nbsp;<i>require("wx")</i> when using
  the standard Lua executable, and a
  library for
--- 17,22 ----
  running
  standalone wxLua
! scripts (wxLuaFreeze), a Lua module to load using&nbsp;<i>require("wx")</i>
! when using
  the standard Lua executable, and a
  library for
***************
*** 28,32 ****
  fast, dynamic, and easy to learn. Lua contains a limited
  number of data types,
! mainly numbers, strings, functions,&nbsp;tables, and userdata. Perhaps the most
  powerful
  feature of the Lua language is that the tables can be used as either
--- 30,35 ----
  fast, dynamic, and easy to learn. Lua contains a limited
  number of data types,
! mainly numbers, strings, functions,&nbsp;tables, and userdata.
! Perhaps the most
  powerful
  feature of the Lua language is that the tables can be used as either
***************
*** 719,729 ****
  arr" you must provide a wxArrayInt userdata since the C++ function
  will most likely modify the wxArrayInt that's passed to it.
! <br><br><b>Location of the wxWidgets objects declared in a
  C++ header files in the <i>wx</i> Lua
! table</b><ul>
  <li><b>#define
! NUMBER_DEFINE VALUE</b> </li><ul>
! 
! 
  <li>All
  #defined numerical values are available as <i>wx.NUMBER_DEFINE</i></li>
--- 722,734 ----
  arr" you must provide a wxArrayInt userdata since the C++ function
  will most likely modify the wxArrayInt that's passed to it.
! <br>
! <br>
! <b>Location of the wxWidgets objects declared in a
  C++ header files in the <i>wx</i> Lua
! table</b>
! <ul>
  <li><b>#define
! NUMBER_DEFINE VALUE</b> </li>
! <ul>
  <li>All
  #defined numerical values are available as <i>wx.NUMBER_DEFINE</i></li>
***************
*** 734,741 ****
  tag<br>
  </li>
! 
! </ul><li><b>[int,
! double, etc] NUMBER_VARIABLE;</b></li><ul>
! 
  <li>All
  global numerical variables are available as <i>wx.NUMBER_VARIABLE</i></li>
--- 739,746 ----
  tag<br>
  </li>
! </ul>
! <li><b>[int,
! double, etc] NUMBER_VARIABLE;</b></li>
! <ul>
  <li>All
  global numerical variables are available as <i>wx.NUMBER_VARIABLE</i></li>
***************
*** 745,752 ****
  in the bindings using the <i>%define</i>
  tag</li>
! 
! </ul><li><b>enum ENUM_NAMESPACE [or
! CLASSNAME::ENUM_NAMESPACE] { ENUM_NAME }</b></li><ul>
! 
  <li>All global enums, named or not, are available as <i>wx.ENUM_NAME</i></li>
  <ul>
--- 750,757 ----
  in the bindings using the <i>%define</i>
  tag</li>
! </ul>
! <li><b>enum ENUM_NAMESPACE [or
! CLASSNAME::ENUM_NAMESPACE] { ENUM_NAME }</b></li>
! <ul>
  <li>All global enums, named or not, are available as <i>wx.ENUM_NAME</i></li>
  <ul>
***************
*** 768,775 ****
  the <i>%enum</i>
  tag</li>
! 
! </ul><li><b>#define
! STRING_DEFINE wxT("String Value")</b></li><ul>
! 
  <li>All
  #defined string values are available as <i>wx.STRING_DEFINE</i></li>
--- 773,780 ----
  the <i>%enum</i>
  tag</li>
! </ul>
! <li><b>#define
! STRING_DEFINE wxT("String Value")</b></li>
! <ul>
  <li>All
  #defined string values are available as <i>wx.STRING_DEFINE</i></li>
***************
*** 779,786 ****
  <li>Declared in the bindings using the <i>%define_string</i>
  tag</li>
! 
! </ul><li><b>const wxChar*
! STRING_VARIABLE;</b></li><ul>
! 
  <li>All global
  string variables are available as <i>wx.STRING_VARIABLE</i></li>
--- 784,791 ----
  <li>Declared in the bindings using the <i>%define_string</i>
  tag</li>
! </ul>
! <li><b>const wxChar*
! STRING_VARIABLE;</b></li>
! <ul>
  <li>All global
  string variables are available as <i>wx.STRING_VARIABLE</i></li>
***************
*** 789,796 ****
  bindings using the <i>%define_string</i>
  tag</li>
! 
! </ul><li><b>wxEVT_XXX
! for wxEvtHandler::Connect()</b></li><ul>
! 
  <li>All
  <i>wxEVT_XXX</i> wxEventTypes (an integer) are
--- 794,801 ----
  bindings using the <i>%define_string</i>
  tag</li>
! </ul>
! <li><b>wxEVT_XXX
! for wxEvtHandler::Connect()</b></li>
! <ul>
  <li>All
  <i>wxEVT_XXX</i> wxEventTypes (an integer) are
***************
*** 849,856 ****
  bindings using the <i>%define_event</i>
  tag</li>
! 
! </ul><li><b>Objects
! of classes or structs OBJECT_NAME</b></li><ul>
! 
  <li>All
  global objects that are classes or structs are
--- 854,861 ----
  bindings using the <i>%define_event</i>
  tag</li>
! </ul>
! <li><b>Objects
! of classes or structs OBJECT_NAME</b></li>
! <ul>
  <li>All
  global objects that are classes or structs are
***************
*** 864,871 ****
  <li>Declared in the bindings using the <i>%define_object</i>
  tag</li>
! 
! </ul><li><b>Pointers to
! classes or structs POINTER_NAME</b></li><ul>
! 
  <li>All
  global pointers that are classes or structs are
--- 869,876 ----
  <li>Declared in the bindings using the <i>%define_object</i>
  tag</li>
! </ul>
! <li><b>Pointers to
! classes or structs POINTER_NAME</b></li>
! <ul>
  <li>All
  global pointers that are classes or structs are
***************
*** 879,888 ****
  <li>Declared in the bindings using the <i>%define_object</i>
  tag</li>
! 
! </ul><li><b>Global<i> </i>C
  style
  functions
! VAR_TYPE FUNCTION_NAME(int a, const wxString&amp; str)</b></li><ul>
! 
  <li>All global C style functions are available as <i>wx.FUNCTION_NAME(1,
  "Hello")</i></li>
--- 884,893 ----
  <li>Declared in the bindings using the <i>%define_object</i>
  tag</li>
! </ul>
! <li><b>Global<i> </i>C
  style
  functions
! VAR_TYPE FUNCTION_NAME(int a, const wxString&amp; str)</b></li>
! <ul>
  <li>All global C style functions are available as <i>wx.FUNCTION_NAME(1,
  "Hello")</i></li>
***************
*** 895,907 ****
  <li>Declared in the bindings using the <i>%function</i>
  tag</li>
! 
! </ul><li><b>C++ Classes
! CLASS_NAME</b></li><ul>
  <li>All C++ classes
  are available as <i>wx.CLASS_NAME</i>,
  however in order to use one you must call one of the constructors first
! or get the class as a return value from another function call.</li><ul>
! 
! 
  <li>Example : <i>"pt = wx.wxPoint(1,
  2); pt2 = wx.wxPoint(pt)"</i>.</li>
--- 900,912 ----
  <li>Declared in the bindings using the <i>%function</i>
  tag</li>
! </ul>
! <li><b>C++ Classes
! CLASS_NAME</b></li>
! <ul>
  <li>All C++ classes
  are available as <i>wx.CLASS_NAME</i>,
  however in order to use one you must call one of the constructors first
! or get the class as a return value from another function call.</li>
! <ul>
  <li>Example : <i>"pt = wx.wxPoint(1,
  2); pt2 = wx.wxPoint(pt)"</i>.</li>
***************
*** 923,931 ****
  constructor function itself you can use <i>wx.CLASS_NAME.new(...)</i>
  which is the constructor exposed as a Cfunction.</li>
! 
! </ul><li>The
  C++ class objects are pushed into Lua as a userdata wrapping a void*
! pointer to the C++ object.</li><ul>
! 
  <li>A special metatable
  is set on the userdata with these entries :</li>
--- 928,936 ----
  constructor function itself you can use <i>wx.CLASS_NAME.new(...)</i>
  which is the constructor exposed as a Cfunction.</li>
! </ul>
! <li>The
  C++ class objects are pushed into Lua as a userdata wrapping a void*
! pointer to the C++ object.</li>
! <ul>
  <li>A special metatable
  is set on the userdata with these entries :</li>
***************
*** 948,959 ****
  used so wxLua can delete the C++ object if appropriate. </li>
  </ul>
! 
! </ul><li>Declared
  in the bindings using the <i>%class</i>
! tag</li><li><span style="font-weight: bold;">Deleting
  class userdata</span> can be done using the wxLua added class
! member function delete().</li><ul>
! 
! 
  <li>All classes
  that have the %delete binding tag will be eventually garbage collected
--- 953,964 ----
  used so wxLua can delete the C++ object if appropriate. </li>
  </ul>
! </ul>
! <li>Declared
  in the bindings using the <i>%class</i>
! tag</li>
! <li><span style="font-weight: bold;">Deleting
  class userdata</span> can be done using the wxLua added class
! member function delete().</li>
! <ul>
  <li>All classes
  that have the %delete binding tag will be eventually garbage collected
***************
*** 972,976 ****
  <li>This
  is really a MS Windows problem, in Win95 based systems the number that
! you could create was severely limited, but even in NT systems (XP, Vista) you
  will have problems if you've created hundreds of them. One visible sign
  that something is wrong is when controls, like menus, stop redrawing
--- 977,982 ----
  <li>This
  is really a MS Windows problem, in Win95 based systems the number that
! you could create was severely limited, but even in NT systems (XP,
! Vista) you
  will have problems if you've created hundreds of them. One visible sign
  that something is wrong is when controls, like menus, stop redrawing
***************
*** 1004,1008 ****
  in Lua, but this may cause pauses in your program's execution. It is a
  good idea to collect all the garbage at the end of your initialization
! function to at least start out with a clean slate&nbsp;since program
  startup time is usually not a concern.</li>
  </ul>
--- 1010,1015 ----
  in Lua, but this may cause pauses in your program's execution. It is a
  good idea to collect all the garbage at the end of your initialization
! function to at least start out with a clean slate since
! program
  startup time is usually not a concern.</li>
  </ul>
***************
*** 1011,1015 ****
  <ul>
  <li style="font-weight: bold;">Must delete :
! wxDC, wxPaintDC, and&nbsp;ALL classed derived from wxDC</li>
  <li><span style="font-weight: bold;">Must
  delete if &gt; 50 :
--- 1018,1022 ----
  <ul>
  <li style="font-weight: bold;">Must delete :
! wxDC, wxPaintDC, and ALL classed derived from wxDC</li>
  <li><span style="font-weight: bold;">Must
  delete if &gt; 50 :
***************
*** 1036,1049 ****
  </ul>
  <li>How to tell how
! many userdata objects you currently have?</li><ul><li>Print the output of&nbsp;<b><i>wxlua.GetGCUserdataInfo(true)</i></b> to show what objects will be garbage collected when their reference count goes to 0 and the Lua garbage collector runs.</li><li>Print the output of <i><b>wxlua.GetTrackedObjectInfo(true)</b></i> to get class objects that wxLua has pushed into Lua that may or may not be garbage collected.</li></ul>
  <ul>
- 
  <li>Call
! the function <b><i>wxlua.LuaStackDialog()</i></b> when you run
  your program and examine the items in the Lua LUA_REGISTRYINDEX table.
! Expand "wxLua objects pushed" and "wxLua gc objects to delete" tables.<br></li>
  </ul>
! 
! </ul><li><b>Member functions</b>
  of the class are called using the colon ':' convention and NOT the
  period
--- 1043,1065 ----
  </ul>
  <li>How to tell how
! many userdata objects you currently have?</li>
! <ul>
! <li>Print the output of <b><i>wxlua.GetGCUserdataInfo(true)</i></b>
! to show what objects will be garbage collected when their reference
! count goes to 0 and the Lua garbage collector runs.</li>
! <li>Print the output of <i><b>wxlua.GetTrackedObjectInfo(true)</b></i>
! to get class objects that wxLua has pushed into Lua that may or may not
! be garbage collected.</li>
! </ul>
  <ul>
  <li>Call
! the function <b><i>wxlua.LuaStackDialog()</i></b>
! when you run
  your program and examine the items in the Lua LUA_REGISTRYINDEX table.
! Expand "wxLua objects pushed" and "wxLua gc objects to delete" tables.<br>
! </li>
  </ul>
! </ul>
! <li><b>Member functions</b>
  of the class are called using the colon ':' convention and NOT the
  period
***************
*** 1058,1063 ****
  and <span style="font-weight: bold;">static</span>
  functions, please see the sections below about why they only use the
! '.' convention.</li><ul>
! 
  <li>Example : <i>"size
  = wx.wxSize(1, 2); size:SetWidth(10); size.SetHeight(size, 11);
--- 1074,1079 ----
  and <span style="font-weight: bold;">static</span>
  functions, please see the sections below about why they only use the
! '.' convention.</li>
! <ul>
  <li>Example : <i>"size
  = wx.wxSize(1, 2); size:SetWidth(10); size.SetHeight(size, 11);
***************
*** 1070,1079 ****
  original function. This is only done for special cases that
  would be awkward, if not impossible, to wrap otherwise.</li>
! 
! </ul><li><b>Property functions</b>
  allow
  you to read and/or write values to a class using the '.' convention and
! a shortened name.</li><ul>
! 
  <li>These are generated
  on the fly when the function
--- 1086,1095 ----
  original function. This is only done for special cases that
  would be awkward, if not impossible, to wrap otherwise.</li>
! </ul>
! <li><b>Property functions</b>
  allow
  you to read and/or write values to a class using the '.' convention and
! a shortened name.</li>
! <ul>
  <li>These are generated
  on the fly when the function
***************
*** 1094,1099 ****
  a function using "()", but rather like accessing a table
  member, without the "()".</li>
- 
- 
  <li>Example
  : <i>"rect
--- 1110,1113 ----
***************
*** 1144,1156 ****
  necessary? Confusing? Useful?
  I'd stick with the Get/Set functions. - JL</li>
! 
! </ul><li><b>Member
  variables </b>allow you
! to read and/or write to member variables of a class.</li><ul>
! 
  <li>Declared in the interface files using the <i>%member</i>
  or <i>%member_func</i> tag.</li>
- 
- 
  <li>Example : In the
  interface file <i>gdi.i</i>
--- 1158,1168 ----
  necessary? Confusing? Useful?
  I'd stick with the Get/Set functions. - JL</li>
! </ul>
! <li><b>Member
  variables </b>allow you
! to read and/or write to member variables of a class.</li>
! <ul>
  <li>Declared in the interface files using the <i>%member</i>
  or <i>%member_func</i> tag.</li>
  <li>Example : In the
  interface file <i>gdi.i</i>
***************
*** 1179,1188 ****
  variable is constant (const) the
  variable is read-only and you cannot set it's value.</li>
! 
! </ul><li><b>Static
  functions</b> are part of the
  table that holds the class and can be called with or without a class
! instance (a userdata).</li><ul>
! 
  <li>Example : <i>f
  =
--- 1191,1200 ----
  variable is constant (const) the
  variable is read-only and you cannot set it's value.</li>
! </ul>
! <li><b>Static
  functions</b> are part of the
  table that holds the class and can be called with or without a class
! instance (a userdata).</li>
! <ul>
  <li>Example : <i>f
  =
***************
*** 1198,1216 ****
  made to work reliably when you don't want or need the self pushed onto
  the stack. </li>
! 
! </ul><li><b>Enum members</b>
  are also part of
  the
  table that holds the class and are used by accessing the class table
! itself.</li><ul>
! 
  <li>Example : <i>"enum
  wxFTP::TransferMode {
  ASCII, ... }"</i> is accessible as <i>wx.wxFTP.ASCII</i></li>
! 
! </ul><li><b>Operator functions</b>
  allow you to use
! C++ operators in Lua. </li><ul>
! 
  <li>Lua has a
  limited set of operators, see the Lua
--- 1210,1228 ----
  made to work reliably when you don't want or need the self pushed onto
  the stack. </li>
! </ul>
! <li><b>Enum members</b>
  are also part of
  the
  table that holds the class and are used by accessing the class table
! itself.</li>
! <ul>
  <li>Example : <i>"enum
  wxFTP::TransferMode {
  ASCII, ... }"</i> is accessible as <i>wx.wxFTP.ASCII</i></li>
! </ul>
! <li><b>Operator functions</b>
  allow you to use
! C++ operators in Lua. </li>
! <ul>
  <li>Lua has a
  limited set of operators, see the Lua
***************
*** 1235,1240 ****
  using the <i>%operator</i>
  tag.</li>
- 
- 
  <li><br>
  </li>
--- 1247,1250 ----
***************
*** 1252,1261 ****
  </li>
  <li>"&gt;=" = "op_ge"</li>
- <li></li>
- <li>"|" = "op_or"<br>
- </li>
- <li>"&amp;"
- = "op_and"<br>
- </li>
  <li>"||" = "op_lor" note:
  "lor"
--- 1262,1265 ----
***************
*** 1268,1275 ****
  "op_land"<br>
  </li>
! <li>"!" = "op_not"<br>
  </li>
! <li>"^" = "op_xor"<br>
  </li>
  <li></li>
  <li>"++"
--- 1272,1293 ----
  "op_land"<br>
  </li>
! <li>"!" = "op_not"</li>
! <li></li>
! <li>"|" = "op_or"<br>
  </li>
! <li>"&amp;"
! = "op_and"<br>
  </li>
+ <li>"^" = "op_xor"</li>
+ <li>"&lt;&lt;" = "op_lshift"</li>
+ <li>"&gt;&gt;" = "op_rshift"</li>
+ <li></li>
+ <li>"|="
+ = "op_ior"</li>
+ <li>"&amp;=" = "op_iand"</li>
+ <li>"^="
+ = "op_ixor"</li>
+ <li>"&lt;&lt;=" = "op_ilshift"</li>
+ <li>"&gt;&gt;=" = "op_irshift"</li>
  <li></li>
  <li>"++"
***************
*** 1280,1286 ****
  <li>"-
  (unary)" = "op_neg"</li>
  <li></li>
- 
- 
  <li>"=" = op_set</li>
  <li>"+" = "op_add"<br>
--- 1298,1303 ----
  <li>"-
  (unary)" = "op_neg"</li>
+ <li>"~ (unary)" = "op_comp"</li>
  <li></li>
  <li>"=" = op_set</li>
  <li>"+" = "op_add"<br>
***************
*** 1293,1296 ****
--- 1310,1314 ----
  <li>"/"
  = "op_div"</li>
+ <li>"%" = "op_mod"</li>
  <li></li>
  <li>"+=" =
***************
*** 1304,1318 ****
  </li>
  <li>"/=" =
! "op_idiv"<br>
! </li>
! <li>"%=" = "op_imod"<br>
! </li>
! <li>"&amp;=" = "op_iand"<br>
! </li>
! <li>"|="
! = "op_ior"<br>
! </li>
! <li>"^="
! = "op_ixor"</li>
  <li>Example : <i>"pt =
  wx.wxPoint(1,2); pt = pt +
--- 1322,1328 ----
  </li>
  <li>"/=" =
! "op_idiv"</li>
! <li>"%=" = "op_imod"</li>
! <li></li>
  <li>Example : <i>"pt =
  wx.wxPoint(1,2); pt = pt +
***************
*** 1339,1345 ****
  test if pt2 has changed, it hasn't, and the test to see if they're
  still equal and as expected, they're not.</li>
! 
! </ul><li style="font-weight: bold;">Virtual functions</li><ul>
! 
  <li>You
  cannot
--- 1349,1355 ----
  test if pt2 has changed, it hasn't, and the test to see if they're
  still equal and as expected, they're not.</li>
! </ul>
! <li style="font-weight: bold;">Virtual functions</li>
! <ul>
  <li>You
  cannot
***************
*** 1368,1375 ****
  already been added is that there is a price to pay in terms
  of binding size and speed.</li>
! 
! </ul><li><span style="font-weight: bold;">Overriding
! member functions</span> with Lua functions</li><ul>
! 
  <li>You
  may override class member functions for a wxLua userdata and still be
--- 1378,1385 ----
  already been added is that there is a price to pay in terms
  of binding size and speed.</li>
! </ul>
! <li><span style="font-weight: bold;">Overriding
! member functions</span> with Lua functions</li>
! <ul>
  <li>You
  may override class member functions for a wxLua userdata and still be
***************
*** 1390,1396 ****
  since otherwise you'll get
  recursion. </li>
! 
! </ul><li><b>Extending
! classes</b> </li><ul>
  <li>You
  may add your
--- 1400,1407 ----
  since otherwise you'll get
  recursion. </li>
! </ul>
! <li><b>Extending
! classes</b> </li>
! <ul>
  <li>You
  may add your
***************
*** 1399,1411 ****
  if you would like to keep functions that act on a particular class with
  it rather than having global functions that take that class as a
! parameter.</li><li>Example : <i>"r =
  wx.wxRect(1,2,3,4); r.PrintXY = function(self) print(self:GetX(),
  self:GetY()) end; r:PrintXY()"</i> adds the function PrintXY() to
  the wxRect instance r. The userdata, class instance, r is
  passed to the Lua function as the parameter "self" which is pushed onto
! the stack when the PrintXY() function is called with the ":" notation.</li><li>Note
  that the above example is the same as <i>"</i><i>r
  = wx.wxRect(1,2,3,4); </i><i>function wxRect_PrintXY(r)
! print(r:GetX(), r:GetY()) end; wxRect_PrintXY(r)"</i>.</li><li>You
  may also create the Lua function beforehand and
  then assign it to the rect object. <i>"function
--- 1410,1425 ----
  if you would like to keep functions that act on a particular class with
  it rather than having global functions that take that class as a
! parameter.</li>
! <li>Example : <i>"r =
  wx.wxRect(1,2,3,4); r.PrintXY = function(self) print(self:GetX(),
  self:GetY()) end; r:PrintXY()"</i> adds the function PrintXY() to
  the wxRect instance r. The userdata, class instance, r is
  passed to the Lua function as the parameter "self" which is pushed onto
! the stack when the PrintXY() function is called with the ":" notation.</li>
! <li>Note
  that the above example is the same as <i>"</i><i>r
  = wx.wxRect(1,2,3,4); </i><i>function wxRect_PrintXY(r)
! print(r:GetX(), r:GetY()) end; wxRect_PrintXY(r)"</i>.</li>
! <li>You
  may also create the Lua function beforehand and
  then assign it to the rect object. <i>"function
***************
*** 1414,1422 ****
  You can see that using this idea you can write a Lua function
  that creates a new wxRect, sets your extra functions
! for it, and returns it for use.</li><ul>
! 
! 
! 
! 
  <ul>
  </ul>
--- 1428,1433 ----
  You can see that using this idea you can write a Lua function
  that creates a new wxRect, sets your extra functions
! for it, and returns it for use.</li>
! <ul>
  <ul>
  </ul>
***************
*** 1473,1479 ****
  button to run it.</li>
  <li>Use
! wxLua as a Lua module (using the function require), run <span style="font-weight: bold; font-style: italic;">$lua.exe&nbsp;sample.wx.lua</span></li>
  <ul>
! <li>In order to use wxLua as a module the Lua code must have <i>require("wx")</i> to load the wxLua bindings in the beginning and <i>wx.wxGetApp():MainLoop()</i> at the end to start the wxWidgets event loop.</li><li>You may need to adjust the <i>package.cpath</i> variable to have it point to the correct location of the wx.so or wx.dll shared library for require("wx") to load.</li>
  </ul>
  </ul>
--- 1484,1495 ----
  button to run it.</li>
  <li>Use
! wxLua as a Lua module (using the function require), run <span style="font-weight: bold; font-style: italic;">$lua.exe sample.wx.lua</span></li>
  <ul>
! <li>In order to use wxLua as a module the Lua code must have <i>require("wx")</i>
! to load the wxLua bindings in the beginning and <i>wx.wxGetApp():MainLoop()</i>
! at the end to start the wxWidgets event loop.</li>
! <li>You may need to adjust the <i>package.cpath</i>
! variable to have it point to the correct location of the wx.so or
! wx.dll shared library for require("wx") to load.</li>
  </ul>
  </ul>
***************
*** 1487,1491 ****
  <li>Lets you
  explore the C++ binding structs from within Lua
! using a wxListCtrl. This program shows&nbsp;the raw data that is used to push the
  bindings into Lua when a wxLuaState is created.</li>
  <li>Take
--- 1503,1508 ----
  <li>Lets you
  explore the C++ binding structs from within Lua
! using a wxListCtrl. This program shows the raw data that is
! used to push the
  bindings into Lua when a wxLuaState is created.</li>
  <li>Take
***************
*** 1907,1911 ****
  <li>You
  might
! as well include paths to both unfix and MSW libraries so that the script
  can be run on either platform without modification since typically only
  the libraries that work on any given platform will be installed.</li>
--- 1924,1929 ----
  <li>You
  might
! as well include paths to both unfix and MSW libraries so that the
! script
  can be run on either platform without modification since typically only
  the libraries that work on any given platform will be installed.</li>
***************
*** 1961,1966 ****
  throw out the whole library when linking unless you explicitly use
  something in it. Replace the XXX with the name of the library you want
! installed, see modules/wxbind/include/wxbinddefs.h for a list of them.</li><li>You should preferably use the macros in modules/wxbind/include/wxbinddefs.h to make it easy to install a standard set of
! them or all of them. They do some simple checks to determine if the binding will be available based on the wxWidgets wxUSE_XXX directives.</li>
  <li>Compilation of this module
  generates a number of
--- 1979,1988 ----
  throw out the whole library when linking unless you explicitly use
  something in it. Replace the XXX with the name of the library you want
! installed, see modules/wxbind/include/wxbinddefs.h for a list of them.</li>
! <li>You should preferably use the macros in
! modules/wxbind/include/wxbinddefs.h to make it easy to install a
! standard set of
! them or all of them. They do some simple checks to determine if the
! binding will be available based on the wxWidgets wxUSE_XXX directives.</li>
  <li>Compilation of this module
  generates a number of
***************
*** 2065,2069 ****
  The wxLuaState contains all of the Lua 'C' functions, such as
  lua_gettop(lua_State* L), but as member functions named lua_GetTop()
! which use the internal lua_State and check for it's validity before use. The functions are capitalized to make them
  easier to find in an editor. If you want the greatest performance just
  use wxLuaState::GetLuaState() and directly manipulate the
--- 2087,2092 ----
  The wxLuaState contains all of the Lua 'C' functions, such as
  lua_gettop(lua_State* L), but as member functions named lua_GetTop()
! which use the internal lua_State and check for it's validity before
! use. The functions are capitalized to make them
  easier to find in an editor. If you want the greatest performance just
  use wxLuaState::GetLuaState() and directly manipulate the
***************
*** 2086,2090 ****
  setting up the lua_State.</li>
  <ol>
- 
  <li>The
  wxObject::m_refData is created as a new wxLuaStateRefData(). This ref
--- 2109,2112 ----
***************
*** 2123,2132 ****
  <ul>
  </ul>
- 
  <ul>
  <li>Each
! binding that is loaded are&nbsp;derived wxLuaBinding
  classes whose member data variables point to structs in each binding. A
! single static instance of each&nbsp;binding class&nbsp;are installed
  into a wxList when the
  wxLuaBinding_XXX_init() functions
--- 2145,2154 ----
  <ul>
  </ul>
  <ul>
  <li>Each
! binding that is loaded are derived wxLuaBinding
  classes whose member data variables point to structs in each binding. A
! single static instance of each binding class are
! installed
  into a wxList when the
  wxLuaBinding_XXX_init() functions
***************
*** 2172,2176 ****
  considerable amount of the total time of a function call.<br>
  <br>
! <pre>// ----------------------------------------------------------------------------<br>// Special keys used by wxLua in the LUA_REGISTRYINDEX table.<br>//<br>// Note: We do not push a human readable string for these because Lua always<br>// makes a copy and hashes the string, this takes a considerable amount of<br>// time when benchmarked using valgrind.<br>// ----------------------------------------------------------------------------<br><br>// Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua.<br>// Note that even though these keys have values, they're not used, just the memory address.<br><br>// The key in the LUA_REGISTRYINDEX table that is a numerically keyed table indexed<br>//   on the wxLua types where each item is a userdata metatable for a C++ class.<br>// Note: The wxLua types WXLUA_TXXX that correspond to the Lua LUA_TXXX types<br>//   are not stored in this table since they do not use our metatables.<br>//   The keys in this table are all &gt; 1. They values are either tables or 0<br>//   if the wxLuaBinding containing the wxLua type was not registered.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_types_key][wxLua type number] = { metatable for a C++ class }<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_types_key;<br>// The key in the LUA_REGISTRYINDEX table that is a numerically keyed table<br>//   with references to Lua objects we want to keep a handle to. The object could be<br>//   anything, a table, function, number, string, userdata...<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_refs_key][ref number] = Lua object<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_refs_key;<br>// The key in the LUA_REGISTRYINDEX table that is a numerically keyed table<br>//   with references to objects the wxLuaDebugData wants to keep a handle to by<br>//   storing their value for lookup. It is used only for the wxLuaDebugData.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_debug_refs_key][ref number] = Lua object<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_debug_refs_key;<br>// The key that in the LUA_REGISTRYINDEX table that is a lookup table of string<br>//   C++ classname keys and lightuserdata pointers to the associated wxLuaBindClass struct.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_debug_refs_key][wxLuaBindClass.name] = lightuserdata(&amp;wxLuaBindClass)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_classes_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table<br>//   of Lua objects/functions assigned to wxLua userdata programatically in Lua.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_derivedmethods_key][lightuserdata(obj_ptr)] =<br>//    {["derived func/value name"] = wxLuaObject(Lua function/value), ...}<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_derivedmethods_key;<br>// The key in the LUA_REGISTRYINDEX table who's value is a lightuserdata<br>//   of the wxLuaState for this lua_State.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxluastate_key] = lightuserdata(&amp;wxLuaState)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluastate_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of lightuserdata<br>//   wxLuaBindings and the ref to the Lua table they were installed into.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxluabindings_key] = {lightuserdata(&amp;wxLuaBinding) = wxlua_lreg_refs_key ref#, ...}<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluabindings_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>//   objects that we've pushed into Lua using wxluaT_pushuserdatatype().<br>// Note: A single object like a wxWindow may be pushed with multiple wxLua types.<br>//   e.g. wxWindow* w = wx.wxWindow() retrieve the window later from wxObject* wxEvent:GetEventObject()<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_weakobjects_key][lightuserdata(obj_ptr)] =<br>//     { wxLua type1 = weak fulluserdata, wxLua type2 = weak fulluserdata... }<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_weakobjects_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>//   objects to delete that were added using wxluaO_addgcobject().<br>// Note that non wxObject classes use wxLUA_DECLARE_ENCAPSULATION so<br>//   the key is the object pointer and the value is the wxObject encapsulation.<br>//   Both the key and the value are the same if not encapsulated.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_gcobjects_key][lightuserdata(obj_ptr)] =<br>//     lightuserdata(wxObject derived class)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_gcobjects_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>//   wxLuaEventCallbacks that we've created.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_evtcallbacks_key][lightuserdata(&amp;wxLuaEventCallback)] =<br>//     lightuserdata(&amp;wxEvtHandler)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_evtcallbacks_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of wxWindow keys and<br>//   wxLuaWinDestroyCallback values that we've created.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_windestroycallbacks_key][lightuserdata(&amp;wxWindow)] =<br>//    lightuserdata(wxLuaWinDestroyCallback)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_windestroycallbacks_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>//   top level wxWindows that we've created and need to destroy when closed.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_topwindows_key][lightuserdata(&amp;wxWindow)] = 1<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_topwindows_key;<br>// The key in the LUA_REGISTRYINDEX table that has a boolean value<br>//   of whether the Lua code has prepended a '_' to function name to indicate<br>//   that they want the base class function called.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_callbaseclassfunc_key] = true/false<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_callbaseclassfunc_key;<br>// The key in the LUA_REGISTRYINDEX table that has a wxEventType (integer) value<br>//   of the current wxEvent is that is being run or wxEVT_NULL if not in an event.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxeventtype_key] = wxEventType (wxEVT_NULL)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxeventtype_key;<br>// The key in the LUA_REGISTRYINDEX table that has a wxLuaStateData class<br>//   lightuserdata value for the wxLuaState.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxluastatedata_key] = lightuserdata(&amp;wxLuaStateData)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluastatedata_key;<br>// The key in the LUA_REGISTRYINDEX table that is a weak keyed table of<br>//   the tables wxLua pushed into the registry with their keys as values.<br>// This is used by the wxLuaDebugData to know if the table is one of the wxLua<br>//   registry tables for better wxLuaStackDialog performance.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_regtable_key][weak {wxlua_lreg_XXX_key table}] =<br>//    lightuserdata(&amp;wxlua_lreg_XXX_key)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_regtable_key;<br><br>// Light userdata used as keys in the metatables created for the class userdata objects.<br>// Note that even though these keys have values, they're not used, just the memory address.<br><br>// wxLua userdata metatable structure:<br>// {<br>//    lightuserdata(&amp;wxlua_metatable_type_key) = wxLua type number in wxlua_lreg_types_key table<br>//    lightuserdata(&amp;wxlua_metatable_wxluabindclass_key) = lightuserdata(&amp;wxLuaBindClass)<br>//    __gc       = function(wxlua_wxLuaBindClass__gc)<br>//    __index    = function(wxlua_wxLuaBindClass__index)<br>//    __newindex = function(wxlua_wxLuaBindClass__newindex)<br>//    __tostring = function(wxlua_wxLuaBindClass__tostring)<br>// }<br><br>// The key of a metatable used for wxLua userdata that is the wxLua type number in the<br>//   wxlua_lreg_types_key table this metatable is for.<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_metatable_type_key;<br>// The key of a metatable used for wxLua userdata that stores a lightuserdata<br>//   of the wxLuaBindClass struct for this class.<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_metatable_wxluabindclass_key;<br><br></pre>
  <h3><a name="Functions_to_Create_a_wxLuaState"></a>Functions
  to
--- 2194,2198 ----
  considerable amount of the total time of a function call.<br>
  <br>
! <pre>// ----------------------------------------------------------------------------<br>// Special keys used by wxLua in the LUA_REGISTRYINDEX table.<br>//<br>// Note: We do not push a human readable string for these because Lua always<br>// makes a copy and hashes the string, this takes a considerable amount of<br>// time when benchmarked using valgrind.<br>// ----------------------------------------------------------------------------<br><br>// Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua.<br>// Note that even though these keys have values, they're not used, just the memory address.<br><br>// The key in the LUA_REGISTRYINDEX table that is a numerically keyed table indexed<br>// on the wxLua types where each item is a userdata metatable for a C++ class.<br>// Note: The wxLua types WXLUA_TXXX that correspond to the Lua LUA_TXXX types<br>// are not stored in this table since they do not use our metatables.<br>// The keys in this table are all &gt; 1. They values are either tables or 0<br>// if the wxLuaBinding containing the wxLua type was not registered.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_types_key][wxLua type number] = { metatable for a C++ class }<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_types_key;<br>// The key in the LUA_REGISTRYINDEX table that is a numerically keyed table<br>// with references to Lua objects we want to keep a handle to. The object could be<br>// anything, a table, function, number, string, userdata...<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_refs_key][ref number] = Lua object<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_refs_key;<br>// The key in the LUA_REGISTRYINDEX table that is a numerically keyed table<br>// with references to objects the wxLuaDebugData wants to keep a handle to by<br>// storing their value for lookup. It is used only for the wxLuaDebugData.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_debug_refs_key][ref number] = Lua object<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_debug_refs_key;<br>// The key that in the LUA_REGISTRYINDEX table that is a lookup table of string<br>// C++ classname keys and lightuserdata pointers to the associated wxLuaBindClass struct.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_debug_refs_key][wxLuaBindClass.name] = lightuserdata(&amp;wxLuaBindClass)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_classes_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table<br>// of Lua objects/functions assigned to wxLua userdata programatically in Lua.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_derivedmethods_key][lightuserdata(obj_ptr)] =<br>// {["derived func/value name"] = wxLuaObject(Lua function/value), ...}<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_derivedmethods_key;<br>// The key in the LUA_REGISTRYINDEX table who's value is a lightuserdata<br>// of the wxLuaState for this lua_State.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxluastate_key] = lightuserdata(&amp;wxLuaState)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluastate_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of lightuserdata<br>// wxLuaBindings and the ref to the Lua table they were installed into.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxluabindings_key] = {lightuserdata(&amp;wxLuaBinding) = wxlua_lreg_refs_key ref#, ...}<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluabindings_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>// objects that we've pushed into Lua using wxluaT_pushuserdatatype().<br>// Note: A single object like a wxWindow may be pushed with multiple wxLua types.<br>// e.g. wxWindow* w = wx.wxWindow() retrieve the window later from wxObject* wxEvent:GetEventObject()<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_weakobjects_key][lightuserdata(obj_ptr)] =<br>// { wxLua type1 = weak fulluserdata, wxLua type2 = weak fulluserdata... }<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_weakobjects_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>// objects to delete that were added using wxluaO_addgcobject().<br>// Note that non wxObject classes use wxLUA_DECLARE_ENCAPSULATION so<br>// the key is the object pointer and the value is the wxObject encapsulation.<br>// Both the key and the value are the same if not encapsulated.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_gcobjects_key][lightuserdata(obj_ptr)] =<br>// lightuserdata(wxObject derived class)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_gcobjects_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>// wxLuaEventCallbacks that we've created.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_evtcallbacks_key][lightuserdata(&amp;wxLuaEventCallback)] =<br>// lightuserdata(&amp;wxEvtHandler)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_evtcallbacks_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of wxWindow keys and<br>// wxLuaWinDestroyCallback values that we've created.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_windestroycallbacks_key][lightuserdata(&amp;wxWindow)] =<br>// lightuserdata(wxLuaWinDestroyCallback)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_windestroycallbacks_key;<br>// The key in the LUA_REGISTRYINDEX table that is a table of all<br>// top level wxWindows that we've created and need to destroy when closed.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_topwindows_key][lightuserdata(&amp;wxWindow)] = 1<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_topwindows_key;<br>// The key in the LUA_REGISTRYINDEX table that has a boolean value<br>// of whether the Lua code has prepended a '_' to function name to indicate<br>// that they want the base class function called.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_callbaseclassfunc_key] = true/false<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_callbaseclassfunc_key;<br>// The key in the LUA_REGISTRYINDEX table that has a wxEventType (integer) value<br>// of the current wxEvent is that is being run or wxEVT_NULL if not in an event.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxeventtype_key] = wxEventType (wxEVT_NULL)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxeventtype_key;<br>// The key in the LUA_REGISTRYINDEX table that has a wxLuaStateData class<br>// lightuserdata value for the wxLuaState.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_wxluastatedata_key] = lightuserdata(&amp;wxLuaStateData)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluastatedata_key;<br>// The key in the LUA_REGISTRYINDEX table that is a weak keyed table of<br>// the tables wxLua pushed into the registry with their keys as values.<br>// This is used by the wxLuaDebugData to know if the table is one of the wxLua<br>// registry tables for better wxLuaStackDialog performance.<br>// LUA_REGISTRYINDEX[&amp;wxlua_lreg_regtable_key][weak {wxlua_lreg_XXX_key table}] =<br>// lightuserdata(&amp;wxlua_lreg_XXX_key)<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_regtable_key;<br><br>// Light userdata used as keys in the metatables created for the class userdata objects.<br>// Note that even though these keys have values, they're not used, just the memory address.<br><br>// wxLua userdata metatable structure:<br>// {<br>// lightuserdata(&amp;wxlua_metatable_type_key) = wxLua type number in wxlua_lreg_types_key table<br>// lightuserdata(&amp;wxlua_metatable_wxluabindclass_key) = lightuserdata(&amp;wxLuaBindClass)<br>// __gc = function(wxlua_wxLuaBindClass__gc)<br>// __index = function(wxlua_wxLuaBindClass__index)<br>// __newindex = function(wxlua_wxLuaBindClass__newindex)<br>// __tostring = function(wxlua_wxLuaBindClass__tostring)<br>// }<br><br>// The key of a metatable used for wxLua userdata that is the wxLua type number in the<br>// wxlua_lreg_types_key table this metatable is for.<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_metatable_type_key;<br>// The key of a metatable used for wxLua userdata that stores a lightuserdata<br>// of the wxLuaBindClass struct for this class.<br>extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_metatable_wxluabindclass_key;<br><br></pre>
  <h3><a name="Functions_to_Create_a_wxLuaState"></a>Functions
  to
***************
*** 2194,2205 ****
  get and handle the wxLuaEvents, see also Get/SetEventHandler().</li>
  </ul>
! <li>wxLuaState(lua_State* L, wxLuaState_Type type = wxLUASTATE_GETSTATE)</li>
  <ul>
! <li>type =&nbsp;wxLUASTATE_GETSTATE means that the lua_State must
  already have been created using a wxLuaState and so this new wxLuaState
  will merely attach to the corresponding ref data.</li>
  <li>type
  = wxLUASTATE_SETSTATE means that this new lua_State
! that you have created will have the wxLua bindings pushed into it if wxLUASTATE_OPENBINDINGS is set and
  then be ready for running wxLua programs. The wxLuaState will not close
  the lua_State, but will remove itself from Lua and do cleanup when
--- 2216,2230 ----
  get and handle the wxLuaEvents, see also Get/SetEventHandler().</li>
  </ul>
! <li>wxLuaState(lua_State* L, wxLuaState_Type type =
! wxLUASTATE_GETSTATE)</li>
  <ul>
! <li>type = wxLUASTATE_GETSTATE means that the
! lua_State must
  already have been created using a wxLuaState and so this new wxLuaState
  will merely attach to the corresponding ref data.</li>
  <li>type
  = wxLUASTATE_SETSTATE means that this new lua_State
! that you have created will have the wxLua bindings pushed into it if
! wxLUASTATE_OPENBINDINGS is set and
  then be ready for running wxLua programs. The wxLuaState will not close
  the lua_State, but will remove itself from Lua and do cleanup when

Index: binding.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** binding.html	10 Jan 2008 23:06:24 -0000	1.27
--- binding.html	21 Oct 2008 04:23:18 -0000	1.28
***************
*** 670,691 ****
  = "op_ne"</li> <li>"&lt;" = "op_lt"</li> <li>"&gt;"
  = "op_gt"</li> <li>"&lt;=" = "op_le"</li> <li>"&gt;="
! = "op_ge"</li>
! </ul><ul> <li>"|" = "op_or"</li> <li>"&amp;"
! = "op_and"</li> <li>"||" = "op_lor" note: "lor" stands for
  logical (boolean) or,
! same for "land."</li> <li>"&amp;&amp;" = "op_land"</li>
! <li>"!" = "op_not"</li> <li>"^" = "op_xor"</li>
! </ul><ul> <li>"++" = "op_inc"</li> <li>"--"
! = "op_dec"</li> <li>"- (unary)" = "op_neg"</li>
  </ul><ul> <li>"=" = op_set</li> <li>"+"
  = "op_add"</li> <li>"-" = "op_sub"<br> </li> <li>"*"
! = "op_mul"</li> <li>"/" = "op_div"</li>
  </ul><ul> <li>"+=" = "op_iadd" note: ixxx stands for
  "inplace" as it modifies the original object.</li> <li>"-="
  = "op_is...
 
[truncated message content]

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.168,1.169

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

Update of /cvsroot/wxlua/wxLua/bindings
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23977/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Add operators for <<, >>, %, ~


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** genwxbind.lua	17 Mar 2008 03:05:00 -0000	1.168
--- genwxbind.lua	21 Oct 2008 04:23:18 -0000	1.169
***************
*** 1104,1108 ****
  
      -- operators for %operator
!     bindingOperatorTable["="]  = "op_set"
      bindingOperatorTable["=="] = "op_eq"
      bindingOperatorTable["!="] = "op_ne"
--- 1104,1108 ----
  
      -- operators for %operator
! 
      bindingOperatorTable["=="] = "op_eq"
      bindingOperatorTable["!="] = "op_ne"
***************
*** 1111,1124 ****
      bindingOperatorTable["<="] = "op_le"
      bindingOperatorTable[">="] = "op_ge"
  
      bindingOperatorTable["|"]  = "op_or"
      bindingOperatorTable["&"]  = "op_and"
-     bindingOperatorTable["||"] = "op_lor"
-     bindingOperatorTable["&&"] = "op_land"
-     bindingOperatorTable["!"]  = "op_not"
      bindingOperatorTable["^"]  = "op_xor"
  
      bindingOperatorTable["++"] = "op_inc"
      bindingOperatorTable["--"] = "op_dec"
  
      bindingOperatorTable["+"]  = "op_add"
--- 1111,1136 ----
      bindingOperatorTable["<="] = "op_le"
      bindingOperatorTable[">="] = "op_ge"
+     bindingOperatorTable["||"] = "op_lor"  -- logical or
+     bindingOperatorTable["&&"] = "op_land" -- logical and
+     bindingOperatorTable["!"]  = "op_not"
  
      bindingOperatorTable["|"]  = "op_or"
      bindingOperatorTable["&"]  = "op_and"
      bindingOperatorTable["^"]  = "op_xor"
+     bindingOperatorTable["<<"]  = "op_lshift"
+     bindingOperatorTable[">>"]  = "op_rshift"
+ 
+     bindingOperatorTable["|="] = "op_ior"
+     bindingOperatorTable["&="] = "op_iand"
+     bindingOperatorTable["^="] = "op_ixor"
+     bindingOperatorTable["<<="]  = "op_ilshift"
+     bindingOperatorTable[">>="]  = "op_irshift"
+ 
+     bindingOperatorTable["="]  = "op_set"
  
      bindingOperatorTable["++"] = "op_inc"
      bindingOperatorTable["--"] = "op_dec"
+     bindingOperatorTable["~"]  = "op_comp" -- bitwise one's compliment
+     --bindingOperatorTable["-"]  = "op_neg" -- also op_sub if not unary -
  
      bindingOperatorTable["+"]  = "op_add"
***************
*** 1126,1129 ****
--- 1138,1142 ----
      bindingOperatorTable["*"]  = "op_mul"
      bindingOperatorTable["/"]  = "op_div"
+     bindingOperatorTable["%"]  = "op_mod"
  
      bindingOperatorTable["+="] = "op_iadd"
***************
*** 1132,1138 ****
      bindingOperatorTable["/="] = "op_idiv"
      bindingOperatorTable["%="] = "op_imod"
-     bindingOperatorTable["&="] = "op_iand"
-     bindingOperatorTable["|="] = "op_ior"
-     bindingOperatorTable["^="] = "op_ixor"
  
      -- bindingKeywordTable
--- 1145,1148 ----

[Wxlua-commit] wxLua/modules/wxbind/src wxcore_bind.cpp, 1.17, 1.18 wxcore_clipdrag.cpp, 1.13, 1.14

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23977/wxLua/modules/wxbind/src

Modified Files:
	wxcore_bind.cpp wxcore_clipdrag.cpp 
Log Message:
Add operators for <<, >>, %, ~


Index: wxcore_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxcore_bind.cpp	29 Jan 2008 04:22:52 -0000	1.17
--- wxcore_bind.cpp	21 Oct 2008 04:23:18 -0000	1.18
***************
*** 4282,4285 ****
--- 4282,4286 ----
  #if wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
          { "wxClipboard", wxClipboard_methods, wxClipboard_methodCount, CLASSINFO(wxClipboard), &wxluatype_wxClipboard, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
+         { "wxClipboardLocker", wxClipboardLocker_methods, wxClipboardLocker_methodCount, NULL, &wxluatype_wxClipboardLocker, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
  
***************
*** 5213,5216 ****
--- 5214,5222 ----
  
  
+ #if wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxClipboardLocker, wxClipboardLocker)
+ #endif // wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
+ 
+ 
  #if wxLUA_USE_wxColourPenBrush
  wxLUA_IMPLEMENT_ENCAPSULATION(wxColourDatabase, wxColourDatabase)

Index: wxcore_clipdrag.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxcore_clipdrag.cpp	29 Jan 2008 04:22:52 -0000	1.13
--- wxcore_clipdrag.cpp	21 Oct 2008 04:23:18 -0000	1.14
***************
*** 277,280 ****
--- 277,344 ----
  
  
+ #if wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
+ // ---------------------------------------------------------------------------
+ // Bind class wxClipboardLocker
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxClipboardLocker'
+ int wxluatype_wxClipboardLocker = WXLUA_TUNKNOWN;
+ 
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxClipboardLocker_delete[] = { &wxluatype_wxClipboardLocker, NULL };
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxClipboardLocker_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxClipboardLocker_delete }};
+ 
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxClipboardLocker_op_not[] = { &wxluatype_wxClipboardLocker, NULL };
+ static int LUACALL wxLua_wxClipboardLocker_op_not(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxClipboardLocker_op_not[1] = {{ wxLua_wxClipboardLocker_op_not, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxClipboardLocker_op_not }};
+ //     %operator bool operator!() const
+ static int LUACALL wxLua_wxClipboardLocker_op_not(lua_State *L)
+ {
+     // get this
+     wxClipboardLocker * self = (wxClipboardLocker *)wxluaT_getuserdatatype(L, 1, wxluatype_wxClipboardLocker);
+     // call op_not
+     bool returns = (!(*self));
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxClipboardLocker_constructor[] = { &wxluatype_wxClipboard, NULL };
+ static int LUACALL wxLua_wxClipboardLocker_constructor(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxClipboardLocker_constructor[1] = {{ wxLua_wxClipboardLocker_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatypeArray_wxLua_wxClipboardLocker_constructor }};
+ //     wxClipboardLocker(wxClipboard *clipboard = NULL)
+ static int LUACALL wxLua_wxClipboardLocker_constructor(lua_State *L)
+ {
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxClipboard clipboard = NULL
+     wxClipboard * clipboard = (argCount >= 1 ? (wxClipboard *)wxluaT_getuserdatatype(L, 1, wxluatype_wxClipboard) : NULL);
+     // call constructor
+     wxClipboardLocker* returns = new wxClipboardLocker(clipboard);
+     // add to tracked memory list
+     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxClipboardLocker((wxClipboardLocker*)returns));
+     // push the constructed class pointer
+     wxluaT_pushuserdatatype(L, returns, wxluatype_wxClipboardLocker);
+ 
+     return 1;
+ }
+ 
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ wxLuaBindMethod wxClipboardLocker_methods[] = {
+     { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxClipboardLocker_delete, 1, NULL },
+     { "op_not", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClipboardLocker_op_not, 1, NULL },
+     { "wxClipboardLocker", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxClipboardLocker_constructor, 1, NULL },
+ 
+     { 0, 0, 0, 0 },
+ };
+ 
+ int wxClipboardLocker_methodCount = sizeof(wxClipboardLocker_methods)/sizeof(wxLuaBindMethod) - 1;
+ 
+ #endif  // wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD
+ 
+ 
  #if (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) && (wxCHECK_VERSION(2,8,0))
  // ---------------------------------------------------------------------------

[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.93, 1.94 wxcore_clipdrag.i, 1.3, 1.4 wxcore_event.i, 1.2, 1.3

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23977/wxLua/bindings/wxwidgets

Modified Files:
	wx_datatypes.lua wxcore_clipdrag.i wxcore_event.i 
Log Message:
Add operators for <<, >>, %, ~


Index: wxcore_event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_event.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_event.i	18 Dec 2007 01:03:32 -0000	1.2
--- wxcore_event.i	21 Oct 2008 04:23:18 -0000	1.3
***************
*** 638,642 ****
  // wxPaintEvent -
  //
! // Note: You must ALWAYS create a wxPaintDC for the window abd delete() when
  // done to have the exposed area marked as painted, otherwise you'll continue
  // to get endless paint events.
--- 638,642 ----
  // wxPaintEvent -
  //
! // Note: You must ALWAYS create a wxPaintDC for the window and delete() when
  // done to have the exposed area marked as painted, otherwise you'll continue
  // to get endless paint events.

Index: wxcore_clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_clipdrag.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_clipdrag.i	18 Dec 2007 01:03:32 -0000	1.3
--- wxcore_clipdrag.i	21 Oct 2008 04:23:18 -0000	1.4
***************
*** 36,42 ****
  // wxClipboardLocker
  
! // Since the Lua garbage collector runs whenever necessary this class doesn't
! // serve its purpose of closing the clipboard when it goes out of scope as it
! // does in C++.
  
  // ---------------------------------------------------------------------------
--- 36,45 ----
  // wxClipboardLocker
  
! %class %delete %noclassinfo %encapsulate wxClipboardLocker
!     // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
!     wxClipboardLocker(wxClipboard *clipboard = NULL)
! 
!     %operator bool operator!() const
! %endclass
  
  // ---------------------------------------------------------------------------

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** wx_datatypes.lua	31 Jan 2008 04:34:02 -0000	1.93
--- wx_datatypes.lua	21 Oct 2008 04:23:18 -0000	1.94
***************
*** 810,813 ****
--- 810,820 ----
      ValueType = "class",
    },
+   wxClipboardLocker = {
+     ["%encapsulate"] = true,
+     Condition = "wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD",
+     IsNumber = false,
+     Name = "wxClipboardLocker",
+     ValueType = "class",
+   },
    wxClipboardTextEvent = {
      BaseClass = "wxCommandEvent",

[Wxlua-commit] wxLua/art copy_cur.cur, 1.1, NONE drag_cur.cur, 1.1, NONE edit_cur.cur, 1.1, NONE

[Klaas H. <ti...@us...>]

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

Removed Files:
	copy_cur.cur drag_cur.cur edit_cur.cur 
Log Message:
curcors

--- copy_cur.cur DELETED ---

--- edit_cur.cur DELETED ---

--- drag_cur.cur DELETED ---

[Wxlua-commit] wxLua/art/cursors copy_cur.cur, NONE, 1.1 drag_cur.cur, NONE, 1.1 edit_cur.cur, NONE, 1.1 move_cur.cur, NONE, 1.1

[Klaas H. <ti...@us...>]

Update of /cvsroot/wxlua/wxLua/art/cursors
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26929/cursors

Added Files:
	copy_cur.cur drag_cur.cur edit_cur.cur move_cur.cur 
Log Message:
curcors

--- NEW FILE: move_cur.cur ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: copy_cur.cur ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: edit_cur.cur ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: drag_cur.cur ---
(This appears to be a binary file; contents omitted.)

[Wxlua-commit] wxLua/art/cursors - New directory

[Klaas H. <ti...@us...>]

Update of /cvsroot/wxlua/wxLua/art/cursors
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26521/cursors

Log Message:
Directory /cvsroot/wxlua/wxLua/art/cursors added to the repository

[Wxlua-commit] wxLua/art copy_cur.cur, NONE, 1.1 drag_cur.cur, NONE, 1.1 edit_cur.cur, NONE, 1.1

[Klaas H. <ti...@us...>]

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

Added Files:
	copy_cur.cur drag_cur.cur edit_cur.cur 
Log Message:
cursors added

--- NEW FILE: copy_cur.cur ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: edit_cur.cur ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: drag_cur.cur ---
(This appears to be a binary file; contents omitted.)

[Wxlua-commit] wxLua/build Makefile_wx-config.in,1.6,1.7

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

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

Modified Files:
	Makefile_wx-config.in 
Log Message:
Fix last commit to properly evaluate vars


Index: Makefile_wx-config.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile_wx-config.in	15 May 2008 04:10:09 -0000	1.6
--- Makefile_wx-config.in	21 May 2008 03:21:11 -0000	1.7
***************
*** 16,20 ****
  WXLUA_LIBVERSION_CURRENT  = 2
  WXLUA_LIBVERSION_REVISION = 8
! WXLUA_LIBVERSION_AGE      = 0
  
  # We use the wxWidgets lib dir to put our libs into (it must be writeable)
--- 16,20 ----
  WXLUA_LIBVERSION_CURRENT  = 2
  WXLUA_LIBVERSION_REVISION = 8
! WXLUA_LIBVERSION_AGE      = 7
  
  # We use the wxWidgets lib dir to put our libs into (it must be writeable)
***************
*** 63,67 ****
  WXLIB_DIR  := $(WXEXECDIR)/lib
  
! WXSTC_LIB       := $(WXBASENAME)_stc-$(WXRELEASE)
  
  # ----------------------------------------------------------------------------
--- 63,67 ----
  WXLIB_DIR  := $(WXEXECDIR)/lib
  
! WXSTC_LIB  := $(WXBASENAME)_stc-$(WXRELEASE)
  
  # ----------------------------------------------------------------------------
***************
*** 128,135 ****
  # ----------------------------------------------------------------------------
  
! WXLUA_TARGET_LIB_STATIC := $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a
! WXLUA_TARGET_LIB_SHARED := $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXLUA_TARGET_LIB_LINK1  := $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXLUA_TARGET_LIB_LINK2  := $(WXLUA_TARGET_LIBNAME).so
  
  # ----------------------------------------------------------------------------
--- 128,135 ----
  # ----------------------------------------------------------------------------
  
! WXLUA_TARGET_LIB_STATIC = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a
! WXLUA_TARGET_LIB_SHARED = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXLUA_TARGET_LIB_LINK1  = $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXLUA_TARGET_LIB_LINK2  = $(WXLUA_TARGET_LIBNAME).so
  
  # ----------------------------------------------------------------------------

[Wxlua-commit] wxLua/samples bindings.wx.lua,1.21,1.22

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

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

Modified Files:
	bindings.wx.lua 
Log Message:
fix typo


Index: bindings.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** bindings.wx.lua	22 Jan 2008 04:45:39 -0000	1.21
--- bindings.wx.lua	20 May 2008 04:21:22 -0000	1.22
***************
*** 977,981 ****
              -- check for mistakes in the bindings
              if (not c.classInfo) and wx.wxClassInfo.FindClass(c.name) then
!                 print(c.name.." is missing it's wxClassInfo, please report this.")
              end
  
--- 977,981 ----
              -- check for mistakes in the bindings
              if (not c.classInfo) and wx.wxClassInfo.FindClass(c.name) then
!                 print(c.name.." is missing its wxClassInfo, please report this.")
              end
  
***************
*** 985,989 ****
                  -- check for mistakes in the bindings
                  if (not bc.classInfo) and wx.wxClassInfo.FindClass(bc.name) then
!                     print(bc.name.." is missing it's wxClassInfo, please report this.")
                  end
  
--- 985,989 ----
                  -- check for mistakes in the bindings
                  if (not bc.classInfo) and wx.wxClassInfo.FindClass(bc.name) then
!                     print(bc.name.." is missing its wxClassInfo, please report this.")
                  end
  

[Wxlua-commit] wxLua/build Makefile_wx-config.in,1.5,1.6

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

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

Modified Files:
	Makefile_wx-config.in 
Log Message:
Use ":=" and not "=" for a huge speedup for the shell command used in the Makefiles.


Index: Makefile_wx-config.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile_wx-config.in	11 Jan 2008 06:56:04 -0000	1.5
--- Makefile_wx-config.in	15 May 2008 04:10:09 -0000	1.6
***************
*** 42,46 ****
  
  ifeq (Apple, $(findstring Apple, $(shell gcc --version)))
!         LUA_PLAT=macosx
  endif
  
--- 42,46 ----
  
  ifeq (Apple, $(findstring Apple, $(shell gcc --version)))
!     LUA_PLAT=macosx
  endif
  
***************
*** 52,94 ****
  @echo "Using these WXLIBS_NAMES = $(WXLIBS_NAMES)"
  
! WXCONFIG  := wx-config
! WXPREFIX   = $(shell $(WXCONFIG) --prefix)
! WXEXECDIR  = $(shell $(WXCONFIG) --exec-prefix)
! WXBASENAME = $(shell $(WXCONFIG) --basename)
! WXVERSION  = $(shell $(WXCONFIG) --version)
! WXRELEASE  = $(shell $(WXCONFIG) --release)
! WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
! WXLDLIBS   = $(shell $(WXCONFIG) --libs $(WXLIBS_NAMES))
! WXCXX      = $(shell $(WXCONFIG) --cxx)
! WXLIB_DIR  = $(WXEXECDIR)/lib
  
! WXSTC_LIB       = $(WXBASENAME)_stc-$(WXRELEASE)
  
  # ----------------------------------------------------------------------------
  # The wxSTEditor library compiled from wxCode/components/wxstedit
  
! WXSTEDIT_DIR    = $(WXCODE)/components/wxstedit
! WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
  WXSTEDIT_LIB   := $(patsubst wx_%,wxcode_%,$(WXSTEDIT_LIB))
  
  # ----------------------------------------------------------------------------
  
! LUA_LIBS                = $(WXLUA_DIR)/lib/liblua.a
! WXLUA_LIB               = $(WXBASENAME)_wxlua-$(WXRELEASE)
! WXLUADEBUG_LIB          = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
! WXLUASOCKET_LIB         = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
  
! WXLUABINDADV_LIB        = $(WXBASENAME)_wxbindadv-$(WXRELEASE)
! WXLUABINDAUI_LIB        = $(WXBASENAME)_wxbindaui-$(WXRELEASE)
! WXLUABINDBASE_LIB       = $(WXBASENAME)_wxbindbase-$(WXRELEASE)
! WXLUABINDCORE_LIB       = $(WXBASENAME)_wxbindcore-$(WXRELEASE)
! WXLUABINDGL_LIB         = $(WXBASENAME)_wxbindgl-$(WXRELEASE)
! WXLUABINDHTML_LIB       = $(WXBASENAME)_wxbindhtml-$(WXRELEASE)
! WXLUABINDMEDIA_LIB      = $(WXBASENAME)_wxbindmedia-$(WXRELEASE)
! WXLUABINDNET_LIB        = $(WXBASENAME)_wxbindnet-$(WXRELEASE)
! WXLUABINDRICHTEXT_LIB   = $(WXBASENAME)_wxbindrichtext-$(WXRELEASE)
! WXLUABINDSTC_LIB        = $(WXBASENAME)_wxbindstc-$(WXRELEASE)
! WXLUABINDXML_LIB        = $(WXBASENAME)_wxbindxml-$(WXRELEASE)
! WXLUABINDXRC_LIB        = $(WXBASENAME)_wxbindxrc-$(WXRELEASE)
  
  WXLUA_LIB              := $(patsubst wx_%,wxlua_%,$(WXLUA_LIB))
--- 52,94 ----
  @echo "Using these WXLIBS_NAMES = $(WXLIBS_NAMES)"
  
! WXCONFIG   := wx-config
! WXPREFIX   := $(shell $(WXCONFIG) --prefix)
! WXEXECDIR  := $(shell $(WXCONFIG) --exec-prefix)
! WXBASENAME := $(shell $(WXCONFIG) --basename)
! WXVERSION  := $(shell $(WXCONFIG) --version)
! WXRELEASE  := $(shell $(WXCONFIG) --release)
! WXCXXFLAGS := $(shell $(WXCONFIG) --cxxflags)
! WXLDLIBS   := $(shell $(WXCONFIG) --libs $(WXLIBS_NAMES))
! WXCXX      := $(shell $(WXCONFIG) --cxx)
! WXLIB_DIR  := $(WXEXECDIR)/lib
  
! WXSTC_LIB       := $(WXBASENAME)_stc-$(WXRELEASE)
  
  # ----------------------------------------------------------------------------
  # The wxSTEditor library compiled from wxCode/components/wxstedit
  
! WXSTEDIT_DIR   := $(WXCODE)/components/wxstedit
! WXSTEDIT_LIB   := $(WXBASENAME)_stedit-$(WXRELEASE)
  WXSTEDIT_LIB   := $(patsubst wx_%,wxcode_%,$(WXSTEDIT_LIB))
  
  # ----------------------------------------------------------------------------
  
! LUA_LIBS               := $(WXLUA_DIR)/lib/liblua.a
! WXLUA_LIB              := $(WXBASENAME)_wxlua-$(WXRELEASE)
! WXLUADEBUG_LIB         := $(WXBASENAME)_wxluadebug-$(WXRELEASE)
! WXLUASOCKET_LIB        := $(WXBASENAME)_wxluasocket-$(WXRELEASE)
  
! WXLUABINDADV_LIB       := $(WXBASENAME)_wxbindadv-$(WXRELEASE)
! WXLUABINDAUI_LIB       := $(WXBASENAME)_wxbindaui-$(WXRELEASE)
! WXLUABINDBASE_LIB      := $(WXBASENAME)_wxbindbase-$(WXRELEASE)
! WXLUABINDCORE_LIB      := $(WXBASENAME)_wxbindcore-$(WXRELEASE)
! WXLUABINDGL_LIB        := $(WXBASENAME)_wxbindgl-$(WXRELEASE)
! WXLUABINDHTML_LIB      := $(WXBASENAME)_wxbindhtml-$(WXRELEASE)
! WXLUABINDMEDIA_LIB     := $(WXBASENAME)_wxbindmedia-$(WXRELEASE)
! WXLUABINDNET_LIB       := $(WXBASENAME)_wxbindnet-$(WXRELEASE)
! WXLUABINDRICHTEXT_LIB  := $(WXBASENAME)_wxbindrichtext-$(WXRELEASE)
! WXLUABINDSTC_LIB       := $(WXBASENAME)_wxbindstc-$(WXRELEASE)
! WXLUABINDXML_LIB       := $(WXBASENAME)_wxbindxml-$(WXRELEASE)
! WXLUABINDXRC_LIB       := $(WXBASENAME)_wxbindxrc-$(WXRELEASE)
  
  WXLUA_LIB              := $(patsubst wx_%,wxlua_%,$(WXLUA_LIB))
***************
*** 111,122 ****
  
  
! WXLUABINDALL_LIBS  = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB)
! WXLUABINDSTD_LIBS  = -l$(WXLUABINDNET_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDADV_LIB)
  
  # ----------------------------------------------------------------------------
  
! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC
! LDLIBS   = $(WXLDLIBS)
! CXX      = $(WXCXX)
  
  RM        = rm -f
--- 111,122 ----
  
  
! WXLUABINDALL_LIBS  := -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB)
! WXLUABINDSTD_LIBS  := -l$(WXLUABINDNET_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDADV_LIB)
  
  # ----------------------------------------------------------------------------
  
! CXXFLAGS := $(WXCXXFLAGS) -MMD -g -Wall -fPIC
! LDLIBS   := $(WXLDLIBS)
! CXX      := $(WXCXX)
  
  RM        = rm -f
***************
*** 128,150 ****
  # ----------------------------------------------------------------------------
  
! WXLUA_TARGET_LIB_STATIC = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a
! WXLUA_TARGET_LIB_SHARED = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXLUA_TARGET_LIB_LINK1  = $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXLUA_TARGET_LIB_LINK2  = $(WXLUA_TARGET_LIBNAME).so
  
  # ----------------------------------------------------------------------------
  
! GCC_PROFILE  = #-pg
! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXLUA_WXLUASETUP_DIR) -I$(WXSTEDIT_DIR)/include -I$(WXPREFIX)/contrib/include -DLUACALL=
  
  # This will build a shared wxLua app, dynamicly linked to .so libs
! APPEXTRALIBS= $(GCC_PROFILE) -L$(WXLUA_LIBDIR) $(WXLUABINDALL_LIBS) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)
  
  # This will build a static wxLua app, staticly linked to .a libs
! #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(LUA_LIBS)
  
  
  # for lib targets, these are extra linker args
! LIBEXTRALIBS = $(GCC_PROFILE)
  
  # ----------------------------------------------------------------------------
--- 128,150 ----
  # ----------------------------------------------------------------------------
  
! WXLUA_TARGET_LIB_STATIC := $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a
! WXLUA_TARGET_LIB_SHARED := $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXLUA_TARGET_LIB_LINK1  := $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXLUA_TARGET_LIB_LINK2  := $(WXLUA_TARGET_LIBNAME).so
  
  # ----------------------------------------------------------------------------
  
! GCC_PROFILE  := #-pg
! APPEXTRADEFS := $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXLUA_WXLUASETUP_DIR) -I$(WXSTEDIT_DIR)/include -I$(WXPREFIX)/contrib/include -DLUACALL=
  
  # This will build a shared wxLua app, dynamicly linked to .so libs
! APPEXTRALIBS := $(GCC_PROFILE) -L$(WXLUA_LIBDIR) $(WXLUABINDALL_LIBS) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)
  
  # This will build a static wxLua app, staticly linked to .a libs
! #APPEXTRALIBS := -L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(LUA_LIBS)
  
  
  # for lib targets, these are extra linker args
! LIBEXTRALIBS := $(GCC_PROFILE)
  
  # ----------------------------------------------------------------------------

[Wxlua-commit] wxLua/samples editor.wx.lua,1.57,1.58

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

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

Modified Files:
	editor.wx.lua 
Log Message:
Ignore wxNotebook sending changed events when it's destroyed (the frame is too)


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** editor.wx.lua	22 Jan 2008 04:45:39 -0000	1.57
--- editor.wx.lua	1 Apr 2008 05:10:05 -0000	1.58
***************
*** 226,230 ****
  notebook:Connect(wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
          function (event)
!             SetEditorSelection(event:GetSelection())
              event:Skip() -- skip to let page change
          end)
--- 226,232 ----
  notebook:Connect(wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
          function (event)
!             if not exitingProgram then
!                 SetEditorSelection(event:GetSelection())
!             end
              event:Skip() -- skip to let page change
          end)

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.41,1.42

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

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20252/wxLua/apps/wxlua/src

Modified Files:
	editor.h 
Log Message:
Ignore wxNotebook sending changed events when it's destroyed (the frame is too)


Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** editor.h	17 Jul 2007 14:45:14 -0000	1.41
--- editor.h	1 Apr 2008 05:10:04 -0000	1.42
***************
*** 10,15 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90595;
! const unsigned char wxLuaEditor[90596] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 10,15 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 91181;
! const unsigned char wxLuaEditor[91182] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 21,24 ****
--- 21,28 ----
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   10,
+  45, 45, 32, 76,111, 97,100, 32,116,104,101, 32,119,120, 76,117, 97, 32,109,111,100,117,108,101, 44, 32,100,111,101,115, 32,110,111,116,104,105,110,103, 32,105,102, 32,114,117,110,110,105,110,103, 32,102,114,111,109, 32,119,120, 76,117, 97, 44, 32,119,120, 76,117, 97, 70,114,101,101,122,101, 44, 32,111,114, 32,119,120, 76,117, 97, 69,100,105,116, 10,
+ 112, 97, 99,107, 97,103,101, 46, 99,112, 97,116,104, 32, 61, 32,112, 97, 99,107, 97,103,101, 46, 99,112, 97,116,104, 46, 46, 34, 59, 46, 47, 63, 46,100,108,108, 59, 46, 47, 63, 46,115,111, 59, 46, 46, 47,108,105, 98, 47, 63, 46,115,111, 59, 46, 46, 47,108,105, 98, 47,118, 99, 95,100,108,108, 47, 63, 46,100,108,108, 59, 46, 46, 47,108,105, 98, 47, 98, 99, 99, 95,100,108,108, 47, 63, 46,100,108,108, 59, 46, 46, 47,108,105, 98, 47,109,105,110,103,119, 95,100,108,108, 47, 63, 46,100,108,108, 59, 34, 10,
+ 114,101,113,117,105,114,101, 40, 34,119,120, 34, 41, 10,
+  10,
   45, 45, 32, 69,113,117,105,118, 97,108,101,110,116, 32,116,111, 32, 67, 39,115, 32, 34, 99,111,110,100, 32, 63, 32, 97, 32, 58, 32, 98, 34, 44, 32, 97,108,108, 32,116,101,114,109,115, 32,119,105,108,108, 32, 98,101, 32,101,118, 97,108,117, 97,116,101,100, 10,
  102,117,110, 99,116,105,111,110, 32,105,102,102, 40, 99,111,110,100, 44, 32, 97, 44, 32, 98, 41, 32,105,102, 32, 99,111,110,100, 32,116,104,101,110, 32,114,101,116,117,114,110, 32, 97, 32,101,108,115,101, 32,114,101,116,117,114,110, 32, 98, 32,101,110,100, 32,101,110,100, 10,
***************
*** 235,239 ****
  110,111,116,101, 98,111,111,107, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 78, 79, 84, 69, 66, 79, 79, 75, 95, 80, 65, 71, 69, 95, 67, 72, 65, 78, 71, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116, 69,100,105,116,111,114, 83,101,108,101, 99,116,105,111,110, 40,101,118,101,110,116, 58, 71,101,116, 83,101,108,101, 99,116,105,111,110, 40, 41, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 32, 45, 45, 32,115,107,105,112, 32,116,111, 32,108,101,116, 32,112, 97,103,101, 32, 99,104, 97,110,103,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
--- 239,245 ----
  110,111,116,101, 98,111,111,107, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 78, 79, 84, 69, 66, 79, 79, 75, 95, 80, 65, 71, 69, 95, 67, 72, 65, 78, 71, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,110,111,116, 32,101,120,105,116,105,110,103, 80,114,111,103,114, 97,109, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116, 69,100,105,116,111,114, 83,101,108,101, 99,116,105,111,110, 40,101,118,101,110,116, 58, 71,101,116, 83,101,108,101, 99,116,105,111,110, 40, 41, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 32, 45, 45, 32,115,107,105,112, 32,116,111, 32,108,101,116, 32,112, 97,103,101, 32, 99,104, 97,110,103,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
***************
*** 2384,2387 ****
--- 2390,2399 ----
   45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 10,
  102,114, 97,109,101, 58, 83,104,111,119, 40,116,114,117,101, 41, 10,
+  10,
+  45, 45, 32, 67, 97,108,108, 32,119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 58, 77, 97,105,110, 76,111,111,112, 40, 41, 32,108, 97,115,116, 32,116,111, 32,115,116, 97,114,116, 32,116,104,101, 32,119,120, 87,105,100,103,101,116,115, 32,101,118,101,110,116, 32,108,111,111,112, 44, 10,
+  45, 45, 32,111,116,104,101,114,119,105,115,101, 32,116,104,101, 32,119,120, 76,117, 97, 32,112,114,111,103,114, 97,109, 32,119,105,108,108, 32,101,120,105,116, 32,105,109,109,101,100,105, 97,116,101,108,121, 46, 10,
+  45, 45, 32, 68,111,101,115, 32,110,111,116,104,105,110,103, 32,105,102, 32,114,117,110,110,105,110,103, 32,102,114,111,109, 32,119,120, 76,117, 97, 44, 32,119,120, 76,117, 97, 70,114,101,101,122,101, 44, 32,111,114, 32,119,120, 76,117, 97, 69,100,105,116, 32,115,105,110, 99,101, 32,116,104,101, 10,
+  45, 45, 32, 77, 97,105,110, 76,111,111,112, 32,105,115, 32, 97,108,114,101, 97,100,121, 32,114,117,110,110,105,110,103, 32,111,114, 32,119,105,108,108, 32, 98,101, 32,115,116, 97,114,116,101,100, 32, 98,121, 32,116,104,101, 32, 67, 43, 43, 32,112,114,111,103,114, 97,109, 46, 10,
+ 119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 58, 77, 97,105,110, 76,111,111,112, 40, 41, 10,
    0 };
  

[Wxlua-commit] wxLua/bindings/wxwidgets wxbase_file.i, 1.4, 1.5 wxcore_menutool.i, 1.3, 1.4

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

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

Modified Files:
	wxbase_file.i wxcore_menutool.i 
Log Message:
Added new wxFileName and wxMenuItem methods


Index: wxbase_file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxbase_file.i	29 Jan 2008 00:49:11 -0000	1.4
--- wxbase_file.i	1 Apr 2008 04:19:42 -0000	1.5
***************
*** 242,245 ****
--- 242,246 ----
      static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE)
      static wxString  GetPathTerminators(wxPathFormat format = wxPATH_NATIVE)
+     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
      wxString GetShortPath() const
  
***************
*** 288,291 ****
--- 289,293 ----
      void PrependDir(const wxString& dir)
      void RemoveDir(int pos)
+     void RemoveLastDir()
      bool Rmdir()
      static bool Rmdir(const wxString& dir)

Index: wxcore_menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_menutool.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_menutool.i	18 Dec 2007 01:03:32 -0000	1.3
--- wxcore_menutool.i	1 Apr 2008 04:19:42 -0000	1.4
***************
*** 154,157 ****
--- 154,166 ----
      // void SetName(const wxString& text) const - deprecated
      %win void SetTextColour(const wxColour& colour) const
+     
+     %if %wxchkver_2_8
+         void SetItemLabel(const wxString& str)
+         wxString GetItemLabel() const
+         wxString GetItemLabelText() const 
+ 
+         static wxString GetLabelText(const wxString& label)
+     %endif
+     
  %endclass
  

[Wxlua-commit] wxLua/modules/wxbind/src wxbase_file.cpp, 1.13, 1.14 wxcore_menutool.cpp, 1.13, 1.14

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv701/wxLua/modules/wxbind/src

Modified Files:
	wxbase_file.cpp wxcore_menutool.cpp 
Log Message:
Added new wxFileName and wxMenuItem methods


Index: wxbase_file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxbase_file.cpp	29 Jan 2008 04:22:52 -0000	1.13
--- wxbase_file.cpp	1 Apr 2008 04:19:42 -0000	1.14
***************
*** 1200,1203 ****
--- 1200,1223 ----
  }
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_GetPathWithSep[] = { &wxluatype_wxFileName, &wxluatype_TINTEGER, NULL };
+ static int LUACALL wxLua_wxFileName_GetPathWithSep(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_GetPathWithSep[1] = {{ wxLua_wxFileName_GetPathWithSep, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxFileName_GetPathWithSep }};
+ //     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
+ static int LUACALL wxLua_wxFileName_GetPathWithSep(lua_State *L)
+ {
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxPathFormat format = wxPATH_NATIVE
+     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
+     // get this
+     wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName);
+     // call GetPathWithSep
+     wxString returns = (self->GetPathWithSep(format));
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_GetShortPath[] = { &wxluatype_wxFileName, NULL };
  static int LUACALL wxLua_wxFileName_GetShortPath(lua_State *L);
***************
*** 1805,1808 ****
--- 1825,1842 ----
  }
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_RemoveLastDir[] = { &wxluatype_wxFileName, NULL };
+ static int LUACALL wxLua_wxFileName_RemoveLastDir(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_RemoveLastDir[1] = {{ wxLua_wxFileName_RemoveLastDir, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFileName_RemoveLastDir }};
+ //     void RemoveLastDir()
+ static int LUACALL wxLua_wxFileName_RemoveLastDir(lua_State *L)
+ {
+     // get this
+     wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName);
+     // call RemoveLastDir
+     self->RemoveLastDir();
+ 
+     return 0;
+ }
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_Rmdir1[] = { &wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxFileName_Rmdir1(lua_State *L);
***************
*** 2482,2485 ****
--- 2516,2520 ----
      { "GetPathSeparators", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxFileName_GetPathSeparators, 1, NULL },
      { "GetPathTerminators", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxFileName_GetPathTerminators, 1, NULL },
+     { "GetPathWithSep", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_GetPathWithSep, 1, NULL },
      { "GetShortPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_GetShortPath, 1, NULL },
  
***************
*** 2520,2523 ****
--- 2555,2559 ----
      { "PrependDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_PrependDir, 1, NULL },
      { "RemoveDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_RemoveDir, 1, NULL },
+     { "RemoveLastDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_RemoveLastDir, 1, NULL },
  
  #if (wxLUA_USE_wxFileName)

Index: wxcore_menutool.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_menutool.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxcore_menutool.cpp	29 Jan 2008 04:22:53 -0000	1.13
--- wxcore_menutool.cpp	1 Apr 2008 04:19:42 -0000	1.14
***************
*** 1603,1606 ****
--- 1603,1642 ----
  }
  
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabel[] = { &wxluatype_wxMenuItem, NULL };
+ static int LUACALL wxLua_wxMenuItem_GetItemLabel(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetItemLabel[1] = {{ wxLua_wxMenuItem_GetItemLabel, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabel }};
+ //         wxString GetItemLabel() const
+ static int LUACALL wxLua_wxMenuItem_GetItemLabel(lua_State *L)
+ {
+     // get this
+     wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem);
+     // call GetItemLabel
+     wxString returns = (self->GetItemLabel());
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabelText[] = { &wxluatype_wxMenuItem, NULL };
+ static int LUACALL wxLua_wxMenuItem_GetItemLabelText(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetItemLabelText[1] = {{ wxLua_wxMenuItem_GetItemLabelText, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabelText }};
+ //         wxString GetItemLabelText() const 
+ static int LUACALL wxLua_wxMenuItem_GetItemLabelText(lua_State *L)
+ {
+     // get this
+     wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem);
+     // call GetItemLabelText
+     wxString returns = (self->GetItemLabelText());
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetKind[] = { &wxluatype_wxMenuItem, NULL };
  static int LUACALL wxLua_wxMenuItem_GetKind(lua_State *L);
***************
*** 1651,1654 ****
--- 1687,1710 ----
  }
  
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetLabelText[] = { &wxluatype_TSTRING, NULL };
+ static int LUACALL wxLua_wxMenuItem_GetLabelText(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetLabelText[1] = {{ wxLua_wxMenuItem_GetLabelText, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetLabelText }};
+ //         static wxString GetLabelText(const wxString& label)
+ static int LUACALL wxLua_wxMenuItem_GetLabelText(lua_State *L)
+ {
+     // const wxString label
+     const wxString label = wxlua_getwxStringtype(L, 1);
+     // call GetLabelText
+     wxString returns = (wxMenuItem::GetLabelText(label));
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetMenu[] = { &wxluatype_wxMenuItem, NULL };
  static int LUACALL wxLua_wxMenuItem_GetMenu(lua_State *L);
***************
*** 1815,1818 ****
--- 1871,1894 ----
  }
  
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_SetItemLabel[] = { &wxluatype_wxMenuItem, &wxluatype_TSTRING, NULL };
+ static int LUACALL wxLua_wxMenuItem_SetItemLabel(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_SetItemLabel[1] = {{ wxLua_wxMenuItem_SetItemLabel, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxMenuItem_SetItemLabel }};
+ //         void SetItemLabel(const wxString& str)
+ static int LUACALL wxLua_wxMenuItem_SetItemLabel(lua_State *L)
+ {
+     // const wxString str
+     const wxString str = wxlua_getwxStringtype(L, 2);
+     // get this
+     wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem);
+     // call SetItemLabel
+     self->SetItemLabel(str);
+ 
+     return 0;
+ }
+ 
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_SetSubMenu[] = { &wxluatype_wxMenuItem, &wxluatype_wxMenu, NULL };
  static int LUACALL wxLua_wxMenuItem_SetSubMenu(lua_State *L);
***************
*** 1910,1916 ****
--- 1986,2003 ----
      { "GetHelp", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetHelp, 1, NULL },
      { "GetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetId, 1, NULL },
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+     { "GetItemLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetItemLabel, 1, NULL },
+     { "GetItemLabelText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetItemLabelText, 1, NULL },
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
      { "GetKind", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetKind, 1, NULL },
      { "GetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetLabel, 1, NULL },
      { "GetLabelFromText", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxMenuItem_GetLabelFromText, 1, NULL },
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+     { "GetLabelText", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxMenuItem_GetLabelText, 1, NULL },
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
      { "GetMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetMenu, 1, NULL },
      { "GetSubMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetSubMenu, 1, NULL },
***************
*** 1927,1930 ****
--- 2014,2022 ----
  
      { "SetHelp", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetHelp, 1, NULL },
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+     { "SetItemLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetItemLabel, 1, NULL },
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
      { "SetSubMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetSubMenu, 1, NULL },
      { "SetText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetText, 1, NULL },