wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxluadebug/src staktree.cpp, 1.35, 1.36

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

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

Modified Files:
	staktree.cpp 
Log Message:
rem out debugging code in wxlbind.cpp
only measure the text height once for the stack window
make scribble faster by drawing to the window first


Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** staktree.cpp	14 Dec 2006 01:01:27 -0000	1.35
--- staktree.cpp	26 Feb 2007 05:17:30 -0000	1.36
***************
*** 108,118 ****
                                               wxNO_BORDER, false);
  
-     m_treeSplitter->SetSashPosition(25);
-     m_treeSplitter->SetMinimumPaneSize(10);
      m_treeSplitter->SplitVertically(m_treeControl, m_valueSplitter);
  
      m_valueSplitter->SetSashPosition(125);
      m_valueSplitter->SetMinimumPaneSize(10);
-     m_valueSplitter->SplitVertically(m_firstValueWindow, m_secondValueWindow);
  
      m_scrolledWindow->SetTargetWindow(m_treeControl);
--- 108,118 ----
                                               wxNO_BORDER, false);
  
      m_treeSplitter->SplitVertically(m_treeControl, m_valueSplitter);
+     m_treeSplitter->SetSashPosition(200);
+     m_treeSplitter->SetMinimumPaneSize(10);
  
+     m_valueSplitter->SplitVertically(m_firstValueWindow, m_secondValueWindow);
      m_valueSplitter->SetSashPosition(125);
      m_valueSplitter->SetMinimumPaneSize(10);
  
      m_scrolledWindow->SetTargetWindow(m_treeControl);
***************
*** 434,437 ****
--- 434,438 ----
                       :wxTreeCompanionWindow(parent, id, pos, sz, style), m_first_window(first_window)
  {
+     m_text_height = 0;
      SetBackgroundColour(*wxWHITE);
  }
***************
*** 450,458 ****
          wxString txt(m_first_window ? itemData->GetType() : itemData->GetValue());
  
!         int text_width = 0, text_height = 0;
!         dc.GetTextExtent(txt, &text_width, &text_height);
  
          int x = 5;
!         int y = (rect.GetHeight() - text_height) / 2; // try to center it, else pin to top
          y = rect.GetY() + wxMax(0, y);
  
--- 451,463 ----
          wxString txt(m_first_window ? itemData->GetType() : itemData->GetValue());
  
!         if (m_text_height == 0)
!         {
!             int text_width = 0;
!             dc.GetTextExtent(wxT("1234ABCDEabcdejZ"), &text_width, &m_text_height);
!         }
  
          int x = 5;
!         int y = (rect.GetHeight() - m_text_height) / 2; // try to center it, else pin to top
! 
          y = rect.GetY() + wxMax(0, y);
  

[Wxlua-commit] wxLua/samples scribble.wx.lua,1.13,1.14

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

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

Modified Files:
	scribble.wx.lua 
Log Message:
rem out debugging code in wxlbind.cpp
only measure the text height once for the stack window
make scribble faster by drawing to the window first


Index: scribble.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** scribble.wx.lua	22 Nov 2006 21:13:56 -0000	1.13
--- scribble.wx.lua	26 Feb 2007 05:17:30 -0000	1.14
***************
*** 2,6 ****
  -- Name:        scribble.wx.lua
  -- Purpose:     'Scribble' wxLua sample
! -- Author:      J Winwood
  -- Modified by: Thanks to Peter Prade and Nick Trout for fixing
  --              the bug in the for loop in DrawPoints()
--- 2,6 ----
  -- Name:        scribble.wx.lua
  -- Purpose:     'Scribble' wxLua sample
! -- Author:      J Winwood, John Labenski
  -- Modified by: Thanks to Peter Prade and Nick Trout for fixing
  --              the bug in the for loop in DrawPoints()
***************
*** 19,23 ****
  isModified     = false -- has the drawing been modified
  redrawRequired = true  -- redraw the image
! lastDrawn      = 0     -- last point that was drawn or 0 to redraw all
  fileName       = ""    -- filename to save to
  ID_SAVEBITMAP  = wx.wxID_HIGHEST + 1
--- 19,23 ----
  isModified     = false -- has the drawing been modified
  redrawRequired = true  -- redraw the image
! lastDrawn      = 0     -- last segment that was drawn or 0 to redraw all
  fileName       = ""    -- filename to save to
  ID_SAVEBITMAP  = wx.wxID_HIGHEST + 1
***************
*** 45,53 ****
  
          local point = listValue[1]
!         local last_x, last_y = point.x, point.y
          for point_index = 2, #listValue do
              point = listValue[point_index]
!             drawDC:DrawLine(last_x, last_y, point.x, point.y)
!             last_x, last_y = point.x, point.y
          end
      end
--- 45,53 ----
  
          local point = listValue[1]
!         local last_point = point
          for point_index = 2, #listValue do
              point = listValue[point_index]
!             drawDC:DrawLine(last_point.x, last_point.y, point.x, point.y)
!             last_point = point
          end
      end
***************
*** 57,64 ****
--- 57,78 ----
  end
  
+ function DrawLastPoint(drawDC)
+     if #pointsList < 1 then return end
+     local listValue = pointsList[#pointsList]
+     if #listValue < 2 then return end
+ 
+     drawDC:SetPen(pens[listValue.penColour])
+     local pt1 = listValue[#listValue-1]
+     local pt2 = listValue[#listValue]
+ 
+     drawDC:DrawLine(pt1.x, pt1.y, pt2.x, pt2.y)
+ end
+ 
  function DrawBitmap(bmp)
      local memDC = wx.wxMemoryDC()       -- create off screen dc to draw on
      memDC:SelectObject(bmp)             -- select our bitmap to draw into
+ 
      DrawPoints(memDC)
+ 
      memDC:SelectObject(wx.wxNullBitmap) -- always release bitmap
      memDC:Delete() -- ALWAYS Delete() any wxDCs created when done
***************
*** 83,88 ****
  
  function OnLeftDown(event)
-     frame:SetStatusText(penColours[itemColour], 1)
- 
      local pointItem = {penColour = itemColour, {x = event:GetX(), y = event:GetY()}}
      table.insert(pointsList, pointItem)
--- 97,100 ----
***************
*** 96,101 ****
      mouseDown = true
      isModified = true
-     redrawRequired = true
-     panel:Refresh()
  end
  
--- 108,111 ----
***************
*** 127,132 ****
  
          mouseDown = true
!         redrawRequired = true
!         panel:Refresh()
      elseif panel:HasCapture() then -- just in case we lost focus somehow
          panel:ReleaseMouse()
--- 137,145 ----
  
          mouseDown = true
! 
!         -- draw directly on the panel, we'll draw on the bitmap in OnLeftUp
!         local drawDC = wx.wxClientDC(panel)
!         DrawLastPoint(drawDC)
!         drawDC:Delete()
      elseif panel:HasCapture() then -- just in case we lost focus somehow
          panel:ReleaseMouse()
***************
*** 258,261 ****
--- 271,277 ----
      fileMenu:Append(wx.wxID_EXIT,   "E&xit", "Quit the program")
  
+     local editMenu = wx.wxMenu()
+     editMenu:Append(wx.wxID_UNDO,  "&Undo\tCtrl-Z", "Undo last drawn segment")
+ 
      local helpMenu = wx.wxMenu()
      helpMenu:Append(wx.wxID_ABOUT,  "&About...", "About the wxLua Scribble Application")
***************
*** 263,266 ****
--- 279,283 ----
      local menuBar = wx.wxMenuBar()
      menuBar:Append(fileMenu, "&File")
+     menuBar:Append(editMenu, "&Edit")
      menuBar:Append(helpMenu, "&Help")
      frame:SetMenuBar(menuBar)
***************
*** 366,369 ****
--- 383,400 ----
              end )
  
+     frame:Connect(wx.wxID_UNDO, wx.wxEVT_COMMAND_MENU_SELECTED,
+             function (event)
+                 if #pointsList then
+                     pointsList[#pointsList] = nil
+                     lastDrawn = 0
+                     redrawRequired = true
+                     panel:Refresh()
+                 end
+ 
+                 if #pointsList == 0 then
+                     isModified = false
+                 end
+             end )
+ 
      frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED,
              function (event)

[Wxlua-commit] wxLua/modules/wxluadebug/include staktree.h, 1.16, 1.17

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16333/wxLua/modules/wxluadebug/include

Modified Files:
	staktree.h 
Log Message:
rem out debugging code in wxlbind.cpp
only measure the text height once for the stack window
make scribble faster by drawing to the window first


Index: staktree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** staktree.h	13 Dec 2006 06:57:50 -0000	1.16
--- staktree.h	26 Feb 2007 05:17:29 -0000	1.17
***************
*** 126,130 ****
  
  private:
!     bool    m_first_window;
      DECLARE_ABSTRACT_CLASS(wxLuaStackDataWindow)
  };
--- 126,131 ----
  
  private:
!     bool m_first_window;
!     int  m_text_height;
      DECLARE_ABSTRACT_CLASS(wxLuaStackDataWindow)
  };

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp,1.51,1.52

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

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

Modified Files:
	wxlbind.cpp 
Log Message:
rem out debugging code in wxlbind.cpp
only measure the text height once for the stack window
make scribble faster by drawing to the window first


Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** wxlbind.cpp	26 Feb 2007 01:57:06 -0000	1.51
--- wxlbind.cpp	26 Feb 2007 05:17:29 -0000	1.52
***************
*** 93,100 ****
  
  wxLuaObject::wxLuaObject(const wxLuaState& wxlState, int iParam)
!             : m_wxlState(NULL),
                m_bool(false), m_int(0), m_alloc_flags(wxLUAOBJECT_NONE)
  {
-     m_wxlState = new wxLuaState(wxlState);
      // set up the reference
      m_iReference = m_wxlState->tinsert(iParam);
--- 93,99 ----
  
  wxLuaObject::wxLuaObject(const wxLuaState& wxlState, int iParam)
!             : m_wxlState(new wxLuaState(wxlState)),
                m_bool(false), m_int(0), m_alloc_flags(wxLUAOBJECT_NONE)
  {
      // set up the reference
      m_iReference = m_wxlState->tinsert(iParam);
***************
*** 114,121 ****
      return (m_wxlState != NULL) ? *m_wxlState : wxNullLuaState;
  }
- lua_State* wxLuaObject::GetLuaState() const
- {
-     return GetwxLuaState().GetLuaState();
- }
  
  int wxLuaObject::SetAllocationFlag(wxLuaObject_Type flag, bool set)
--- 113,116 ----
***************
*** 131,136 ****
  bool wxLuaObject::GetObject()
  {
!     lua_State* L = GetLuaState();
!     wxCHECK_MSG(L, false, wxT("Invalid wxLuaState"));
  
      if (HasAllocationFlag(wxLUAOBJECT_BOOL))
--- 126,131 ----
  bool wxLuaObject::GetObject()
  {
!     wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState"));
!     lua_State* L = m_wxlState->GetLuaState();
  
      if (HasAllocationFlag(wxLUAOBJECT_BOOL))
***************
*** 167,170 ****
--- 162,166 ----
  void wxLuaObject::SetObject(int iParam)
  {
+     wxCHECK_RET(m_wxlState->Ok(), wxT("Invalid wxLuaState"));
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF)) // FIXME should this error out?
          m_wxlState->tremove(m_iReference);
***************
*** 178,184 ****
  bool *wxLuaObject::GetBoolPtr()
  {
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         m_bool         = (lua_tonumber(GetLuaState(), -1) != 0);
          m_alloc_flags |= wxLUAOBJECT_BOOL;
      }
--- 174,181 ----
  bool *wxLuaObject::GetBoolPtr()
  {
+     wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState"));
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         m_bool         = (lua_tonumber(m_wxlState->GetLuaState(), -1) != 0);
          m_alloc_flags |= wxLUAOBJECT_BOOL;
      }
***************
*** 188,194 ****
  int *wxLuaObject::GetIntPtr()
  {
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         m_int          = (int) lua_tonumber(GetLuaState(), -1);
          m_alloc_flags |= wxLUAOBJECT_INT;
      }
--- 185,192 ----
  int *wxLuaObject::GetIntPtr()
  {
+     wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState"));
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         m_int          = (int) lua_tonumber(m_wxlState->GetLuaState(), -1);
          m_alloc_flags |= wxLUAOBJECT_INT;
      }
***************
*** 198,204 ****
  wxString *wxLuaObject::GetStringPtr()
  {
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         m_string       = lua2wx(lua_tostring(GetLuaState(), -1));
          m_alloc_flags |= wxLUAOBJECT_STRING;
      }
--- 196,203 ----
  wxString *wxLuaObject::GetStringPtr()
  {
+     wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState"));
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         m_string       = lua2wx(lua_tostring(m_wxlState->GetLuaState(), -1));
          m_alloc_flags |= wxLUAOBJECT_STRING;
      }
***************
*** 208,214 ****
  wxArrayInt *wxLuaObject::GetArrayPtr()
  {
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         lua_State* L = GetLuaState();
          if (lua_istable(L, -1))
          {
--- 207,214 ----
  wxArrayInt *wxLuaObject::GetArrayPtr()
  {
+     wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState"));
      if (m_wxlState->Ok() && (m_iReference != LUA_NOREF) && GetObject())
      {
!         lua_State* L = m_wxlState->GetLuaState();
          if (lua_istable(L, -1))
          {
***************
*** 278,283 ****
  
              wxLuaStringToLongHashMap *pHashTable = (wxLuaStringToLongHashMap *)it->second;
!             if (pHashTable != NULL)
!                 delete pHashTable;
  
              it->second = 0;
--- 278,282 ----
  
              wxLuaStringToLongHashMap *pHashTable = (wxLuaStringToLongHashMap *)it->second;
!             delete pHashTable;
  
              it->second = 0;
***************
*** 288,295 ****
          // LuaDelete is placed at the end, so start there first and if found
          // call the function
!         int iMethod, method_count = pClass->num_methods;
!         for (iMethod = method_count-1; iMethod >= 0; --iMethod)
          {
!             WXLUAMETHOD *pMethod = pClass->methods + iMethod;
              if (pMethod->type == LuaDelete)
              {
--- 287,294 ----
          // LuaDelete is placed at the end, so start there first and if found
          // call the function
!         int i_method, method_count = pClass->num_methods;
!         for (i_method = method_count-1; i_method >= 0; --i_method)
          {
!             WXLUAMETHOD *pMethod = pClass->methods + i_method;
              if (pMethod->type == LuaDelete)
              {
***************
*** 415,419 ****
      const char *cpIndex = lua_tostring(L, 2);
  
!     wxPrintf(wxT("wxLua_lua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str());
  
      if ((pClass != NULL) && lua_isuserdata(L, 1) &&
--- 414,418 ----
      const char *cpIndex = lua_tostring(L, 2);
  
!     //wxPrintf(wxT("wxLua_lua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str());
  
      if ((pClass != NULL) && lua_isuserdata(L, 1) &&
***************
*** 447,451 ****
              }
  
!             wxString index = lua2wx(cpIndex);
              if (!fCreated)
              {
--- 446,450 ----
              }
  
!             wxString index(lua2wx(cpIndex));
              if (!fCreated)
              {

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h,1.35,1.36

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16333/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h 
Log Message:
rem out debugging code in wxlbind.cpp
only measure the text height once for the stack window
make scribble faster by drawing to the window first


Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxlbind.h	26 Feb 2007 01:57:06 -0000	1.35
--- wxlbind.h	26 Feb 2007 05:17:29 -0000	1.36
***************
*** 163,168 ****
  {
  public:
!     wxLuaObject();
!     // Constructor that is passed a lua state and a parameter index.
      wxLuaObject(const wxLuaState& wxlState, int iParam = 1);
  
--- 163,167 ----
  {
  public:
!     // Wrap the item at the lua state's stack index.
      wxLuaObject(const wxLuaState& wxlState, int iParam = 1);
  
***************
*** 189,193 ****
  
      wxLuaState GetwxLuaState() const;
-     lua_State* GetLuaState() const;
  
  private:
--- 188,191 ----

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.20, 1.21 wxluacan.h, 1.19, 1.20 wxluacan_bind.cpp, 1.13, 1.14

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

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

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxluacan.cpp	22 Feb 2007 00:01:33 -0000	1.20
--- wxluacan.cpp	26 Feb 2007 01:57:00 -0000	1.21
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 20,26 ****
  
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlCanObj
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObj'
--- 20,26 ----
  
  
! // ---------------------------------------------------------------------------
  // Bind class wxlCanObj
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObj'
***************
*** 186,192 ****
  int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlCanObjRect
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjRect'
--- 186,192 ----
  int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxlCanObjRect
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjRect'
***************
*** 230,236 ****
  int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlCanObjCircle
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjCircle'
--- 230,236 ----
  int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxlCanObjCircle
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjCircle'
***************
*** 272,278 ****
  int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlCanObjScript
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjScript'
--- 272,278 ----
  int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxlCanObjScript
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjScript'
***************
*** 314,320 ****
  int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlCanObjAddScript
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjAddScript'
--- 314,320 ----
  int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxlCanObjAddScript
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCanObjAddScript'
***************
*** 372,378 ****
  int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlCan
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCan'
--- 372,378 ----
  int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxlCan
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlCan'
***************
*** 474,480 ****
  int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxlLuaCanCmd
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlLuaCanCmd'
--- 474,480 ----
  int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxlLuaCanCmd
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxlLuaCanCmd'

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxluacan_bind.cpp	7 Feb 2007 18:39:06 -0000	1.13
--- wxluacan_bind.cpp	26 Feb 2007 01:57:00 -0000	1.14
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 20,26 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetEventList_wxluacan() is called to register events
! // ----------------------------------------------------------------------------
  
  WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count)
--- 20,26 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetEventList_wxluacan() is called to register events
! // ---------------------------------------------------------------------------
  
  WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count)
***************
*** 34,40 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetDefineList_wxluacan() is called to register defines and enums
! // ----------------------------------------------------------------------------
  
  WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count)
--- 34,40 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetDefineList_wxluacan() is called to register defines and enums
! // ---------------------------------------------------------------------------
  
  WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count)
***************
*** 42,52 ****
      static WXLUADEFINE defineList[] =
      {
!         // --------------------------------------------------------------------
          // %define
!         // --------------------------------------------------------------------
  
!         // --------------------------------------------------------------------
          // %enum
!         // --------------------------------------------------------------------
  
          { 0, 0 },
--- 42,52 ----
      static WXLUADEFINE defineList[] =
      {
!         // -------------------------------------------------------------------
          // %define
!         // -------------------------------------------------------------------
  
!         // -------------------------------------------------------------------
          // %enum
!         // -------------------------------------------------------------------
  
          { 0, 0 },
***************
*** 56,63 ****
  }
  
! // ----------------------------------------------------------------------------
  
  // wxLuaGetStringList_wxluacan() is called to register strings
! // ----------------------------------------------------------------------------
  
  WXLUASTRING* wxLuaGetStringList_wxluacan(size_t &count)
--- 56,63 ----
  }
  
! // ---------------------------------------------------------------------------
  
  // wxLuaGetStringList_wxluacan() is called to register strings
! // ---------------------------------------------------------------------------
  
  WXLUASTRING* wxLuaGetStringList_wxluacan(size_t &count)
***************
*** 65,71 ****
      static WXLUASTRING stringList[] =
      {
!         // --------------------------------------------------------------------
          // %define %string
!         // --------------------------------------------------------------------
  
          { 0, 0 },
--- 65,71 ----
      static WXLUASTRING stringList[] =
      {
!         // -------------------------------------------------------------------
          // %define %string
!         // -------------------------------------------------------------------
  
          { 0, 0 },
***************
*** 75,81 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetObjectList_wxluacan() is called to register object and pointer bindings
! // ----------------------------------------------------------------------------
  
  WXLUAOBJECT* wxLuaGetObjectList_wxluacan(size_t &count)
--- 75,81 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetObjectList_wxluacan() is called to register object and pointer bindings
! // ---------------------------------------------------------------------------
  
  WXLUAOBJECT* wxLuaGetObjectList_wxluacan(size_t &count)
***************
*** 89,95 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluacan() is called to register global functions
! // ----------------------------------------------------------------------------
  
  
--- 89,95 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluacan() is called to register global functions
! // ---------------------------------------------------------------------------
  
  
***************
*** 122,128 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluacan() is called to register global functions
! // ----------------------------------------------------------------------------
  
  WXLUAMETHOD* wxLuaGetFunctionList_wxluacan(size_t &count)
--- 122,128 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluacan() is called to register global functions
! // ---------------------------------------------------------------------------
  
  WXLUAMETHOD* wxLuaGetFunctionList_wxluacan(size_t &count)
***************
*** 140,146 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetClassList_wxluacan() is called to register classes
! // ----------------------------------------------------------------------------
  
  WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count)
--- 140,146 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetClassList_wxluacan() is called to register classes
! // ---------------------------------------------------------------------------
  
  WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count)
***************
*** 148,158 ****
      static WXLUACLASS classList[] =
      {
!         { "wxlCan", wxlCan_methods, wxlCan_methodCount, -1, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow"  }, 
!         { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, -1, NULL, &s_wxluatag_wxlCanObj, "wxObject"  }, 
!         { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj"  }, 
!         { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, -1, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj"  }, 
!         { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, -1, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj"  }, 
!         { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj"  }, 
!         { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, -1, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor"  }, 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
--- 148,158 ----
      static WXLUACLASS classList[] =
      {
!         { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL }, 
!         { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL }, 
!         { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL }, 
!         { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL }, 
!         { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL }, 
!         { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL }, 
!         { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL }, 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
***************
*** 163,169 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetClassList_wxluacan() is called to register classes
! // ----------------------------------------------------------------------------
  
  // binding class
--- 163,169 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetClassList_wxluacan() is called to register classes
! // ---------------------------------------------------------------------------
  
  // binding class

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxluacan.h	17 Dec 2006 07:47:14 -0000	1.19
--- wxluacan.h	26 Feb 2007 01:57:00 -0000	1.20
***************
*** 1,8 ****
! // ----------------------------------------------------------------------------
  // wxluacan.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ----------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wxluacan_H__
--- 1,8 ----
! // ---------------------------------------------------------------------------
  // wxluacan.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ---------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wxluacan_H__
***************
*** 14,20 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 4
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 4
  
  // binding class
--- 14,25 ----
  #include "wxlua/include/wxlbind.h"
  
! // ---------------------------------------------------------------------------
! // Check if the version of binding generator used to create this is older than
! //   the current version of the bindings.
! //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 5
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 5
! // ---------------------------------------------------------------------------
  
  // binding class
***************
*** 38,44 ****
  extern WXLUA_NO_DLLIMPEXP bool wxLuaBinding_wxluacan_init();
  
! // ----------------------------------------------------------------------------
  // Includes
! // ----------------------------------------------------------------------------
  
  #include "cancom.h"
--- 43,49 ----
  extern WXLUA_NO_DLLIMPEXP bool wxLuaBinding_wxluacan_init();
  
! // ---------------------------------------------------------------------------
  // Includes
! // ---------------------------------------------------------------------------
  
  #include "cancom.h"
***************
*** 48,54 ****
  
  
! // ----------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ----------------------------------------------------------------------------
  
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan;
--- 53,59 ----
  
  
! // ---------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ---------------------------------------------------------------------------
  
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan;
***************
*** 62,68 ****
  
  
! // ----------------------------------------------------------------------------
  // Method Tables
! // ----------------------------------------------------------------------------
  
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[];
--- 67,73 ----
  
  
! // ---------------------------------------------------------------------------
  // Method Tables
! // ---------------------------------------------------------------------------
  
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[];
***************
*** 83,89 ****
  
  
! // ----------------------------------------------------------------------------
  // Encapsulation Declarations
! // ----------------------------------------------------------------------------
  
  
--- 88,94 ----
  
  
! // ---------------------------------------------------------------------------
  // Encapsulation Declarations
! // ---------------------------------------------------------------------------
  
  

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.52,1.53

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

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

Modified Files:
	wxbind.h 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wxbind.h	23 Feb 2007 04:35:31 -0000	1.52
--- wxbind.h	26 Feb 2007 01:57:01 -0000	1.53
***************
*** 1,8 ****
! // ----------------------------------------------------------------------------
  // wx.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ----------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wx_H__
--- 1,8 ----
! // ---------------------------------------------------------------------------
  // wx.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ---------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wx_H__
***************
*** 39,45 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 4
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 4
  
  // binding class
--- 39,50 ----
  #include "wxlua/include/wxlbind.h"
  
! // ---------------------------------------------------------------------------
! // Check if the version of binding generator used to create this is older than
! //   the current version of the bindings.
! //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 5
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 5
! // ---------------------------------------------------------------------------
  
  // binding class
***************
*** 63,69 ****
  extern WXDLLIMPEXP_WXBIND bool wxLuaBinding_wx_init();
  
! // ----------------------------------------------------------------------------
  // Includes
! // ----------------------------------------------------------------------------
  
  #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
--- 68,74 ----
  extern WXDLLIMPEXP_WXBIND bool wxLuaBinding_wx_init();
  
! // ---------------------------------------------------------------------------
  // Includes
! // ---------------------------------------------------------------------------
  
  #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
***************
*** 635,641 ****
  
  
! // ----------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ----------------------------------------------------------------------------
  
  #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
--- 640,646 ----
  
  
! // ---------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ---------------------------------------------------------------------------
  
  #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
***************
*** 1471,1477 ****
  
  
! // ----------------------------------------------------------------------------
  // Method Tables
! // ----------------------------------------------------------------------------
  
  #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
--- 1476,1482 ----
  
  
! // ---------------------------------------------------------------------------
  // Method Tables
! // ---------------------------------------------------------------------------
  
  #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
***************
*** 2671,2677 ****
  
  
! // ----------------------------------------------------------------------------
  // Encapsulation Declarations
! // ----------------------------------------------------------------------------
  
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString, wxString)
--- 2676,2682 ----
  
  
! // ---------------------------------------------------------------------------
  // Encapsulation Declarations
! // ---------------------------------------------------------------------------
  
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString, wxString)

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.101,1.102

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** genwxbind.lua	23 Feb 2007 04:35:29 -0000	1.101
--- genwxbind.lua	26 Feb 2007 01:57:00 -0000	1.102
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 4 -- Used to verify that the bindings are updated
                            -- This must match modules/wxlua/include/wxldefs.h
  
--- 18,22 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 5 -- Used to verify that the bindings are updated
                            -- This must match modules/wxlua/include/wxldefs.h
  
***************
*** 2942,2946 ****
                  local objectBinding =
                  {
!                     Map = "        { &"..member.Name..", 0, \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n",
                      Condition = fullcondition
                  }
--- 2942,2946 ----
                  local objectBinding =
                  {
!                     Map = "        { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", 0 },\n",
                      Condition = fullcondition
                  }
***************
*** 2974,2978 ****
                  local pointerBinding =
                  {
!                     Map = "        { 0, (const void **) &"..member.Name..", \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n",
                      Condition = fullcondition
                  }
--- 2974,2978 ----
                  local pointerBinding =
                  {
!                     Map = "        { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0, (const void **) &"..member.Name.." },\n",
                      Condition = fullcondition
                  }
***************
*** 3698,3702 ****
              local classBinding =
              {
!                 Map = "    { \""..MakeVar(parseObject.Name).."\", "..MakeVar(parseObject.Name).."_methods, "..MakeVar(parseObject.Name).."_methodCount, -1, "..classinfo..", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..MakeVar(baseclass).."  }, \n",
                  Condition = classcondition
              }
--- 3698,3702 ----
              local classBinding =
              {
!                 Map = "    { \""..MakeVar(parseObject.Name).."\", "..MakeVar(parseObject.Name).."_methods, "..MakeVar(parseObject.Name).."_methodCount, "..classinfo..", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..MakeVar(baseclass)..", NULL }, \n",
                  Condition = classcondition
              }
***************
*** 3788,3797 ****
      local fileData = {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and tags for wxLua binding\n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n")
--- 3788,3797 ----
      local fileData = {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and tags for wxLua binding\n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n")
***************
*** 3803,3809 ****
      table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n\n")
  
      table.insert(fileData, "#if WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
      table.insert(fileData, "#   error \"The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings.\"\n")
!     table.insert(fileData, "#endif //WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n\n")
  
      if hook_bind_condition then
--- 3803,3814 ----
      table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n\n")
  
+     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
+     table.insert(fileData, "// Check if the version of binding generator used to create this is older than\n")
+     table.insert(fileData, "//   the current version of the bindings.\n")
+     table.insert(fileData, "//   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'\n")
      table.insert(fileData, "#if WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
      table.insert(fileData, "#   error \"The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings.\"\n")
!     table.insert(fileData, "#endif //WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      if hook_bind_condition then
***************
*** 3841,3847 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Includes\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do
--- 3846,3852 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Includes\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do
***************
*** 3870,3876 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
--- 3875,3881 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
***************
*** 3899,3905 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Method Tables\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
--- 3904,3910 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Method Tables\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
***************
*** 3929,3935 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Encapsulation Declarations\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
--- 3934,3940 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Encapsulation Declarations\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
***************
*** 3965,3973 ****
  
  function GenerateHookCppFileHeader(fileData)
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated.\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifdef __BORLANDC__\n")
--- 3970,3978 ----
  
  function GenerateHookCppFileHeader(fileData)
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated.\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifdef __BORLANDC__\n")
***************
*** 4003,4009 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
--- 4008,4014 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
***************
*** 4032,4038 ****
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      if hook_bind_condition then
--- 4037,4043 ----
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      if hook_bind_condition then
***************
*** 4148,4154 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_define_funcname.."() is called to register defines and enums\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
--- 4153,4159 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_define_funcname.."() is called to register defines and enums\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
***************
*** 4158,4164 ****
      table.insert(fileData, "    static WXLUADEFINE defineList[] =\n    {\n")
  
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, defineBindingList in pairs_sort(defineBindingTable) do
--- 4163,4169 ----
      table.insert(fileData, "    static WXLUADEFINE defineList[] =\n    {\n")
  
!     table.insert(fileData, "        // -------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define\n")
!     table.insert(fileData, "        // -------------------------------------------------------------------\n\n")
  
      for condition, defineBindingList in pairs_sort(defineBindingTable) do
***************
*** 4178,4184 ****
      end
  
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %enum\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, enumBindingList in pairs_sort(enumBindingTable) do
--- 4183,4189 ----
      end
  
!     table.insert(fileData, "        // -------------------------------------------------------------------\n")
      table.insert(fileData, "        // %enum\n")
!     table.insert(fileData, "        // -------------------------------------------------------------------\n\n")
  
      for condition, enumBindingList in pairs_sort(enumBindingTable) do
***************
*** 4207,4220 ****
      -- GetStringList
      -- ------------------------------------------------------------------------
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
      table.insert(fileData, "// "..hook_cpp_string_funcname.."() is called to register strings\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUASTRING* "..hook_cpp_string_funcname.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUASTRING stringList[] =\n    {\n")
  
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define %string\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, stringBindingList in pairs_sort(stringBindingTable) do
--- 4212,4225 ----
      -- GetStringList
      -- ------------------------------------------------------------------------
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
      table.insert(fileData, "// "..hook_cpp_string_funcname.."() is called to register strings\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUASTRING* "..hook_cpp_string_funcname.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUASTRING stringList[] =\n    {\n")
  
!     table.insert(fileData, "        // -------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define %string\n")
!     table.insert(fileData, "        // -------------------------------------------------------------------\n\n")
  
      for condition, stringBindingList in pairs_sort(stringBindingTable) do
***************
*** 4249,4255 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_object_funcname.."() is called to register object and pointer bindings\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
--- 4254,4260 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_object_funcname.."() is called to register object and pointer bindings\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
***************
*** 4306,4312 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_event_funcname.."() is called to register events\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
--- 4311,4317 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_event_funcname.."() is called to register events\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
***************
*** 4347,4353 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
--- 4352,4358 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
***************
*** 4381,4387 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUAMETHOD* "..hook_cpp_function_funcname.."(size_t &count)\n{\n")
--- 4386,4392 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUAMETHOD* "..hook_cpp_function_funcname.."(size_t &count)\n{\n")
***************
*** 4439,4446 ****
  
              -- Output Parsed Object
!             table.insert(fileData, "// -------------------------------------------------------------------------------------------------\n")
              table.insert(fileData, "// Bind "..object.DefType.." "..object.Name.."\n")
!             table.insert(fileData, "// -------------------------------------------------------------------------------------------------\n")
!             table.insert(fileData, "\n")
  
              -- Class Tag Declaration
--- 4444,4450 ----
  
              -- Output Parsed Object
!             table.insert(fileData, "// ---------------------------------------------------------------------------\n")
              table.insert(fileData, "// Bind "..object.DefType.." "..object.Name.."\n")
!             table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
              -- Class Tag Declaration

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.11, 1.12

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32575/wxLua/modules/wxluasocket/include

Modified Files:
	wxluasocket_bind.h 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxluasocket_bind.h	17 Dec 2006 07:47:17 -0000	1.11
--- wxluasocket_bind.h	26 Feb 2007 01:57:07 -0000	1.12
***************
*** 1,8 ****
! // ----------------------------------------------------------------------------
  // wxluasocket.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ----------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wxluasocket_H__
--- 1,8 ----
! // ---------------------------------------------------------------------------
  // wxluasocket.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ---------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wxluasocket_H__
***************
*** 23,29 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 4
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 4
  
  // binding class
--- 23,34 ----
  #include "wxlua/include/wxlbind.h"
  
! // ---------------------------------------------------------------------------
! // Check if the version of binding generator used to create this is older than
! //   the current version of the bindings.
! //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 5
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 5
! // ---------------------------------------------------------------------------
  
  // binding class
***************
*** 47,53 ****
  extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init();
  
! // ----------------------------------------------------------------------------
  // Includes
! // ----------------------------------------------------------------------------
  
  #include "wx/defs.h"
--- 52,58 ----
  extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init();
  
! // ---------------------------------------------------------------------------
  // Includes
! // ---------------------------------------------------------------------------
  
  #include "wx/defs.h"
***************
*** 58,64 ****
  
  
! // ----------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ----------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent;
--- 63,69 ----
  
  
! // ---------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ---------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent;
***************
*** 67,73 ****
  
  
! // ----------------------------------------------------------------------------
  // Method Tables
! // ----------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[];
--- 72,78 ----
  
  
! // ---------------------------------------------------------------------------
  // Method Tables
! // ---------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[];
***************
*** 78,84 ****
  
  
! // ----------------------------------------------------------------------------
  // Encapsulation Declarations
! // ----------------------------------------------------------------------------
  
  
--- 83,89 ----
  
  
! // ---------------------------------------------------------------------------
  // Encapsulation Declarations
! // ---------------------------------------------------------------------------
  
  

[Wxlua-commit] wxLua/modules/wxbindstc/include wxbind.h,1.17,1.18

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

Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32575/wxLua/modules/wxbindstc/include

Modified Files:
	wxbind.h 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxbind.h	17 Dec 2006 07:47:16 -0000	1.17
--- wxbind.h	26 Feb 2007 01:57:05 -0000	1.18
***************
*** 1,8 ****
! // ----------------------------------------------------------------------------
  // wxstc.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ----------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wxstc_H__
--- 1,8 ----
! // ---------------------------------------------------------------------------
  // wxstc.h - headers and tags for wxLua binding
  //
  // This file was generated by genwxbind.lua 
  // Any changes made to this file may be lost when file is regenerated
! // ---------------------------------------------------------------------------
  
  #ifndef __HOOK_WXLUA_wxstc_H__
***************
*** 22,28 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 4
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 4
  
  // binding class
--- 22,33 ----
  #include "wxlua/include/wxlbind.h"
  
! // ---------------------------------------------------------------------------
! // Check if the version of binding generator used to create this is older than
! //   the current version of the bindings.
! //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 5
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 5
! // ---------------------------------------------------------------------------
  
  // binding class
***************
*** 46,59 ****
  extern WXDLLIMPEXP_WXBINDSTC bool wxLuaBinding_wxstc_init();
  
! // ----------------------------------------------------------------------------
  // Includes
! // ----------------------------------------------------------------------------
  
  #include "wx/stc/stc.h"
  
  
! // ----------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ----------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl;
--- 51,64 ----
  extern WXDLLIMPEXP_WXBINDSTC bool wxLuaBinding_wxstc_init();
  
! // ---------------------------------------------------------------------------
  // Includes
! // ---------------------------------------------------------------------------
  
  #include "wx/stc/stc.h"
  
  
! // ---------------------------------------------------------------------------
  // Lua Tag Method Values for each Class
! // ---------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl;
***************
*** 62,68 ****
  
  
! // ----------------------------------------------------------------------------
  // Method Tables
! // ----------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[];
--- 67,73 ----
  
  
! // ---------------------------------------------------------------------------
  // Method Tables
! // ---------------------------------------------------------------------------
  
  extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[];
***************
*** 73,79 ****
  
  
! // ----------------------------------------------------------------------------
  // Encapsulation Declarations
! // ----------------------------------------------------------------------------
  
  
--- 78,84 ----
  
  
! // ---------------------------------------------------------------------------
  // Encapsulation Declarations
! // ---------------------------------------------------------------------------
  
  

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.34, 1.35 clipdrag.cpp, 1.30, 1.31 config.cpp, 1.27, 1.28 controls.cpp, 1.42, 1.43 data.cpp, 1.33, 1.34 datetime.cpp, 1.28, 1.29 defsutil.cpp, 1.24, 1.25 dialogs.cpp, 1.28, 1.29 event.cpp, 1.34, 1.35 file.cpp, 1.31, 1.32 gdi.cpp, 1.48, 1.49 geometry.cpp, 1.21, 1.22 grid.cpp, 1.26, 1.27 help.cpp, 1.23, 1.24 html.cpp, 1.28, 1.29 image.cpp, 1.26, 1.27 mdi.cpp, 1.25, 1.26 menutool.cpp, 1.27, 1.28 print.cpp, 1.27, 1.28 regex.cpp, 1.21, 1.22 sizer.cpp, 1.23, 1.24 socket.cpp, 1.27, 1.28 thread.cpp, 1.18, 1.19 wave.cpp, 1.26, 1.27 windows.cpp, 1.39, 1.40 wx_bind.cpp, 1.78, 1.79 wxlua.cpp, 1.28, 1.29 xml.cpp, 1.22, 1.23

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

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

Modified Files:
	appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp 
	datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp 
	gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp 
	mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp 
	thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: xml.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** xml.cpp	23 Feb 2007 04:35:33 -0000	1.22
--- xml.cpp	26 Feb 2007 01:57:05 -0000	1.23
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlNode
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlNode'
--- 28,34 ----
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // ---------------------------------------------------------------------------
  // Bind class wxXmlNode
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlNode'
***************
*** 551,557 ****
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlProperty
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlProperty'
--- 551,557 ----
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // ---------------------------------------------------------------------------
  // Bind class wxXmlProperty
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlProperty'
***************
*** 737,743 ****
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlDocument
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlDocument'
--- 737,743 ----
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // ---------------------------------------------------------------------------
  // Bind class wxXmlDocument
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlDocument'
***************
*** 981,987 ****
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlResourceHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlResourceHandler'
--- 981,987 ----
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // ---------------------------------------------------------------------------
  // Bind class wxXmlResourceHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlResourceHandler'
***************
*** 1005,1011 ****
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlResource
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlResource'
--- 1005,1011 ----
  
  #if wxLUA_USE_wxXMLResource && wxUSE_XML
! // ---------------------------------------------------------------------------
  // Bind class wxXmlResource
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXmlResource'

Index: defsutil.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** defsutil.cpp	22 Feb 2007 00:01:34 -0000	1.24
--- defsutil.cpp	26 Feb 2007 01:57:02 -0000	1.25
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_wxProcess
! // -------------------------------------------------------------------------------------------------
  // Bind class wxProcess
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxProcess'
--- 28,34 ----
  
  #if wxLUA_USE_wxProcess
! // ---------------------------------------------------------------------------
  // Bind class wxProcess
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxProcess'
***************
*** 344,350 ****
  
  #if wxCHECK_VERSION(2,7,0)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxMouseState
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMouseState'
--- 344,350 ----
  
  #if wxCHECK_VERSION(2,7,0)
! // ---------------------------------------------------------------------------
  // Bind class wxMouseState
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMouseState'
***************
*** 709,715 ****
  
  #if wxLUA_USE_wxBusyCursor
! // -------------------------------------------------------------------------------------------------
  // Bind class wxBusyCursor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxBusyCursor'
--- 709,715 ----
  
  #if wxLUA_USE_wxBusyCursor
! // ---------------------------------------------------------------------------
  // Bind class wxBusyCursor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxBusyCursor'
***************
*** 786,792 ****
  
  #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO
! // -------------------------------------------------------------------------------------------------
  // Bind class wxBusyInfo
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxBusyInfo'
--- 786,792 ----
  
  #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO
! // ---------------------------------------------------------------------------
  // Bind class wxBusyInfo
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxBusyInfo'

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxlua.cpp	23 Feb 2007 04:35:33 -0000	1.28
--- wxlua.cpp	26 Feb 2007 01:57:05 -0000	1.29
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 26,32 ****
  
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaState
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaState'
--- 26,32 ----
  
  
! // ---------------------------------------------------------------------------
  // Bind class wxLuaState
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaState'
***************
*** 68,74 ****
  int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaObject
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaObject'
--- 68,74 ----
  int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxLuaObject
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaObject'
***************
*** 217,223 ****
  
  #if wxLUA_USE_wxLuaPrintout
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaPrintout
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaPrintout'
--- 217,223 ----
  
  #if wxLUA_USE_wxLuaPrintout
! // ---------------------------------------------------------------------------
  // Bind class wxLuaPrintout
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaPrintout'
***************
*** 326,332 ****
  
  #if wxLUA_USE_wxLuaHtmlWindow
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaHtmlWindow
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaHtmlWindow'
--- 326,332 ----
  
  #if wxLUA_USE_wxLuaHtmlWindow
! // ---------------------------------------------------------------------------
  // Bind class wxLuaHtmlWindow
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaHtmlWindow'
***************
*** 391,397 ****
  
  #if wxLUA_USE_wxLuaHtmlWindow
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaHtmlWinTagEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaHtmlWinTagEvent'
--- 391,397 ----
  
  #if wxLUA_USE_wxLuaHtmlWindow
! // ---------------------------------------------------------------------------
  // Bind class wxLuaHtmlWinTagEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaHtmlWinTagEvent'
***************
*** 514,520 ****
  
  #if wxLUA_USE_wxTreeCtrl
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaTreeItemData
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaTreeItemData'
--- 514,520 ----
  
  #if wxLUA_USE_wxTreeCtrl
! // ---------------------------------------------------------------------------
  // Bind class wxLuaTreeItemData
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaTreeItemData'

Index: image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** image.cpp	23 Feb 2007 04:35:32 -0000	1.26
--- image.cpp	26 Feb 2007 01:57:03 -0000	1.27
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxImage
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxImage'
--- 28,34 ----
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // ---------------------------------------------------------------------------
  // Bind class wxImage
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxImage'
***************
*** 1581,1587 ****
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxImageHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxImageHandler'
--- 1581,1587 ----
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // ---------------------------------------------------------------------------
  // Bind class wxImageHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxImageHandler'
***************
*** 1837,1843 ****
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxBMPHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxBMPHandler'
--- 1837,1843 ----
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // ---------------------------------------------------------------------------
  // Bind class wxBMPHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxBMPHandler'
***************
*** 1878,1884 ****
  
  #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxICOHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxICOHandler'
--- 1878,1884 ----
  
  #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxICOHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxICOHandler'
***************
*** 1919,1925 ****
  
  #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxCURHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxCURHandler'
--- 1919,1925 ----
  
  #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxCURHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxCURHandler'
***************
*** 1960,1966 ****
  
  #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxANIHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxANIHandler'
--- 1960,1966 ----
  
  #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxANIHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxANIHandler'
***************
*** 2001,2007 ****
  
  #if (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxIFFHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxIFFHandler'
--- 2001,2007 ----
  
  #if (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxIFFHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxIFFHandler'
***************
*** 2042,2048 ****
  
  #if (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGIFHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGIFHandler'
--- 2042,2048 ----
  
  #if (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxGIFHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGIFHandler'
***************
*** 2083,2089 ****
  
  #if (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxJPEGHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxJPEGHandler'
--- 2083,2089 ----
  
  #if (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxJPEGHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxJPEGHandler'
***************
*** 2124,2130 ****
  
  #if (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxPCXHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxPCXHandler'
--- 2124,2130 ----
  
  #if (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxPCXHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxPCXHandler'
***************
*** 2165,2171 ****
  
  #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxPNGHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxPNGHandler'
--- 2165,2171 ----
  
  #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxPNGHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxPNGHandler'
***************
*** 2206,2212 ****
  
  #if (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxPNMHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxPNMHandler'
--- 2206,2212 ----
  
  #if (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxPNMHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxPNMHandler'
***************
*** 2247,2253 ****
  
  #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // -------------------------------------------------------------------------------------------------
  // Bind class wxTIFFHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxTIFFHandler'
--- 2247,2253 ----
  
  #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! // ---------------------------------------------------------------------------
  // Bind class wxTIFFHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxTIFFHandler'
***************
*** 2288,2294 ****
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxXPMHandler
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXPMHandler'
--- 2288,2294 ----
  
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
! // ---------------------------------------------------------------------------
  // Bind class wxXPMHandler
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxXPMHandler'
***************
*** 2329,2335 ****
  
  #if wxLUA_USE_wxArtProvider
! // -------------------------------------------------------------------------------------------------
  // Bind class wxArtProvider
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxArtProvider'
--- 2329,2335 ----
  
  #if wxLUA_USE_wxArtProvider
! // ---------------------------------------------------------------------------
  // Bind class wxArtProvider
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxArtProvider'

Index: mdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mdi.cpp	23 Feb 2007 04:35:32 -0000	1.25
--- mdi.cpp	26 Feb 2007 01:57:03 -0000	1.26
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxMDIClientWindow
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMDIClientWindow'
--- 28,34 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxMDIClientWindow
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMDIClientWindow'
***************
*** 52,58 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxMDIParentFrame
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMDIParentFrame'
--- 52,58 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxMDIParentFrame
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMDIParentFrame'
***************
*** 374,380 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxMDIChildFrame
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMDIChildFrame'
--- 374,380 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxMDIChildFrame
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxMDIChildFrame'
***************
*** 537,543 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxDocChildFrame
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocChildFrame'
--- 537,543 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxDocChildFrame
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocChildFrame'
***************
*** 673,679 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxDocManager
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocManager'
--- 673,679 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxDocManager
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocManager'
***************
*** 1427,1433 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxDocParentFrame
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocParentFrame'
--- 1427,1433 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxDocParentFrame
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocParentFrame'
***************
*** 1495,1501 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxDocTemplate
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocTemplate'
--- 1495,1501 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxDocTemplate
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocTemplate'
***************
*** 1890,1896 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxDocument
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocument'
--- 1890,1896 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxDocument
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDocument'
***************
*** 2501,2507 ****
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxView
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxView'
--- 2501,2507 ----
  
  #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxView
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxView'
***************
*** 2811,2817 ****
  
  #if wxLUA_USE_wxCommandProcessor
! // -------------------------------------------------------------------------------------------------
  // Bind class wxCommandProcessor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxCommandProcessor'
--- 2811,2817 ----
  
  #if wxLUA_USE_wxCommandProcessor
! // ---------------------------------------------------------------------------
  // Bind class wxCommandProcessor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxCommandProcessor'
***************
*** 3222,3228 ****
  
  #if wxLUA_USE_wxCommandProcessor
! // -------------------------------------------------------------------------------------------------
  // Bind class wxCommand
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxCommand'
--- 3222,3228 ----
  
  #if wxLUA_USE_wxCommandProcessor
! // ---------------------------------------------------------------------------
  // Bind class wxCommand
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxCommand'
***************
*** 3310,3316 ****
  
  #if wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxFileHistory
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFileHistory'
--- 3310,3316 ----
  
  #if wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE
! // ---------------------------------------------------------------------------
  // Bind class wxFileHistory
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFileHistory'

Index: config.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** config.cpp	23 Feb 2007 04:35:31 -0000	1.27
--- config.cpp	26 Feb 2007 01:57:01 -0000	1.28
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
! // -------------------------------------------------------------------------------------------------
  // Bind class wxConfigBase
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxConfigBase'
--- 28,34 ----
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
! // ---------------------------------------------------------------------------
  // Bind class wxConfigBase
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxConfigBase'
***************
*** 791,797 ****
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
! // -------------------------------------------------------------------------------------------------
  // Bind class wxConfig
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxConfig'
--- 791,797 ----
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
! // ---------------------------------------------------------------------------
  // Bind class wxConfig
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxConfig'
***************
*** 842,848 ****
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
! // -------------------------------------------------------------------------------------------------
  // Bind class wxFileConfig
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFileConfig'
--- 842,848 ----
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
! // ---------------------------------------------------------------------------
  // Bind class wxFileConfig
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFileConfig'

Index: grid.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** grid.cpp	23 Feb 2007 04:35:32 -0000	1.26
--- grid.cpp	26 Feb 2007 01:57:02 -0000	1.27
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellWorker
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellWorker'
--- 28,34 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellWorker
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellWorker'
***************
*** 94,100 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellRenderer'
--- 94,100 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellRenderer'
***************
*** 156,162 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellStringRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellStringRenderer'
--- 156,162 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellStringRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellStringRenderer'
***************
*** 194,200 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellNumberRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellNumberRenderer'
--- 194,200 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellNumberRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellNumberRenderer'
***************
*** 232,238 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellFloatRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellFloatRenderer'
--- 232,238 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellFloatRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellFloatRenderer'
***************
*** 345,351 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellBoolRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellBoolRenderer'
--- 345,351 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellBoolRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellBoolRenderer'
***************
*** 383,389 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellDateTimeRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellDateTimeRenderer'
--- 383,389 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellDateTimeRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellDateTimeRenderer'
***************
*** 428,434 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellEnumRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellEnumRenderer'
--- 428,434 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellEnumRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellEnumRenderer'
***************
*** 471,477 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellAutoWrapStringRenderer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAutoWrapStringRenderer'
--- 471,477 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellAutoWrapStringRenderer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAutoWrapStringRenderer'
***************
*** 509,515 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellEditor'
--- 509,515 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellEditor'
***************
*** 828,834 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellTextEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellTextEditor'
--- 828,834 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellTextEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellTextEditor'
***************
*** 866,872 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellNumberEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellNumberEditor'
--- 866,872 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellNumberEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellNumberEditor'
***************
*** 911,917 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellFloatEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellFloatEditor'
--- 911,917 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellFloatEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellFloatEditor'
***************
*** 956,962 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellBoolEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellBoolEditor'
--- 956,962 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellBoolEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellBoolEditor'
***************
*** 994,1000 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellChoiceEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellChoiceEditor'
--- 994,1000 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellChoiceEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellChoiceEditor'
***************
*** 1039,1045 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellEnumEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellEnumEditor'
--- 1039,1045 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellEnumEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellEnumEditor'
***************
*** 1082,1088 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellAutoWrapStringEditor
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAutoWrapStringEditor'
--- 1082,1088 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellAutoWrapStringEditor
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAutoWrapStringEditor'
***************
*** 1120,1126 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellAttr
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAttr'
--- 1120,1126 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellAttr
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAttr'
***************
*** 1776,1782 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellAttrProvider
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAttrProvider'
--- 1776,1782 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellAttrProvider
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellAttrProvider'
***************
*** 1929,1935 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridTableBase
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridTableBase'
--- 1929,1935 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridTableBase
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridTableBase'
***************
*** 2621,2627 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridStringTable
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridStringTable'
--- 2621,2627 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridStringTable
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridStringTable'
***************
*** 2669,2675 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridTableMessage
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridTableMessage'
--- 2669,2675 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridTableMessage
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridTableMessage'
***************
*** 2854,2860 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellCoords
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellCoords'
--- 2854,2860 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridCellCoords
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridCellCoords'
***************
*** 3024,3030 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGrid
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGrid'
--- 3024,3030 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGrid
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGrid'
***************
*** 6519,6525 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridEvent'
--- 6519,6525 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridEvent'
***************
*** 6757,6763 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridSizeEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridSizeEvent'
--- 6757,6763 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridSizeEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridSizeEvent'
***************
*** 6938,6944 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridRangeSelectEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridRangeSelectEvent'
--- 6938,6944 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridRangeSelectEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridRangeSelectEvent'
***************
*** 7216,7222 ****
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // -------------------------------------------------------------------------------------------------
  // Bind class wxGridEditorCreatedEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridEditorCreatedEvent'
--- 7216,7222 ----
  
  #if wxLUA_USE_wxGrid && wxUSE_GRID
! // ---------------------------------------------------------------------------
  // Bind class wxGridEditorCreatedEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxGridEditorCreatedEvent'

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** file.cpp	23 Feb 2007 04:35:31 -0000	1.31
--- file.cpp	26 Feb 2007 01:57:02 -0000	1.32
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 28,34 ****
  
  #if wxLUA_USE_wxFileName
! // -------------------------------------------------------------------------------------------------
  // Bind class wxFileName
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFileName'
--- 28,34 ----
  
  #if wxLUA_USE_wxFileName
! // ---------------------------------------------------------------------------
  // Bind class wxFileName
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFileName'
***************
*** 1598,1604 ****
  
  #if wxLUA_USE_wxFile && wxUSE_FILE
! // -------------------------------------------------------------------------------------------------
  // Bind class wxFile
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFile'
--- 1598,1604 ----
  
  #if wxLUA_USE_wxFile && wxUSE_FILE
! // ---------------------------------------------------------------------------
  // Bind class wxFile
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxFile'
***************
*** 2035,2041 ****
  
  #if wxLUA_USE_wxDir
! // -------------------------------------------------------------------------------------------------
  // Bind class wxDir
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDir'
--- 2035,2041 ----
  
  #if wxLUA_USE_wxDir
! // ---------------------------------------------------------------------------
  // Bind class wxDir
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxDir'
***************
*** 2292,2298 ****
  
  #if wxUSE_STREAMS
! // -------------------------------------------------------------------------------------------------
  // Bind class wxStreamBase
! // ---------------------------------------------------------...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.34, 1.35 wxldefs.h, 1.13, 1.14 wxlstate.h, 1.60, 1.61

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32575/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h wxldefs.h wxlstate.h 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxldefs.h	26 Dec 2006 10:37:02 -0000	1.13
--- wxldefs.h	26 Feb 2007 01:57:06 -0000	1.14
***************
*** 49,53 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 4
  
  // ----------------------------------------------------------------------------
--- 49,53 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 5
  
  // ----------------------------------------------------------------------------

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxlbind.h	23 Dec 2006 06:16:20 -0000	1.34
--- wxlbind.h	26 Feb 2007 01:57:06 -0000	1.35
***************
*** 19,23 ****
  
  #ifdef GetObject
!     #undef GetObject
  #endif
  
--- 19,23 ----
  
  #ifdef GetObject
!     #undef GetObject // MSVC defines this
  #endif
  
***************
*** 40,44 ****
  // ----------------------------------------------------------------------------
  
! enum LuaType              // The type of a Lua method
  {
      LuaDelete      = 1,   // gc routine
--- 40,44 ----
  // ----------------------------------------------------------------------------
  
! enum wxLuaMethod_Type     // The type of a Lua method
  {
      LuaDelete      = 1,   // gc routine
***************
*** 47,52 ****
      LuaMethod      = 8,   // class method
      LuaGlobal      = 16,  // global method (not really related to the class)
!     LuaGetProp     = 32,
!     LuaSetProp     = 64
  };
  
--- 47,52 ----
      LuaMethod      = 8,   // class method
      LuaGlobal      = 16,  // global method (not really related to the class)
!     LuaGetProp     = 32,  // Get %property funcName, read
!     LuaSetProp     = 64   // Set %property funcName, write
  };
  
***************
*** 56,65 ****
  struct WXDLLIMPEXP_WXLUA WXLUAMETHOD  // defines a LUA method or property
  {
!     LuaType       type;        // type (one of the above enumeration values)
!     const char   *name;        // name of the method or property
!     lua_CFunction func;        // function that implements the method or property
!     int           maxargs;     // max number of function arguments (was 'params')
!     int           minargs;     // min number of function arguments (was 'required')
!     wxLuaArgTag*  argtags;     // array of lua tags representing each argument, zero terminated
  };
  
--- 56,65 ----
  struct WXDLLIMPEXP_WXLUA WXLUAMETHOD  // defines a LUA method or property
  {
!     wxLuaMethod_Type type;    // type (one of the above enumeration values)
!     const char*      name;    // name of the method or property
!     lua_CFunction    func;    // function that implements the method or property
!     int              maxargs; // max number of function arguments
!     int              minargs; // min number of function arguments
!     wxLuaArgTag*     argtags; // array of lua tags representing each argument, zero terminated
  };
  
***************
*** 80,88 ****
      WXLUAMETHOD *methods;       // pointer to methods for this class
      int          num_methods;   // number of methods
-     int          baseclass_tag; // index in the class list to the base class
      wxClassInfo *pClassInfo;    // pointer to the wxClassInfo associated with this class
!     int         *class_tag;     // tag for user data allocated by ourselves
!                                 // and therefore needs gc.
!     const char  *baseclass;     // name of base class
  };
  
--- 80,91 ----
      WXLUAMETHOD *methods;       // pointer to methods for this class
      int          num_methods;   // number of methods
      wxClassInfo *pClassInfo;    // pointer to the wxClassInfo associated with this class
!     int         *class_tag;     // lua tag for user data allocated by ourselves
!     const char  *baseclassName; // name of base class
!     WXLUACLASS  *baseclass;     // Pointer to the base class or NULL for none.
!                                 // This member is set after all the bindings are
!                                 // registered since the base class may be from
!                                 // a different module (a library perhaps).
!                                 // See wxLuaBinding::SetBaseClass
  };
  
***************
*** 101,115 ****
  struct WXDLLIMPEXP_WXLUA WXLUAEVENT // defines a wxWidgets Event for wxLua
  {
!     const int  *eventType;      // new wxWidgets event type
!     const char *eventName;      // name of the event
!     int        *eventClassTag;  // lua class tag
  };
  
  struct WXDLLIMPEXP_WXLUA WXLUAOBJECT // Defines a wxWidgets object or pointer for wxLua
  {
!     const void  *objPtr;        // a pointer to the object or pointer
!     const void **pObjPtr;       // a pointer to the object or pointer
!     const char  *objName;       // the name of the object or pointer
!     int         *objClassTag;   // the class tag of the object or pointer.
  };
  
--- 104,118 ----
  struct WXDLLIMPEXP_WXLUA WXLUAEVENT // defines a wxWidgets Event for wxLua
  {
!     const int  *eventType;  // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED
!     const char *name;       // name of the event, e.g. "wxEVT_COMMAND_MENU_SELECTED"
!     int        *class_tag;  // lua class tag, e.g. &s_wxluatag_wxCommandEvent
  };
  
  struct WXDLLIMPEXP_WXLUA WXLUAOBJECT // Defines a wxWidgets object or pointer for wxLua
  {
!     const char  *name;      // the name of the object or pointer
!     int         *class_tag; // lua class tag of the object or pointer.
!     const void  *objPtr;    // pointer to the object, e.g. &wxDefaultPosition
!     const void **pObjPtr;   // pointer to the object pointer, e.g. (const void **)&wxThePenList
  };
  
***************
*** 126,130 ****
      ~wxLuaFunction() {}
  
!     int CallMethod(lua_State *L);
      void *GetObject() const { return m_pObject; }
  
--- 129,133 ----
      ~wxLuaFunction() {}
  
!     int CallMethod(lua_State *L); // call WXLUAMETHOD->func(L)
      void *GetObject() const { return m_pObject; }
  
***************
*** 231,235 ****
  wxObject_##objName::~wxObject_##objName() \
  { \
!     if (m_p##objName != NULL) delete m_p##objName; \
  } \
  void LUACALL wxLua_AddTrackedObject(wxLuaState& wxlState, className *p##objName) \
--- 234,238 ----
  wxObject_##objName::~wxObject_##objName() \
  { \
!     delete m_p##objName; \
  } \
  void LUACALL wxLua_AddTrackedObject(wxLuaState& wxlState, className *p##objName) \
***************
*** 251,255 ****
  public:
      wxLuaSmartStringArray(wxString *strArr = NULL) : m_strArr(strArr) { }
!     ~wxLuaSmartStringArray() { if (m_strArr != NULL) delete[] m_strArr; }
  
      void operator = (wxString *strArr) { m_strArr = strArr; }
--- 254,258 ----
  public:
      wxLuaSmartStringArray(wxString *strArr = NULL) : m_strArr(strArr) { }
!     ~wxLuaSmartStringArray() { delete[] m_strArr; }
  
      void operator = (wxString *strArr) { m_strArr = strArr; }
***************
*** 268,272 ****
  public:
      wxLuaSmartIntArray(int* intArr = NULL) : m_intArr(intArr) { }
!     ~wxLuaSmartIntArray() { if (m_intArr != NULL) delete[] m_intArr; }
  
      void operator = (int *intArr) { m_intArr = intArr; }
--- 271,275 ----
  public:
      wxLuaSmartIntArray(int* intArr = NULL) : m_intArr(intArr) { }
!     ~wxLuaSmartIntArray() { delete[] m_intArr; }
  
      void operator = (int *intArr) { m_intArr = intArr; }
***************
*** 296,300 ****
      // Binds C Functions/Defines/Object/Events to namespace Lua Table
      virtual void RegisterBinding(const wxLuaState& wxlState, bool registerTypes);
!     // Unbinds C Functions/Defines/Object/Events by clearing nsmespace Lua table
      virtual void UnRegisterBinding(lua_State* L);
  
--- 299,303 ----
      // Binds C Functions/Defines/Object/Events to namespace Lua Table
      virtual void RegisterBinding(const wxLuaState& wxlState, bool registerTypes);
!     // Unbinds C Functions/Defines/Object/Events by clearing namespace Lua table
      virtual void UnRegisterBinding(lua_State* L);
  
***************
*** 305,309 ****
      void SetBindingName(const wxString& name) { m_bindingName = name; }
  
!     // Get/Set the namespace in lua that this binding will be installed to
      wxString GetLuaNamespace() const { return m_nameSpace; }
      void SetLuaNamespace(const wxString& nameSpace) { m_nameSpace = nameSpace; }
--- 308,312 ----
      void SetBindingName(const wxString& name) { m_bindingName = name; }
  
!     // Get/Set the namespace table in lua that this binding will be installed to
      wxString GetLuaNamespace() const { return m_nameSpace; }
      void SetLuaNamespace(const wxString& nameSpace) { m_nameSpace = nameSpace; }
***************
*** 329,335 ****
      bool IsTag(int tag) { return (tag >= m_startTag) && (tag <= m_lastTag); }
  
!     // Look for the base class of the input WXLUACLASS in this binding and if
!     //   found, set the tag of the baseclass_tag member of the input.
!     bool SetBaseClassTag(WXLUACLASS *pClass);
  
      // Look up the event type name as a string, from the wxEventType number
--- 332,339 ----
      bool IsTag(int tag) { return (tag >= m_startTag) && (tag <= m_lastTag); }
  
!     // Look for the base class of the input WXLUACLASS in this binding using the
!     //   baseclassName of the input and if found, set the WXLUACLASS::baseclass
!     //   member of the input.
!     bool SetBaseClass(WXLUACLASS *pClass);
  
      // Look up the event type name as a string, from the wxEventType number

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** wxlstate.h	22 Feb 2007 00:01:36 -0000	1.60
--- wxlstate.h	26 Feb 2007 01:57:06 -0000	1.61
***************
*** 342,346 ****
      //  all non parented (top level) windows are destroyed.
      //  You must always call CloseLuaState() when you want to close lua instead
!     //  of hoping that if when you call Destroy() you have the last refed instance.
      void Destroy();
      // Close the lua_State and if 'force' close all attached wxWindows
--- 342,346 ----
      //  all non parented (top level) windows are destroyed.
      //  You must always call CloseLuaState() when you want to close lua instead
!     //  of hoping that when you call Destroy() you have the last refed instance.
      void Destroy();
      // Close the lua_State and if 'force' close all attached wxWindows
***************
*** 403,408 ****
      // Try to compile the lua program. Creates new lua_State to test for syntax
      //   errors and sends error events. See LuaError() for errMsg and line_num.
!     int CompileString(const wxString &script, const wxString& name = wxEmptyString, wxString* errMsg_ = NULL, int* line_num = NULL);
!     int CompileBuffer(const unsigned char buf[], size_t size, const wxString &name = wxEmptyString, wxString* errMsg_ = NULL, int* line_num = NULL);
  
      // checks the status with CheckRunError and tries to get lua's error string
--- 403,410 ----
      // Try to compile the lua program. Creates new lua_State to test for syntax
      //   errors and sends error events. See LuaError() for errMsg and line_num.
!     int CompileString(const wxString &script, const wxString& name = wxEmptyString,
!                       wxString* errMsg_ = NULL, int* line_num = NULL);
!     int CompileBuffer(const unsigned char buf[], size_t size, const wxString &name = wxEmptyString,
!                       wxString* errMsg_ = NULL, int* line_num = NULL);
  
      // checks the status with CheckRunError and tries to get lua's error string
***************
*** 480,486 ****
      //   returns NULL on failure.
      bool IsDerivedClass(int iClassTag, int iBaseClassTag) const;
!     // Get WXLUAEVENT for given wxEvent by comparing the wxEvent::GetEventType()
!     //   to WXLUAEVENT::eventType.
!     const WXLUAEVENT* GetLuaEvent(wxEvent *pEvent) const;
  
      // Get the binding list used to initialize this class
--- 482,488 ----
      //   returns NULL on failure.
      bool IsDerivedClass(int iClassTag, int iBaseClassTag) const;
!     // Get WXLUAEVENT for given wxEventType (wxEvent::GetEventType()) by finding
!     //   the matching WXLUAEVENT::eventType.
!     const WXLUAEVENT* GetLuaEvent(wxEventType eventType) const;
  
      // Get the binding list used to initialize this class
***************
*** 659,670 ****
      // else return NULL;
      // Set isProperty to true if a property is found else it is a method.
!     WXLUAMETHOD* GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty);
!     // Lookup a lua property called cpIndex in the WXLUACLASS array pClass
      // Ensure that the lookup is of the required type. If the lua property
      // can not be found on the current class recurse through base classes
      // Return a pointer to the WXLUAMETHOD that corresponds to the property name,
      // else return NULL;
!     // Find 'Set' properties if isSet is true else 'Get' properties
!     WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isSet);
  
      // Is there a derived method given an object and and a method name.
--- 661,672 ----
      // else return NULL;
      // Set isProperty to true if a property is found else it is a method.
!     WXLUAMETHOD* GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex);
!     // Lookup a lua property function named cpIndex in the WXLUACLASS pClass
      // Ensure that the lookup is of the required type. If the lua property
      // can not be found on the current class recurse through base classes
      // Return a pointer to the WXLUAMETHOD that corresponds to the property name,
      // else return NULL;
!     // Find 'Set' properties if isLuaSetProp else return 'LuaGetProp' property
!     WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isLuaSetProp);
  
      // Is there a derived method given an object and and a method name.
***************
*** 944,948 ****
  
      lua_State *GetLuaState() const { return m_wxlState.GetLuaState(); }
!     // non null only for EVT_LUA_DEBUG_HOOK
      lua_Debug *GetLuaDebug() const { return m_lua_Debug; }
  
--- 946,950 ----
  
      lua_State *GetLuaState() const { return m_wxlState.GetLuaState(); }
!     // non null only for wxEVT_LUA_DEBUG_HOOK
      lua_Debug *GetLuaDebug() const { return m_lua_Debug; }
  
***************
*** 959,968 ****
  
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CREATION,   0) // a wxLuaState is being created
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_PRINT,      0) // print statements and such, check GetString()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_ERROR,      0) // error occurred, check GetString()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUG_HOOK, 0) // see LuaDebugHook function
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_INIT,       0) // after app starts, first idle
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUGGERATTACHED,   0)     // after app starts, first idle
  END_DECLARE_EVENT_TYPES()
  
--- 961,976 ----
  
  BEGIN_DECLARE_EVENT_TYPES()
!     // A wxLuaState is being created, sent at the end of
!     //   wxLuaState(wxEvtHandler, win id) or Create(wxEvtHandler, win id)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CREATION,   0)
!     // lua's print(...) statements and such, check GetString()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_PRINT,      0)
!     // an error in lua has occurred, check GetString() for message
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_ERROR,      0)
!     // see LuaDebugHook function
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUG_HOOK, 0)
!     // after app starts, first idle
!     //DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_INIT,       0)
!     //DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUGGERATTACHED,   0)
  END_DECLARE_EVENT_TYPES()
  
***************
*** 973,978 ****
  #define EVT_LUA_ERROR(id, fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
  #define EVT_LUA_DEBUG_HOOK(id, fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! #define EVT_LUA_INIT(id, fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_INIT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! #define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
  
  #define wxEVT_LUA_CONSOLE wxEVT_LUA_PRINT
--- 981,986 ----
  #define EVT_LUA_ERROR(id, fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
  #define EVT_LUA_DEBUG_HOOK(id, fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! //#define EVT_LUA_INIT(id, fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_INIT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
! //#define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
  
  #define wxEVT_LUA_CONSOLE wxEVT_LUA_PRINT

[Wxlua-commit] wxLua/modules/wxbindstc/src stc.cpp, 1.25, 1.26 wxstc_bind.cpp, 1.17, 1.18

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

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

Modified Files:
	stc.cpp wxstc_bind.cpp 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxstc_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxstc_bind.cpp	17 Dec 2006 07:47:17 -0000	1.17
--- wxstc_bind.cpp	26 Feb 2007 01:57:06 -0000	1.18
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 20,26 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetEventList_wxstc() is called to register events
! // ----------------------------------------------------------------------------
  
  WXLUAEVENT* wxLuaGetEventList_wxstc(size_t &count)
--- 20,26 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetEventList_wxstc() is called to register events
! // ---------------------------------------------------------------------------
  
  WXLUAEVENT* wxLuaGetEventList_wxstc(size_t &count)
***************
*** 65,71 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetDefineList_wxstc() is called to register defines and enums
! // ----------------------------------------------------------------------------
  
  WXLUADEFINE* wxLuaGetDefineList_wxstc(size_t &count)
--- 65,71 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetDefineList_wxstc() is called to register defines and enums
! // ---------------------------------------------------------------------------
  
  WXLUADEFINE* wxLuaGetDefineList_wxstc(size_t &count)
***************
*** 73,79 ****
      static WXLUADEFINE defineList[] =
      {
!         // --------------------------------------------------------------------
          // %define
!         // --------------------------------------------------------------------
  
  #if !wxCHECK_VERSION(2,5,0)
--- 73,79 ----
      static WXLUADEFINE defineList[] =
      {
!         // -------------------------------------------------------------------
          // %define
!         // -------------------------------------------------------------------
  
  #if !wxCHECK_VERSION(2,5,0)
***************
*** 1377,1383 ****
  #endif // wxCHECK_VERSION(2,5,0)
  
!         // --------------------------------------------------------------------
          // %enum
!         // --------------------------------------------------------------------
  
          { 0, 0 },
--- 1377,1383 ----
  #endif // wxCHECK_VERSION(2,5,0)
  
!         // -------------------------------------------------------------------
          // %enum
!         // -------------------------------------------------------------------
  
          { 0, 0 },
***************
*** 1387,1394 ****
  }
  
! // ----------------------------------------------------------------------------
  
  // wxLuaGetStringList_wxstc() is called to register strings
! // ----------------------------------------------------------------------------
  
  WXLUASTRING* wxLuaGetStringList_wxstc(size_t &count)
--- 1387,1394 ----
  }
  
! // ---------------------------------------------------------------------------
  
  // wxLuaGetStringList_wxstc() is called to register strings
! // ---------------------------------------------------------------------------
  
  WXLUASTRING* wxLuaGetStringList_wxstc(size_t &count)
***************
*** 1396,1402 ****
      static WXLUASTRING stringList[] =
      {
!         // --------------------------------------------------------------------
          // %define %string
!         // --------------------------------------------------------------------
  
          { 0, 0 },
--- 1396,1402 ----
      static WXLUASTRING stringList[] =
      {
!         // -------------------------------------------------------------------
          // %define %string
!         // -------------------------------------------------------------------
  
          { 0, 0 },
***************
*** 1406,1412 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetObjectList_wxstc() is called to register object and pointer bindings
! // ----------------------------------------------------------------------------
  
  WXLUAOBJECT* wxLuaGetObjectList_wxstc(size_t &count)
--- 1406,1412 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetObjectList_wxstc() is called to register object and pointer bindings
! // ---------------------------------------------------------------------------
  
  WXLUAOBJECT* wxLuaGetObjectList_wxstc(size_t &count)
***************
*** 1420,1430 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxstc() is called to register global functions
! // ----------------------------------------------------------------------------
  
! // ----------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxstc() is called to register global functions
! // ----------------------------------------------------------------------------
  
  WXLUAMETHOD* wxLuaGetFunctionList_wxstc(size_t &count)
--- 1420,1430 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxstc() is called to register global functions
! // ---------------------------------------------------------------------------
  
! // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxstc() is called to register global functions
! // ---------------------------------------------------------------------------
  
  WXLUAMETHOD* wxLuaGetFunctionList_wxstc(size_t &count)
***************
*** 1440,1446 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetClassList_wxstc() is called to register classes
! // ----------------------------------------------------------------------------
  
  WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count)
--- 1440,1446 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetClassList_wxstc() is called to register classes
! // ---------------------------------------------------------------------------
  
  WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count)
***************
*** 1448,1453 ****
      static WXLUACLASS classList[] =
      {
!         { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, -1, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl"  }, 
!         { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, -1, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent"  }, 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
--- 1448,1453 ----
      static WXLUACLASS classList[] =
      {
!         { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL }, 
!         { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL }, 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
***************
*** 1458,1464 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetClassList_wxstc() is called to register classes
! // ----------------------------------------------------------------------------
  
  // binding class
--- 1458,1464 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetClassList_wxstc() is called to register classes
! // ---------------------------------------------------------------------------
  
  // binding class

Index: stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** stc.cpp	23 Feb 2007 04:35:33 -0000	1.25
--- stc.cpp	26 Feb 2007 01:57:05 -0000	1.26
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 20,26 ****
  
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxStyledTextCtrl
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxStyledTextCtrl'
--- 20,26 ----
  
  
! // ---------------------------------------------------------------------------
  // Bind class wxStyledTextCtrl
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxStyledTextCtrl'
***************
*** 7414,7420 ****
  int wxStyledTextCtrl_methodCount = sizeof(wxStyledTextCtrl_methods)/sizeof(wxStyledTextCtrl_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxStyledTextEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxStyledTextEvent'
--- 7414,7420 ----
  int wxStyledTextCtrl_methodCount = sizeof(wxStyledTextCtrl_methods)/sizeof(wxStyledTextCtrl_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxStyledTextEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxStyledTextEvent'

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.50, 1.51 wxlcallb.cpp, 1.24, 1.25 wxlstate.cpp, 1.87, 1.88

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

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

Modified Files:
	wxlbind.cpp wxlcallb.cpp wxlstate.cpp 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** wxlstate.cpp	22 Feb 2007 00:01:36 -0000	1.87
--- wxlstate.cpp	26 Feb 2007 01:57:06 -0000	1.88
***************
*** 420,424 ****
          {
              lua_pushstring(L, method);
!             lua_pushlightuserdata(L,  pClass);
              lua_pushcclosure(L, func, 1);
          }
--- 420,424 ----
          {
              lua_pushstring(L, method);
!             lua_pushlightuserdata(L, pClass);
              lua_pushcclosure(L, func, 1);
          }
***************
*** 1146,1151 ****
  
      // register handlers to send events
!     RegisterFunction(wxLua_lua_printFunction, wxT("print"));
!     //RegisterFunction(wxLua_lua_tracebackFunction, wxT("debug.traceback")); //wxT("_TRACEBACK"));
  
      // now register bindings
--- 1146,1151 ----
  
      // register handlers to send events
!     RegisterFunction(wxLua_lua_printFunction, "print");
!     //RegisterFunction(wxLua_lua_tracebackFunction, "debug.traceback"); //wxT("_TRACEBACK"));
  
      // now register bindings
***************
*** 1189,1194 ****
  
          // register handlers to send events
!         RegisterFunction(wxLua_lua_printFunction, wxT("print"));
!         //RegisterFunction(wxLua_lua_tracebackFunction, wxT("debug.traceback")); //wxT("_TRACEBACK"));
  
          // now register bindings
--- 1189,1194 ----
  
          // register handlers to send events
!         RegisterFunction(wxLua_lua_printFunction, "print");
!         //RegisterFunction(wxLua_lua_tracebackFunction, "debug.traceback"); //wxT("_TRACEBACK"));
  
          // now register bindings
***************
*** 1684,1690 ****
          {
              WXLUACLASS* pLuaClass = pClass + i;
!             pLuaClass->baseclass_tag = -1;
  
!             if (pLuaClass->baseclass)
              {
                  wxLuaBindingList::Node* basenode;
--- 1684,1690 ----
          {
              WXLUACLASS* pLuaClass = pClass + i;
!             // pLuaClass->baseclass = NULL; FIXME
  
!             if (pLuaClass->baseclassName)
              {
                  wxLuaBindingList::Node* basenode;
***************
*** 1694,1698 ****
  
                      // found base class in binding?
!                     if (basebinding->SetBaseClassTag(pLuaClass))
                          break;
                  }
--- 1694,1698 ----
  
                      // found base class in binding?
!                     if (basebinding->SetBaseClass(pLuaClass))
                          break;
                  }
***************
*** 1776,1782 ****
  {
      wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
      const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
!     if (pLuaClass && (pLuaClass->baseclass_tag != -1))
!         return GetLuaClass(pLuaClass->baseclass_tag);
  
      return NULL;
--- 1776,1783 ----
  {
      wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
+ 
      const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
!     if (pLuaClass)
!         return pLuaClass->baseclass;
  
      return NULL;
***************
*** 1789,1803 ****
  
      const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
!     if (pLuaClass && (pLuaClass->baseclass_tag != -1))
!         return IsDerivedClass(pLuaClass->baseclass_tag, iBaseClassTag);
  
      return false;
  }
  
! const WXLUAEVENT* wxLuaState::GetLuaEvent(wxEvent *pEvent) const
  {
!     wxCHECK_MSG(Ok() && pEvent, NULL, wxT("Invalid wxLuaState or wxEvent"));
      WXLUAEVENT eventItem;
!     int eventType = pEvent->GetEventType();
      eventItem.eventType = &eventType;
  
--- 1790,1804 ----
  
      const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
!     if (pLuaClass && pLuaClass->baseclass)
!         return IsDerivedClass(*pLuaClass->baseclass->class_tag, iBaseClassTag);
  
      return false;
  }
  
! const WXLUAEVENT* wxLuaState::GetLuaEvent(wxEventType eventType_) const
  {
!     wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState"));
      WXLUAEVENT eventItem;
!     int eventType = eventType_;
      eventItem.eventType = &eventType;
  
***************
*** 2351,2355 ****
      wxLua_lua_terror(L, wx2lua(msg));
  
!     return wxEmptyString;    
  }
  bool wxLuaState::GetBooleanType(int stack_idx)
--- 2352,2356 ----
      wxLua_lua_terror(L, wx2lua(msg));
  
!     return wxEmptyString;
  }
  bool wxLuaState::GetBooleanType(int stack_idx)
***************
*** 2448,2463 ****
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty)
  {
! 
!     int iMethod, method_count = pClass->num_methods;
      // find a method in the class, recurse through classes from which this class is derived.
!     for (iMethod = 0; iMethod < method_count; ++iMethod)
      {
!         WXLUAMETHOD *pMethod = pClass->methods + iMethod;
          if (((pMethod->type == LuaMethod) || (pMethod->type == LuaGetProp))
                  && (strcmp(pMethod->name, cpIndex) == 0))
          {
-             isProperty = (pMethod->type == LuaGetProp);
              return pMethod;
          }
--- 2449,2462 ----
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex)
  {
!     int i_method, method_count = pClass->num_methods;
      // find a method in the class, recurse through classes from which this class is derived.
!     for (i_method = 0; i_method < method_count; ++i_method)
      {
!         WXLUAMETHOD *pMethod = pClass->methods + i_method;
          if (((pMethod->type == LuaMethod) || (pMethod->type == LuaGetProp))
                  && (strcmp(pMethod->name, cpIndex) == 0))
          {
              return pMethod;
          }
***************
*** 2469,2485 ****
      const WXLUACLASS* pBaseClass = GetBaseLuaClass(*pClass->class_tag);
      if (pBaseClass)
!         return GetLuaMethod(pBaseClass, cpIndex, isProperty);
  
      return NULL;
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isSet)
  {
!     int iMethod, method_count = pClass->num_methods;
      // find a method in the class, recurse through classes from which this class is derived.
!     for (iMethod = 0; iMethod < method_count; ++iMethod)
      {
!         WXLUAMETHOD *pMethod = pClass->methods + iMethod;
!         if (isSet)
          {
              if ((pMethod->type == LuaSetProp) && (strcmp(pMethod->name, cpIndex) == 0))
--- 2468,2486 ----
      const WXLUACLASS* pBaseClass = GetBaseLuaClass(*pClass->class_tag);
      if (pBaseClass)
!         return GetLuaMethod(pBaseClass, cpIndex);
  
      return NULL;
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isLuaSetProp)
  {
!     wxCHECK_MSG(pClass, NULL, wxT("Invalid WXLUACLASS in wxLuaState::GetLuaProperty"));
! 
!     int i_method, method_count = pClass->num_methods;
      // find a method in the class, recurse through classes from which this class is derived.
!     for (i_method = 0; i_method < method_count; ++i_method)
      {
!         WXLUAMETHOD *pMethod = pClass->methods + i_method;
!         if (isLuaSetProp)
          {
              if ((pMethod->type == LuaSetProp) && (strcmp(pMethod->name, cpIndex) == 0))
***************
*** 2498,2502 ****
      const WXLUACLASS* pBaseClass = GetBaseLuaClass(*pClass->class_tag);
      if (pBaseClass)
!         return GetLuaProperty(pBaseClass, cpIndex, isSet);
  
      return NULL;
--- 2499,2503 ----
      const WXLUACLASS* pBaseClass = GetBaseLuaClass(*pClass->class_tag);
      if (pBaseClass)
!         return GetLuaProperty(pBaseClass, cpIndex, isLuaSetProp);
  
      return NULL;
***************
*** 2521,2525 ****
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
                  {
!                     wxCHECK_MSG(pLuaObject->GetwxLuaState() == *this, false, wxT("wxLuaState HasDerivedMethod out of sync"));
                      return true;
                  }
--- 2522,2526 ----
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
                  {
!                     wxCHECK_MSG(pLuaObject->GetwxLuaState() == *this, false, wxT("wxLuaState for HasDerivedMethod out of sync"));
                      return true;
                  }
***************
*** 3265,3269 ****
      luapath += path + wxT(';');
  
!     lua_PushString(wx2lua(luapath));
      lua_SetGlobal(LUA_PATH);
  }
--- 3266,3270 ----
      luapath += path + wxT(';');
  
!     lua_PushString(luapath);
      lua_SetGlobal(LUA_PATH);
  }
***************
*** 3581,3586 ****
  DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR)
  DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK)
! DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_INIT)
! DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUGGERATTACHED)
  
  wxLuaEvent::wxLuaEvent(wxEventType commandType, wxWindowID id, const wxLuaState& wxlState)
--- 3582,3587 ----
  DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR)
  DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK)
! //DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_INIT)
! //DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUGGERATTACHED)
  
  wxLuaEvent::wxLuaEvent(wxEventType commandType, wxWindowID id, const wxLuaState& wxlState)

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** wxlbind.cpp	7 Feb 2007 04:56:24 -0000	1.50
--- wxlbind.cpp	26 Feb 2007 01:57:06 -0000	1.51
***************
*** 21,24 ****
--- 21,25 ----
  
  #include "wx/listimpl.cpp"
+ WX_DEFINE_LIST(wxLuaBindingList);
  
  // Binding tags are generated as positive tag id automatically when bound
***************
*** 41,46 ****
  int s_wxluaarg_LuaFunction   = -9;
  
- WX_DEFINE_LIST(wxLuaBindingList);
- 
  //-----------------------------------------------------------------------------
  // wxLuaFunction
--- 42,45 ----
***************
*** 82,86 ****
          (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag()))
      {
!         wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1);
          return pFunction->CallMethod(L);
      }
--- 81,85 ----
          (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag()))
      {
!         wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1, false);
          return pFunction->CallMethod(L);
      }
***************
*** 367,375 ****
          if (!fFound)
          {
!             bool propertyFlag;
!             WXLUAMETHOD *pMethod = wxlState.GetLuaMethod(pClass, cpIndex, propertyFlag);
              if (pMethod != NULL)
              {
!                 if (propertyFlag)
                  {
                      lua_remove(L, 2);
--- 366,373 ----
          if (!fFound)
          {
!             WXLUAMETHOD *pMethod = wxlState.GetLuaMethod(pClass, cpIndex);
              if (pMethod != NULL)
              {
!                 if (pMethod->type == LuaGetProp)
                  {
                      lua_remove(L, 2);
***************
*** 380,389 ****
                  {
                      wxLuaFunction *pFunction = new wxLuaFunction(pMethod, pClass, pObject);
!                     if (pFunction != NULL)
!                     {
!                         wxlState.tpushusertag(pFunction, wxlState.GetwxLuaFunctionTag());
!                         result = 1;
!                         fFound = true;
!                     }
                  }
              }
--- 378,384 ----
                  {
                      wxLuaFunction *pFunction = new wxLuaFunction(pMethod, pClass, pObject);
!                     wxlState.tpushusertag(pFunction, wxlState.GetwxLuaFunctionTag());
!                     result = 1;
!                     fFound = true;
                  }
              }
***************
*** 420,424 ****
      const char *cpIndex = lua_tostring(L, 2);
  
!     //wxPrintf(wxT("wxLua_lua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str());
  
      if ((pClass != NULL) && lua_isuserdata(L, 1) &&
--- 415,419 ----
      const char *cpIndex = lua_tostring(L, 2);
  
!     wxPrintf(wxT("wxLua_lua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str());
  
      if ((pClass != NULL) && lua_isuserdata(L, 1) &&
***************
*** 426,429 ****
--- 421,425 ----
          (wxlState.ttag(1) == *pClass->class_tag))
      {
+         // See if there is a LuaSetProp in the WXLUACLASS's WXLUAMETHODs
          WXLUAMETHOD *pMethod = wxlState.GetLuaProperty(pClass, cpIndex, true);
          if (pMethod != NULL)
***************
*** 447,472 ****
              {
                  pHashTable = new wxLuaStringToLongHashMap;
!                 if (pHashTable != NULL)
!                 {
!                     wxlState.GetLuaStateData()->m_pDerivedList[(long) pObject] = (long)pHashTable;
!                     fCreated = true;
!                 }
              }
  
!             if (pHashTable != NULL)
              {
!                 wxString index = lua2wx(cpIndex);
!                 if (!fCreated)
                  {
!                     wxLuaStringToLongHashMap::iterator it = pHashTable->find(index);
!                     if (it != pHashTable->end())
!                     {
!                         wxLuaObject *pObject = (wxLuaObject *)it->second;
!                         if (pObject != NULL)
!                             delete pObject;
!                     }
                  }
-                 (*pHashTable)[index] = (long)new wxLuaObject(wxlState, 3);
              }
          }
      }
--- 443,463 ----
              {
                  pHashTable = new wxLuaStringToLongHashMap;
!                 wxlState.GetLuaStateData()->m_pDerivedList[(long) pObject] = (long)pHashTable;
!                 fCreated = true;
              }
  
!             wxString index = lua2wx(cpIndex);
!             if (!fCreated)
              {
!                 wxLuaStringToLongHashMap::iterator it = pHashTable->find(index);
!                 if (it != pHashTable->end())
                  {
!                     wxLuaObject *pObject = (wxLuaObject *)it->second;
!                     if (pObject != NULL)
!                         delete pObject;
                  }
              }
+ 
+             (*pHashTable)[index] = (long)new wxLuaObject(wxlState, 3);
          }
      }
***************
*** 515,523 ****
  {
      wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState"));
      int luaTable = RegisterFunctions(wxlState, registerTypes);
  
      lua_State *L = wxlState.GetLuaState();
  
!     // create a global for the namespace if it doesn't already exist
      lua_getglobal(L, wx2lua(m_nameSpace));
  
--- 506,515 ----
  {
      wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState"));
+ 
      int luaTable = RegisterFunctions(wxlState, registerTypes);
  
      lua_State *L = wxlState.GetLuaState();
  
!     // create a global table for the namespace if it doesn't already exist
      lua_getglobal(L, wx2lua(m_nameSpace));
  
***************
*** 553,558 ****
      int tableOffset = 0;
  
!     // create a global for the namespace if it doesn't already exist
      lua_getglobal(L, wx2lua(m_nameSpace));
      if (!lua_istable(L, -1))
      {
--- 545,551 ----
      int tableOffset = 0;
  
!     // create a global table for the namespace if it doesn't already exist
      lua_getglobal(L, wx2lua(m_nameSpace));
+ 
      if (!lua_istable(L, -1))
      {
***************
*** 607,611 ****
  void LUACALL wxLuaBinding::RegisterGeneratedClasses(const wxLuaState& wxlState_, int tableOffset, bool registerTypes)
  {
!     // Replace the metatable functions for the functions we push into lua
      static const luaL_reg s_funcTable[] =
      {
--- 600,604 ----
  void LUACALL wxLuaBinding::RegisterGeneratedClasses(const wxLuaState& wxlState_, int tableOffset, bool registerTypes)
  {
!     // Replace the metatable functions for the classes we push into lua
      static const luaL_reg s_funcTable[] =
      {
***************
*** 626,648 ****
  
      // install the classes, functions and methods, creating new tags
!     // if this is the first time we're registering them, else assume
!     // they are in numerical order.
!     for (size_t iClass = 0; iClass < m_classCount; ++iClass,
!         iTag = (registerTypes ? wxlState.tnewtag() : iTag + 1))
      {
!         WXLUACLASS *pClass = m_classList + iClass;
!         *pClass->class_tag = iTag;
  
          // set the metatable functions for the classes
!         for (size_t iFunction = 0; iFunction < s_funcCount; iFunction++)
          {
!             wxlState.tsettagmethod(iTag, s_funcTable[iFunction].name, s_funcTable[iFunction].func, (void *) pClass);
          }
  
          // install public functions like constructors or global functions
!         int iMethod, method_count = pClass->num_methods;
!         for (iMethod = 0; iMethod < method_count; ++iMethod)
          {
!             WXLUAMETHOD *pMethod = pClass->methods + iMethod;
              if ((pMethod->type == LuaConstructor) || (pMethod->type == LuaGlobal))
              {
--- 619,647 ----
  
      // install the classes, functions and methods, creating new tags
!     // if this is the first time we're registering them
!     for (size_t i_class = 0; i_class < m_classCount; ++i_class)
      {
!         WXLUACLASS *pClass = m_classList + i_class;
! 
!         // Create a new tag if registering types, else use tag already set
!         if (registerTypes)
!         {
!             iTag = wxlState.tnewtag();
!             *pClass->class_tag = iTag;
!         }
!         else
!             iTag = *pClass->class_tag;
  
          // set the metatable functions for the classes
!         for (size_t i_func = 0; i_func < s_funcCount; ++i_func)
          {
!             wxlState.tsettagmethod(iTag, s_funcTable[i_func].name, s_funcTable[i_func].func, (void *)pClass);
          }
  
          // install public functions like constructors or global functions
!         int i_method, method_count = pClass->num_methods;
!         for (i_method = 0; i_method < method_count; ++i_method)
          {
!             WXLUAMETHOD *pMethod = pClass->methods + i_method;
              if ((pMethod->type == LuaConstructor) || (pMethod->type == LuaGlobal))
              {
***************
*** 657,663 ****
  
      // register all the builtin functions, global C style functions
!     for (size_t iFunction = 0; iFunction < m_functionCount; ++iFunction)
      {
!         WXLUAMETHOD *pMethod = m_functionList + iFunction;
          lua_pushstring(L, pMethod->name);
          lua_pushcfunction(L, pMethod->func);
--- 656,662 ----
  
      // register all the builtin functions, global C style functions
!     for (size_t i_func = 0; i_func < m_functionCount; ++i_func)
      {
!         WXLUAMETHOD *pMethod = m_functionList + i_func;
          lua_pushstring(L, pMethod->name);
          lua_pushcfunction(L, pMethod->func);
***************
*** 674,680 ****
  
      // install the numerical definitions
!     for (size_t iDefine = 0; iDefine < m_defineCount; ++iDefine)
      {
!         WXLUADEFINE *pDefine = m_defineList + iDefine;
          lua_pushstring(L, pDefine->name);
          lua_pushnumber(L, pDefine->value);
--- 673,679 ----
  
      // install the numerical definitions
!     for (size_t i_define = 0; i_define < m_defineCount; ++i_define)
      {
!         WXLUADEFINE *pDefine = m_defineList + i_define;
          lua_pushstring(L, pDefine->name);
          lua_pushnumber(L, pDefine->value);
***************
*** 683,689 ****
  
      // install the strings
!     for (size_t iString = 0; iString < m_stringCount; ++iString)
      {
!         WXLUASTRING *pString = m_stringList + iString;
          lua_pushstring(L, pString->name);
          lua_pushstring(L, wx2lua(pString->value));
--- 682,688 ----
  
      // install the strings
!     for (size_t i_string = 0; i_string < m_stringCount; ++i_string)
      {
!         WXLUASTRING *pString = m_stringList + i_string;
          lua_pushstring(L, pString->name);
          lua_pushstring(L, wx2lua(pString->value));
***************
*** 692,703 ****
  
      // install the objects and pointers
!     for (size_t iObject = 0; iObject < m_objectCount; ++iObject)
      {
!         WXLUAOBJECT *pObject = m_objectList + iObject;
!         lua_pushstring(L, pObject->objName);
          if (pObject->objPtr != 0)
!             wxlState.tpushusertag(pObject->objPtr, *pObject->objClassTag);
          else
!             wxlState.tpushusertag(*pObject->pObjPtr, *pObject->objClassTag);
  
          lua_rawset(L, tableOffset);
--- 691,703 ----
  
      // install the objects and pointers
!     for (size_t i_object = 0; i_object < m_objectCount; ++i_object)
      {
!         WXLUAOBJECT *pObject = m_objectList + i_object;
!         lua_pushstring(L, pObject->name);
! 
          if (pObject->objPtr != 0)
!             wxlState.tpushusertag(pObject->objPtr, *pObject->class_tag);
          else
!             wxlState.tpushusertag(*pObject->pObjPtr, *pObject->class_tag);
  
          lua_rawset(L, tableOffset);
***************
*** 705,712 ****
  
      // register all the wxevent types
!     for (size_t iEvent = 0; iEvent < m_eventCount; ++iEvent)
      {
!         WXLUAEVENT *pEvent = m_eventList + iEvent;
!         lua_pushstring(L, pEvent->eventName);
          lua_pushnumber(L, *pEvent->eventType);
          lua_rawset(L, tableOffset);
--- 705,712 ----
  
      // register all the wxevent types
!     for (size_t i_event = 0; i_event < m_eventCount; ++i_event)
      {
!         WXLUAEVENT *pEvent = m_eventList + i_event;
!         lua_pushstring(L, pEvent->name);
          lua_pushnumber(L, *pEvent->eventType);
          lua_rawset(L, tableOffset);
***************
*** 717,733 ****
  }
  
! bool wxLuaBinding::SetBaseClassTag(WXLUACLASS *pClass)
  {
!     if (!pClass->baseclass || !m_classList)
          return false;
  
!     // install the classes, functions and methods
!     for (size_t i = 0; i < m_classCount; ++i)
      {
!         WXLUACLASS* baseClass = m_classList + i;
  
!         if (strcmp(baseClass->name, pClass->baseclass) == 0)
          {
!             pClass->baseclass_tag = *baseClass->class_tag;
              return true;
          }
--- 717,732 ----
  }
  
! bool wxLuaBinding::SetBaseClass(WXLUACLASS *pClass)
  {
!     if (!pClass->baseclassName) // check if there is a baseclassName at all
          return false;
  
!     for (size_t n = 0; n < m_classCount; ++n)
      {
!         WXLUACLASS* baseClass = m_classList + n; // potential base class
  
!         if (strcmp(baseClass->name, pClass->baseclassName) == 0)
          {
!             pClass->baseclass = baseClass;
              return true;
          }
***************
*** 739,748 ****
  wxString wxLuaBinding::GetEventTypeName(wxEventType e_type)
  {
!     size_t n = 0, count = GetLuaEventCount();
!     for (n = 0; n < count; n++)
      {
!         WXLUAEVENT *pEvent = &m_eventList[n];
          if (*pEvent->eventType == (int)e_type)
!             return lua2wx(pEvent->eventName);
      }
  
--- 738,747 ----
  wxString wxLuaBinding::GetEventTypeName(wxEventType e_type)
  {
!     for (size_t n = 0; n < m_eventCount; ++n)
      {
!         WXLUAEVENT *pEvent = m_eventList + n;
! 
          if (*pEvent->eventType == (int)e_type)
!             return lua2wx(pEvent->name);
      }
  

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wxlcallb.cpp	21 Jan 2007 23:13:07 -0000	1.24
--- wxlcallb.cpp	26 Feb 2007 01:57:06 -0000	1.25
***************
*** 117,123 ****
      int eventClassTag = wxlState.GetwxEventTag(); // get the s_wxluatag_wxEvent
  
!     const WXLUAEVENT *pLuaEvent = wxlState.GetLuaEvent(pEvent);
      if (pLuaEvent)
!         eventClassTag = *pLuaEvent->eventClassTag;
  
      lua_checkstack(wxlState.GetLuaState(), LUA_MINSTACK);
--- 117,123 ----
      int eventClassTag = wxlState.GetwxEventTag(); // get the s_wxluatag_wxEvent
  
!     const WXLUAEVENT *pLuaEvent = wxlState.GetLuaEvent(pEvent->GetEventType());
      if (pLuaEvent)
!         eventClassTag = *pLuaEvent->class_tag;
  
      lua_checkstack(wxlState.GetLuaState(), LUA_MINSTACK);
***************
*** 156,159 ****
--- 156,160 ----
      // allocate a LUA proxy for the object
      const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
+ 
      if (ptr != NULL)
      {

[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.16, 1.17 wxluasocket_bind.cpp, 1.12, 1.13

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

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

Modified Files:
	wxluasocket.cpp wxluasocket_bind.cpp 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: wxluasocket_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxluasocket_bind.cpp	17 Dec 2006 07:47:17 -0000	1.12
--- wxluasocket_bind.cpp	26 Feb 2007 01:57:07 -0000	1.13
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 20,26 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetEventList_wxluasocket() is called to register events
! // ----------------------------------------------------------------------------
  
  WXLUAEVENT* wxLuaGetEventList_wxluasocket(size_t &count)
--- 20,26 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetEventList_wxluasocket() is called to register events
! // ---------------------------------------------------------------------------
  
  WXLUAEVENT* wxLuaGetEventList_wxluasocket(size_t &count)
***************
*** 45,51 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetDefineList_wxluasocket() is called to register defines and enums
! // ----------------------------------------------------------------------------
  
  WXLUADEFINE* wxLuaGetDefineList_wxluasocket(size_t &count)
--- 45,51 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetDefineList_wxluasocket() is called to register defines and enums
! // ---------------------------------------------------------------------------
  
  WXLUADEFINE* wxLuaGetDefineList_wxluasocket(size_t &count)
***************
*** 53,63 ****
      static WXLUADEFINE defineList[] =
      {
!         // --------------------------------------------------------------------
          // %define
!         // --------------------------------------------------------------------
  
!         // --------------------------------------------------------------------
          // %enum
!         // --------------------------------------------------------------------
  
          { 0, 0 },
--- 53,63 ----
      static WXLUADEFINE defineList[] =
      {
!         // -------------------------------------------------------------------
          // %define
!         // -------------------------------------------------------------------
  
!         // -------------------------------------------------------------------
          // %enum
!         // -------------------------------------------------------------------
  
          { 0, 0 },
***************
*** 67,74 ****
  }
  
! // ----------------------------------------------------------------------------
  
  // wxLuaGetStringList_wxluasocket() is called to register strings
! // ----------------------------------------------------------------------------
  
  WXLUASTRING* wxLuaGetStringList_wxluasocket(size_t &count)
--- 67,74 ----
  }
  
! // ---------------------------------------------------------------------------
  
  // wxLuaGetStringList_wxluasocket() is called to register strings
! // ---------------------------------------------------------------------------
  
  WXLUASTRING* wxLuaGetStringList_wxluasocket(size_t &count)
***************
*** 76,82 ****
      static WXLUASTRING stringList[] =
      {
!         // --------------------------------------------------------------------
          // %define %string
!         // --------------------------------------------------------------------
  
          { 0, 0 },
--- 76,82 ----
      static WXLUASTRING stringList[] =
      {
!         // -------------------------------------------------------------------
          // %define %string
!         // -------------------------------------------------------------------
  
          { 0, 0 },
***************
*** 86,92 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetObjectList_wxluasocket() is called to register object and pointer bindings
! // ----------------------------------------------------------------------------
  
  WXLUAOBJECT* wxLuaGetObjectList_wxluasocket(size_t &count)
--- 86,92 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetObjectList_wxluasocket() is called to register object and pointer bindings
! // ---------------------------------------------------------------------------
  
  WXLUAOBJECT* wxLuaGetObjectList_wxluasocket(size_t &count)
***************
*** 100,110 ****
  }
  
! // ----------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluasocket() is called to register global functions
! // ----------------------------------------------------------------------------
  
! // ----------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluasocket() is called to register global functions
! // ----------------------------------------------------------------------------
  
  WXLUAMETHOD* wxLuaGetFunctionList_wxluasocket(size_t &count)
--- 100,110 ----
  }
  
! // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluasocket() is called to register global functions
! // ---------------------------------------------------------------------------
  
! // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluasocket() is called to register global functions
! // ---------------------------------------------------------------------------
  
  WXLUAMETHOD* wxLuaGetFunctionList_wxluasocket(size_t &count)
***************
*** 120,126 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetClassList_wxluasocket() is called to register classes
! // ----------------------------------------------------------------------------
  
  WXLUACLASS* wxLuaGetClassList_wxluasocket(size_t &count)
--- 120,126 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetClassList_wxluasocket() is called to register classes
! // ---------------------------------------------------------------------------
  
  WXLUACLASS* wxLuaGetClassList_wxluasocket(size_t &count)
***************
*** 128,133 ****
      static WXLUACLASS classList[] =
      {
!         { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, -1, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent"  }, 
!         { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, -1, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler"  }, 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
--- 128,133 ----
      static WXLUACLASS classList[] =
      {
!         { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL }, 
!         { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL }, 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
***************
*** 138,144 ****
  
  
! // ----------------------------------------------------------------------------
  // wxLuaGetClassList_wxluasocket() is called to register classes
! // ----------------------------------------------------------------------------
  
  // binding class
--- 138,144 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaGetClassList_wxluasocket() is called to register classes
! // ---------------------------------------------------------------------------
  
  // binding class

Index: wxluasocket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxluasocket.cpp	22 Feb 2007 20:33:10 -0000	1.16
--- wxluasocket.cpp	26 Feb 2007 01:57:07 -0000	1.17
***************
*** 1,7 ****
! // ----------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ----------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
--- 1,7 ----
! // ---------------------------------------------------------------------------
  // This file was generated by genwxbind.lua 
  //
  // Any changes made to this file may be lost when file is regenerated.
! // ---------------------------------------------------------------------------
  
  #ifdef __BORLANDC__
***************
*** 20,26 ****
  
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaDebuggerServer
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaDebuggerServer'
--- 20,26 ----
  
  
! // ---------------------------------------------------------------------------
  // Bind class wxLuaDebuggerServer
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaDebuggerServer'
***************
*** 405,411 ****
  int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]);
  
! // -------------------------------------------------------------------------------------------------
  // Bind class wxLuaDebuggerEvent
! // -------------------------------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent'
--- 405,411 ----
  int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]);
  
! // ---------------------------------------------------------------------------
  // Bind class wxLuaDebuggerEvent
! // ---------------------------------------------------------------------------
  
  // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent'

[Wxlua-commit] wxLua/distrib/macbundle copydylibs.command, NONE, 1.1 wxLuaFolder.icns, NONE, 1.1

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/distrib/macbundle
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1104

Added Files:
	copydylibs.command wxLuaFolder.icns 
Log Message:
added Anders' contributions for building a mac release of wxLua

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

--- NEW FILE: copydylibs.command ---
#!/bin/sh -x

DIR=`dirname "$0"`; cd "$DIR"

# This little shell script can be used to copy 
# the DLL to this folder, so that EXEs compiled
# against shared builds of wxLua can find them.

PREFIX=/usr/local

#cp $PREFIX/lib/libwx_macu-2.8.0.dylib .
#cp $PREFIX/lib/libwx_macu_stc-2.8.0.dylib .

cp -p ../lib/*.dylib .

for dylib in lib*lua*.0.0.0.dylib; do
  lib=`echo $dylib | sed -e s/.0.0.0.dylib/.0.dylib/`
  test -L $lib && rm $lib # remove existing symlink
  mv $dylib $lib
done

for dylib in libwx_*.0.dylib liblua*.0.dylib libwxlua_*.0.dylib; do
  install_name_tool -id @executable_path/../../../$dylib $dylib

  for lib in libwx_*.0.dylib liblua*.0.dylib libwxlua_*.0.dylib; do
  install_name_tool -change $PREFIX/lib/$dylib @executable_path/../../../$dylib\
                    $lib
  done

  for app in wxLua wxLuaEdit wxLuaCan wxLuaFreeze; do
  install_name_tool -change $PREFIX/lib/$dylib @executable_path/../../../$dylib\
                    $app.app/Contents/MacOS/*
  done

done

[Wxlua-commit] website download.php,1.22,1.23

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/website
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29491

Modified Files:
	download.php 
Log Message:
uncommented mac bundle download link

Index: download.php
===================================================================
RCS file: /cvsroot/wxlua/website/download.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** download.php	28 Dec 2006 10:03:45 -0000	1.22
--- download.php	24 Feb 2007 17:51:56 -0000	1.23
***************
*** 3,7 ****
    $pagetitle="download";
    $anchors_href=array("win", "linux", "mac", "sources", "snapshot", "browsesources");
!   $anchors_text=array("...for Windows", "...for Linux", "...for Macintosh", "Sources", "Nightly snapshot", "Browse sources");
    include_once("header.inc.php");
  
--- 3,8 ----
    $pagetitle="download";
    $anchors_href=array("win", "linux", "mac", "sources", "snapshot", "browsesources");
!   $anchors_text=array("...for Windows", "...for Linux", "...for Macintosh", "Sources",
!                       "Nightly snapshot", "Browse sources");
    include_once("header.inc.php");
  
***************
*** 16,25 ****
    $exesize="5.3";      // size of the wxlua-xxx-setup.exe file (in MB)
    $apsize="9.6";       // size of the wxlua-xxx.package file (in MB)
!   $bundlesize="3.0";   // size of the wxlua-xxx.dmg file (in MB)
  
    $winlink="http://prdownloads.sourceforge.net/wxlua/wxLua-$latestversion-setup.exe?download";
    $dlllink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-dlls.zip?download";
    $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download";
!   $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.dmg?download";
  
    $ziplink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.zip?download";
--- 17,26 ----
    $exesize="5.3";      // size of the wxlua-xxx-setup.exe file (in MB)
    $apsize="9.6";       // size of the wxlua-xxx.package file (in MB)
!   $bundlesize="16.9";   // size of the wxlua-xxx.dmg file (in MB)
  
    $winlink="http://prdownloads.sourceforge.net/wxlua/wxLua-$latestversion-setup.exe?download";
    $dlllink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-dlls.zip?download";
    $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download";
!   $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-tiger.dmg?download";
  
    $ziplink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.zip?download";
***************
*** 48,52 ****
  
          if (strstr($useragent,'Win'))
!         $platform='Windows';
          else if (strstr($useragent,'Mac'))
              $platform='Macintosh';
--- 49,53 ----
  
          if (strstr($useragent,'Win'))
!             $platform='Windows';
          else if (strstr($useragent,'Mac'))
              $platform='Macintosh';
***************
*** 93,97 ****
  </div>
  
- <!-- uncomment when this is ready
  <div class="indented">
  <h2 id="mac">...for Macintosh</h2>
--- 94,97 ----
***************
*** 100,104 ****
  For problems with installation, see the <a href="support.php">support page</a>.</p>
  </div>
- -->
  
  <div class="indented">
--- 100,103 ----

[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.25, 1.26 clipdrag.i, 1.20, 1.21 config.i, 1.13, 1.14 controls.i, 1.25, 1.26 data.i, 1.21, 1.22 defsutil.i, 1.30, 1.31 dialogs.i, 1.21, 1.22 event.i, 1.17, 1.18 file.i, 1.13, 1.14 gdi.i, 1.36, 1.37 geometry.i, 1.7, 1.8 grid.i, 1.10, 1.11 help.i, 1.9, 1.10 html.i, 1.12, 1.13 image.i, 1.15, 1.16 mdi.i, 1.9, 1.10 menutool.i, 1.11, 1.12 print.i, 1.11, 1.12 regex.i, 1.5, 1.6 sizer.i, 1.9, 1.10 socket.i, 1.9, 1.10 thread.i, 1.4, 1.5 wave.i, 1.12, 1.13 windows.i, 1.25, 1.26 wx_datatypes.lua, 1.48, 1.49 xml.i, 1.5, 1.6

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

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

Modified Files:
	appframe.i clipdrag.i config.i controls.i data.i defsutil.i 
	dialogs.i event.i file.i gdi.i geometry.i grid.i help.i html.i 
	image.i mdi.i menutool.i print.i regex.i sizer.i socket.i 
	thread.i wave.i windows.i wx_datatypes.lua xml.i 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wave.i	22 Feb 2007 20:33:08 -0000	1.12
--- wave.i	23 Feb 2007 04:35:30 -0000	1.13
***************
*** 13,18 ****
  //  wxSound
  
! %if %wxchkver26
! %if wxUSE_SOUND
  %include "wx/sound.h"
  
--- 13,18 ----
  //  wxSound
  
! %if %wxchkver26 & wxUSE_SOUND
! 
  %include "wx/sound.h"
  
***************
*** 35,46 ****
  %endclass
  
! %endif // wxUSE_SOUND
! %endif // %wxchkver26
  
  //-----------------------------------------------------------------------------
  //  wxWave
  
! %if %msw&!%wxchkver25
! %if wxUSE_WAVE
  %include "wx/wave.h"
  
--- 35,45 ----
  %endclass
  
! %endif // %wxchkver26 & wxUSE_SOUND
  
  //-----------------------------------------------------------------------------
  //  wxWave
  
! %if %msw & !%wxchkver25 & wxUSE_WAVE
! 
  %include "wx/wave.h"
  
***************
*** 58,63 ****
  %endclass
  
! %endif // wxUSE_WAVE
! %endif // %msw&!%wxchkver25
  
  %endif //wxLUA_USE_wxWave
--- 57,61 ----
  %endclass
  
! %endif // %msw & !%wxchkver25 & wxUSE_WAVE
  
  %endif //wxLUA_USE_wxWave

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** menutool.i	7 Dec 2006 06:32:42 -0000	1.11
--- menutool.i	23 Feb 2007 04:35:30 -0000	1.12
***************
*** 11,15 ****
  // wxMenu
  
! %if wxLUA_USE_wxMenu
  
  %include "wx/menu.h"
--- 11,15 ----
  // wxMenu
  
! %if wxLUA_USE_wxMenu & wxUSE_MENUS
  
  %include "wx/menu.h"
***************
*** 180,184 ****
  %endclass
  
! %endif //wxLUA_USE_wxMenu
  
  //-----------------------------------------------------------------------------
--- 180,184 ----
  %endclass
  
! %endif //wxLUA_USE_wxMenu & wxUSE_MENUS
  
  //-----------------------------------------------------------------------------

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** clipdrag.i	7 Dec 2006 06:32:42 -0000	1.20
--- clipdrag.i	23 Feb 2007 04:35:30 -0000	1.21
***************
*** 8,17 ****
  // ============================================================================
  
- // TODO - Missing wxClipboardLocker
- 
  //-----------------------------------------------------------------------------
  // wxClipboard
  
! %if wxLUA_USE_wxClipboard
  
  %include "wx/clipbrd.h"
--- 8,15 ----
  // ============================================================================
  
  //-----------------------------------------------------------------------------
  // wxClipboard
  
! %if wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD
  
  %include "wx/clipbrd.h"
***************
*** 35,44 ****
  %endclass
  
! %endif //wxLUA_USE_wxClipboard
  
  //-----------------------------------------------------------------------------
  // wxDataFormat
  
! %if wxLUA_USE_wxDataObject
  
  %include "wx/dataobj.h"
--- 33,49 ----
  %endclass
  
! //-----------------------------------------------------------------------------
! // 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++.
! 
! %endif //wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD
  
  //-----------------------------------------------------------------------------
  // wxDataFormat
  
! %if wxLUA_USE_wxDataObject & wxUSE_DATAOBJ
  
  %include "wx/dataobj.h"
***************
*** 183,192 ****
  //%endclass
  
! %endif //wxLUA_USE_wxDataObject
  
  //-----------------------------------------------------------------------------
  // wxDropTarget
  
! %if wxLUA_USE_wxDragDrop
  
  %include "wx/dnd.h"
--- 188,197 ----
  //%endclass
  
! %endif //wxLUA_USE_wxDataObject & wxUSE_DATAOBJ
  
  //-----------------------------------------------------------------------------
  // wxDropTarget
  
! %if wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP
  
  %include "wx/dnd.h"
***************
*** 270,281 ****
  %endclass
  
! %endif //wxLUA_USE_wxDragDrop
  
  //-----------------------------------------------------------------------------
  // wxMetafile
  
! %if wxLUA_USE_wxMetafile
! 
! %if %msw|%mac|%os2
  
  %include "wx/metafile.h"
--- 275,284 ----
  %endclass
  
! %endif //wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP
  
  //-----------------------------------------------------------------------------
  // wxMetafile
  
! %if wxLUA_USE_wxMetafile & wxUSE_METAFILE & (%msw|%mac|%os2)
  
  %include "wx/metafile.h"
***************
*** 301,303 ****
  %endif
  
! %endif //wxLUA_USE_wxMetafile
--- 304,306 ----
  %endif
  
! %endif //wxLUA_USE_wxMetafile & wxUSE_METAFILE & (%msw|%mac|%os2)

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** data.i	22 Feb 2007 00:01:34 -0000	1.21
--- data.i	23 Feb 2007 04:35:30 -0000	1.22
***************
*** 101,105 ****
  // wxValidator
  
! %if wxLUA_USE_wxValidator
  
  %include "wx/validate.h"
--- 101,105 ----
  // wxValidator
  
! %if wxLUA_USE_wxValidator & wxUSE_VALIDATORS
  
  %include "wx/validate.h"
***************
*** 118,123 ****
  %endclass
  
- %endif //wxLUA_USE_wxValidator
- 
  //-----------------------------------------------------------------------------
  // wxTextValidator
--- 118,121 ----
***************
*** 181,184 ****
--- 179,183 ----
  
  %endif //wxLUA_USE_wxGenericValidator
+ %endif //wxLUA_USE_wxValidator & wxUSE_VALIDATORS
  
  //-----------------------------------------------------------------------------
***************
*** 376,379 ****
--- 375,380 ----
  // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong
  
+ //%if wxUSE_LONGLONG
+ 
  //%class %encapsulate %delete %noclassinfo wxLongLong
  //    wxLongLong(long hi = 0, unsigned long lo = 0)
***************
*** 393,394 ****
--- 394,397 ----
      //%operator wxLongLong operator-(const wxLongLong& ll) const
  //%endclass
+ 
+ //%endif wxUSE_LONGLONG

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** wx_datatypes.lua	22 Feb 2007 20:33:08 -0000	1.48
--- wx_datatypes.lua	23 Feb 2007 04:35:30 -0000	1.49
***************
*** 184,188 ****
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)",
      DefType = "class",
      IsNumber = false,
--- 184,188 ----
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)",
      DefType = "class",
[...3119 lines suppressed...]
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML",
      DefType = "class",
      IsNumber = false,
***************
*** 3455,3458 ****
--- 3462,3466 ----
    wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE",
    wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON",
+   wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL",
    wxUSE_BUILTIN_IODBC = "wxUSE_BUILTIN_IODBC",
    wxUSE_BUSYINFO = "wxUSE_BUSYINFO",
***************
*** 3463,3466 ****
--- 3471,3475 ----
    wxUSE_CHECKLISTBOX = "wxUSE_CHECKLISTBOX",
    wxUSE_CHOICE = "wxUSE_CHOICE",
+   wxUSE_CHOICEBOOK = "wxUSE_CHOICEBOOK",
    wxUSE_CHOICEDLG = "wxUSE_CHOICEDLG",
    wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD",

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** print.i	7 Dec 2006 06:32:42 -0000	1.11
--- print.i	23 Feb 2007 04:35:30 -0000	1.12
***************
*** 8,12 ****
  // ============================================================================
  
! %if wxLUA_USE_wxPrint
  
  %typedef wxPreviewWindow wxScrolledWindow
--- 8,12 ----
  // ============================================================================
  
! %if wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE
  
  %typedef wxPreviewWindow wxScrolledWindow
***************
*** 548,552 ****
  // wxPostScriptDC
  
! %if wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT
  
  %include "wx/dcps.h"
--- 548,552 ----
  // wxPostScriptDC
  
! %if wxUSE_POSTSCRIPT
  
  %include "wx/dcps.h"
***************
*** 559,563 ****
  %endclass
  
! %endif // wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT
  
  //-----------------------------------------------------------------------------
--- 559,563 ----
  %endclass
  
! %endif //wxUSE_POSTSCRIPT
  
  //-----------------------------------------------------------------------------
***************
*** 573,576 ****
  %endif // %msw|%mac
  
! %endif //wxLUA_USE_wxPrint
  
--- 573,576 ----
  %endif // %msw|%mac
  
! %endif //wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE
  

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** file.i	7 Dec 2006 06:32:42 -0000	1.13
--- file.i	23 Feb 2007 04:35:30 -0000	1.14
***************
*** 186,194 ****
  // wxFile
  
! %if wxLUA_USE_wxFile
  
  %include "wx/file.h"
  
! %enum wxFile::OpenMode            // FIXME!
      read
      write
--- 186,194 ----
  // wxFile
  
! %if wxLUA_USE_wxFile & wxUSE_FILE
  
  %include "wx/file.h"
  
! %enum wxFile::OpenMode
      read
      write
***************
*** 251,255 ****
  %endclass
  
! %endif //wxLUA_USE_wxFile
  
  //-----------------------------------------------------------------------------
--- 251,255 ----
  %endclass
  
! %endif //wxLUA_USE_wxFile & wxUSE_FILE
  
  //-----------------------------------------------------------------------------

Index: regex.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** regex.i	7 Dec 2006 06:32:42 -0000	1.5
--- regex.i	23 Feb 2007 04:35:30 -0000	1.6
***************
*** 11,15 ****
  //  wxRegEx - Regular expression support
  
! %if wxLUA_USE_wxRegEx
  
  %include "wx/regex.h"
--- 11,15 ----
  //  wxRegEx - Regular expression support
  
! %if wxLUA_USE_wxRegEx & wxUSE_REGEX
  
  %include "wx/regex.h"
***************
*** 49,52 ****
  %endclass
  
! %endif //wxLUA_USE_wxRegEx
  
--- 49,52 ----
  %endclass
  
! %endif //wxLUA_USE_wxRegEx & wxUSE_REGEX
  

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dialogs.i	7 Dec 2006 06:32:42 -0000	1.21
--- dialogs.i	23 Feb 2007 04:35:30 -0000	1.22
***************
*** 172,176 ****
  // wxColourDialog
  
! %if wxUSE_COLOURDLG & wxLUA_USE_wxColourDialog
  
  %include "wx/colordlg.h"
--- 172,176 ----
  // wxColourDialog
  
! %if wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG
  
  %include "wx/colordlg.h"
***************
*** 206,215 ****
  %endclass
  
! %endif // wxLUA_USE_wxColourDialog
  
  //-----------------------------------------------------------------------------
  // wxFileDialog
  
! %if wxLUA_USE_wxFileDialog
  
  %include "wx/filedlg.h"
--- 206,215 ----
  %endclass
  
! %endif // wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG
  
  //-----------------------------------------------------------------------------
  // wxFileDialog
  
! %if wxLUA_USE_wxFileDialog & wxUSE_FILEDLG
  
  %include "wx/filedlg.h"
***************
*** 247,256 ****
  %endclass
  
! %endif //wxLUA_USE_wxFileDialog
  
  //-----------------------------------------------------------------------------
  // wxDirDialog
  
! %if wxLUA_USE_wxDirDialog
  
  %define wxDD_DEFAULT_STYLE
--- 247,258 ----
  %endclass
  
! %endif //wxLUA_USE_wxFileDialog & wxUSE_FILEDLG
  
  //-----------------------------------------------------------------------------
  // wxDirDialog
  
! %if wxLUA_USE_wxDirDialog & wxUSE_DIRDLG
! 
! %include "wx/dirdlg.h"
  
  %define wxDD_DEFAULT_STYLE
***************
*** 273,282 ****
  %endclass
  
! %endif //wxLUA_USE_wxDirDialog
  
  //-----------------------------------------------------------------------------
  // wxMessageDialog
  
! %if wxLUA_USE_wxMessageDialog
  
  //%win %class wxMessageDialog, wxDialog FIXME need this for < 2.6 does 2.4 have it?
--- 275,284 ----
  %endclass
  
! %endif //wxLUA_USE_wxDirDialog & wxUSE_DIRDLG
  
  //-----------------------------------------------------------------------------
  // wxMessageDialog
  
! %if wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG
  
  //%win %class wxMessageDialog, wxDialog FIXME need this for < 2.6 does 2.4 have it?
***************
*** 289,293 ****
  %endclass
  
! %endif //wxLUA_USE_wxMessageDialog
  
  //-----------------------------------------------------------------------------
--- 291,295 ----
  %endclass
  
! %endif //wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG
  
  //-----------------------------------------------------------------------------

Index: geometry.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** geometry.i	7 Dec 2006 06:32:42 -0000	1.7
--- geometry.i	23 Feb 2007 04:35:30 -0000	1.8
***************
*** 8,12 ****
  // ============================================================================
  
! %if wxLUA_USE_Geometry
  
  %typedef wxInt32 int
--- 8,12 ----
  // ============================================================================
  
! %if wxLUA_USE_Geometry & wxUSE_GEOMETRY
  
  %typedef wxInt32 int
***************
*** 271,273 ****
  //%endclass
  
! %endif //wxLUA_USE_Geometry
--- 271,273 ----
  //%endclass
  
! %endif //wxLUA_USE_Geometry & wxUSE_GEOMETRY

Index: xml.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xml.i	7 Dec 2006 06:32:42 -0000	1.5
--- xml.i	23 Feb 2007 04:35:30 -0000	1.6
***************
*** 7,11 ****
  // ============================================================================
  
! %if wxLUA_USE_wxXMLResource
  
  !%wxchkver25 %include "wx/xrc/xml.h"
--- 7,11 ----
  // ============================================================================
  
! %if wxLUA_USE_wxXMLResource & wxUSE_XML
  
  !%wxchkver25 %include "wx/xrc/xml.h"
***************
*** 172,174 ****
  %endclass
  
! %endif //wxLUA_USE_wxXMLResource
--- 172,174 ----
  %endclass
  
! %endif //wxLUA_USE_wxXMLResource & wxUSE_XML

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** windows.i	9 Feb 2007 05:17:08 -0000	1.25
--- windows.i	23 Feb 2007 04:35:30 -0000	1.26
***************
*** 350,354 ****
  // wxBookCtrlBase
  
! %if wxLUA_USE_wxNotebook
  
  %include "wx/bookctrl.h"
--- 350,354 ----
  // wxBookCtrlBase
  
! %if wxLUA_USE_wxNotebook & wxUSE_BOOKCTRL
  
  %include "wx/bookctrl.h"
***************
*** 398,407 ****
  %endclass
  
! %endif //wxLUA_USE_wxNotebook
  
  //-----------------------------------------------------------------------------
  // wxNotebook
  
! %if wxLUA_USE_wxNotebook
  
  %include "wx/notebook.h"
--- 398,407 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxUSE_BOOKCTRL
  
  //-----------------------------------------------------------------------------
  // wxNotebook
  
! %if wxLUA_USE_wxNotebook & wxUSE_NOTEBOOK
  
  %include "wx/notebook.h"
***************
*** 483,492 ****
  %endclass
  
! %endif //wxLUA_USE_wxNotebook
  
  //-----------------------------------------------------------------------------
  // wxListbook
  
! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl
  
  %include "wx/listbook.h"
--- 483,492 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxUSE_NOTEBOOK
  
  //-----------------------------------------------------------------------------
  // wxListbook
  
! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl & wxUSE_LISTBOOK
  
  %include "wx/listbook.h"
***************
*** 527,536 ****
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl
  
  //-----------------------------------------------------------------------------
  // wxChoicebook
  
! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice
  
  %include "wx/choicebk.h"
--- 527,536 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl & wxUSE_LISTBOOK
  
  //-----------------------------------------------------------------------------
  // wxChoicebook
  
! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice & wxUSE_CHOICEBOOK
  
  %include "wx/choicebk.h"
***************
*** 571,582 ****
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice
  
  //-----------------------------------------------------------------------------
  // wxTabCtrl
  
! %if wxLUA_USE_wxTabCtrl
  
- %if %wxchkver24 & %msw
  %include "wx/tabctrl.h"
  
--- 571,581 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice & wxUSE_CHOICEBOOK
  
  //-----------------------------------------------------------------------------
  // wxTabCtrl
  
! %if %wxchkver24 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG // note: wxUSE_TAB_DIALOG is correct
  
  %include "wx/tabctrl.h"
  
***************
*** 631,642 ****
  %endclass
  
! %endif
! 
! %endif //wxLUA_USE_wxTabCtrl
  
  //-----------------------------------------------------------------------------
  // wxSashWindow
  
! %if wxLUA_USE_wxSashWindow
  
  %include "wx/sashwin.h"
--- 630,639 ----
  %endclass
  
! %endif //%wxchkver24 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG
  
  //-----------------------------------------------------------------------------
  // wxSashWindow
  
! %if wxLUA_USE_wxSashWindow & wxUSE_SASH
  
  %include "wx/sashwin.h"
***************
*** 800,804 ****
  %endclass
  
! %endif //wxLUA_USE_wxSashWindow
  
  //-----------------------------------------------------------------------------
--- 797,801 ----
  %endclass
  
! %endif //wxLUA_USE_wxSashWindow & wxUSE_SASH
  
  //-----------------------------------------------------------------------------
***************
*** 915,919 ****
  // wxStaticBox
  
! %if wxLUA_USE_wxStaticBox
  
  %include "wx/statbox.h"
--- 912,916 ----
  // wxStaticBox
  
! %if wxLUA_USE_wxStaticBox & wxUSE_STATBOX
  
  %include "wx/statbox.h"
***************
*** 926,935 ****
  %endclass
  
! %endif //wxLUA_USE_wxStaticBox
  
  //-----------------------------------------------------------------------------
  // wxStaticBitmap
  
! %if wxLUA_USE_wxStaticBitmap
  
  %include "wx/statbmp.h"
--- 923,932 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticBox & wxUSE_STATBOX
  
  //-----------------------------------------------------------------------------
  // wxStaticBitmap
  
! %if wxLUA_USE_wxStaticBitmap & wxUSE_STATBMP
  
  %include "wx/statbmp.h"
***************
*** 946,955 ****
  %endclass
  
! %endif //wxLUA_USE_wxStaticBitmap
  
  //-----------------------------------------------------------------------------
  // wxStaticText
  
! %if wxLUA_USE_wxStaticText
  
  %include "wx/stattext.h"
--- 943,952 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticBitmap & wxUSE_STATBMP
  
  //-----------------------------------------------------------------------------
  // wxStaticText
  
! %if wxLUA_USE_wxStaticText & wxUSE_STATTEXT
  
  %include "wx/stattext.h"
***************
*** 969,978 ****
  %endclass
  
! %endif //wxLUA_USE_wxStaticText
  
  //-----------------------------------------------------------------------------
  // wxStaticLine
  
! %if wxLUA_USE_wxStaticLine
  
  %include "wx/statline.h"
--- 966,975 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticText & wxUSE_STATTEXT
  
  //-----------------------------------------------------------------------------
  // wxStaticLine
  
! %if wxLUA_USE_wxStaticLine & wxUSE_STATLINE
  
  %include "wx/statline.h"
***************
*** 992,994 ****
  %endclass
  
! %endif //wxLUA_USE_wxStaticLine
--- 989,991 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticLine & wxUSE_STATLINE

Index: thread.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/thread.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thread.i	17 May 2006 05:02:04 -0000	1.4
--- thread.i	23 Feb 2007 04:35:30 -0000	1.5
***************
*** 11,17 ****
  // wxCriticalSection
  
! %if wxLUA_USE_wxCriticalSection
  
  %include "wx/thread.h"
  %class %encapsulate %noclassinfo wxCriticalSection
      wxCriticalSection()
--- 11,18 ----
  // wxCriticalSection
  
! %if wxLUA_USE_wxCriticalSection & wxUSE_THREADS
  
  %include "wx/thread.h"
+ 
  %class %encapsulate %noclassinfo wxCriticalSection
      wxCriticalSection()
***************
*** 28,35 ****
  
  %include "wx/thread.h"
  %class %encapsulate %noclassinfo wxCriticalSectionLocker
      wxCriticalSectionLocker(wxCriticalSection& cs);
  %endclass
  
! %endif // wxLUA_USE_wxCriticalSectionLocker
  
--- 29,37 ----
  
  %include "wx/thread.h"
+ 
  %class %encapsulate %noclassinfo wxCriticalSectionLocker
      wxCriticalSectionLocker(wxCriticalSection& cs);
  %endclass
  
! %endif // wxLUA_USE_wxCriticalSectionLocker & wxUSE_THREADS
  

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** gdi.i	4 Jan 2007 23:28:04 -0000	1.36
--- gdi.i	23 Feb 2007 04:35:30 -0000	1.37
***************
*** 631,635 ****
  // wxPalette
  
! %if wxLUA_USE_wxPalette
  
  %include "wx/palette.h"
--- 631,635 ----
  // wxPalette
  
! %if wxLUA_USE_wxPalette & wxUSE_PALETTE
  
  %include "wx/palette.h"
***************
*** 649,653 ****
  %endclass
  
! %endif //wxLUA_USE_wxPalette
  
  //-----------------------------------------------------------------------------
--- 649,653 ----
  %endclass
  
! %endif //wxLUA_USE_wxPalette & wxUSE_PALETTE
  
  //-----------------------------------------------------------------------------
***************
*** 843,846 ****
--- 843,848 ----
  %if wxLUA_USE_wxMask
  
+ %include "wx/bitmap.h"
+ 
  %class wxMask, wxObject
      wxMask(const wxBitmap& bitmap)
***************
*** 1009,1014 ****
--- 1011,1018 ----
      void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
      void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20)
+     //%if wxUSE_SPLINES
      //void DrawSpline(int n, wxPoint points[])
      //void DrawSpline(wxList *points)
+     //%endif wxUSE_SPLINES
      void DrawText(const wxString& text, wxCoord x, wxCoord y)
      void EndDoc()
***************
*** 1175,1179 ****
  // wxCaret
  
! %if wxLUA_USE_wxCaret
  
  %include "wx/caret.h"
--- 1179,1183 ----
  // wxCaret
  
! %if wxLUA_USE_wxCaret & wxUSE_CARET
  
  %include "wx/caret.h"
***************
*** 1213,1217 ****
  %endclass
  
! %endif //wxLUA_USE_wxCaret
  
  
--- 1217,1221 ----
  %endclass
  
! %endif //wxLUA_USE_wxCaret & wxUSE_CARET
  
  
***************
*** 1317,1321 ****
  %endclass
  
- 
  //-----------------------------------------------------------------------------
  // wxDisplay
--- 1321,1324 ----

Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** html.i	7 Dec 2006 06:32:42 -0000	1.12
--- html.i	23 Feb 2007 04:35:30 -0000	1.13
***************
*** 8,12 ****
  // ============================================================================
  
! %if wxLUA_USE_wxHTML
  
  //-----------------------------------------------------------------------------
--- 8,12 ----
  // ============================================================================
  
! %if wxLUA_USE_wxHTML & wxUSE_HTML
  
  //-----------------------------------------------------------------------------
***************
*** 382,384 ****
  %endclass
  
! %endif //wxLUA_USE_wxHTML
--- 382,384 ----
  %endclass
  
! %endif //wxLUA_USE_wxHTML & wxUSE_HTML

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** appframe.i	19 Dec 2006 06:18:02 -0000	1.25
--- appframe.i	23 Feb 2007 04:35:30 -0000	1.26
***************
*** 215,219 ****
  // wxStatusBar
  
! %if wxLUA_USE_wxStatusBar
  
  %include "wx/statusbr.h"
--- 215,219 ----
  // wxStatusBar
  
! %if wxLUA_USE_wxStatusBar & wxUSE_STATUSBAR
  
  %include "wx/statusbr.h"
***************
*** 248,257 ****
  %endclass
  
! %endif //wxLUA_USE_wxStatusBar
  
  //-----------------------------------------------------------------------------
  // wxTooltip
  
! %if wxLUA_USE_wxTooltip
  
  %include "wx/tooltip.h"
--- 248,257 ----
  %endclass
  
! %endif //wxLUA_USE_wxStatusBar & wxUSE_STATUSBAR
  
  //-----------------------------------------------------------------------------
  // wxTooltip
  
! %if wxLUA_USE_wxTooltip & wxUSE_TOOLTIPS
  
  %include "wx/tooltip.h"
***************
*** 270,279 ****
  %endclass
  
! %endif //wxLUA_USE_wxTooltip
  
  //-----------------------------------------------------------------------------
  // wxAcceleratorTable
  
! %if wxLUA_USE_wxAcceleratorTable
  
  %include "wx/accel.h"
--- 270,279 ----
  %endclass
  
! %endif //wxLUA_USE_wxTooltip & wxUSE_TOOLTIPS
  
  //-----------------------------------------------------------------------------
  // wxAcceleratorTable
  
! %if wxLUA_USE_wxAcceleratorTable & wxUSE_ACCEL
  
  %include "wx/accel.h"
***************
*** 304,307 ****
--- 304,308 ----
      wxACCEL_CTRL
      wxACCEL_SHIFT
+     wxACCEL_CMD // Command key on OS X else ctrl
  %endenum
  
***************
*** 325,334 ****
  %endclass
  
! %endif //wxLUA_USE_wxAcceleratorTable
  
  //-----------------------------------------------------------------------------
  // wxTaskBarIcon
  
! %if wxLUA_USE_wxTaskBarIcon
  
  %include "wx/taskbar.h"
--- 326,335 ----
  %endclass
  
! %endif //wxLUA_USE_wxAcceleratorTable & wxUSE_ACCEL
  
  //-----------------------------------------------------------------------------
  // wxTaskBarIcon
  
! %if wxLUA_USE_wxTaskBarIcon & defined(wxHAS_TASK_BAR_ICON)
  
  %include "wx/taskbar.h"
***************
*** 345,350 ****
  %endclass
  
  %class %noclassinfo wxTaskBarIconEvent, wxEvent
!     // no constructor since you only respond to this event
  
      %define %event wxEVT_TASKBAR_MOVE
--- 346,354 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxTaskBarIconEvent
+ 
  %class %noclassinfo wxTaskBarIconEvent, wxEvent
!     wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon)
  
      %define %event wxEVT_TASKBAR_MOVE
***************
*** 357,361 ****
  %endclass
  
! %endif //wxLUA_USE_wxTaskBarIcon
  
  //-----------------------------------------------------------------------------
--- 361,365 ----
  %endclass
  
! %endif //wxLUA_USE_wxTaskBarIcon & defined(wxHAS_TASK_BAR_ICON)
  
  //-----------------------------------------------------------------------------
***************
*** 477,480 ****
--- 481,488 ----
      %staticonly wxFont   GetFont(wxSystemFont index)
      %staticonly int      GetMetric(wxSystemMetric index, wxWindow* win = NULL)
+     %staticonly bool     HasFeature(wxSystemFeature index)
+ 
+     %staticonly wxSystemScreenType GetScreenType()
+     %staticonly void     SetScreenType( wxSystemScreenType screen )
  %endclass
  
***************
*** 495,500 ****
      %staticonly bool HasOption(const wxString& name) const
      %staticonly bool IsFalse(const wxString& name) const
!     %staticonly void SetOption(const wxString& name, const wxString& value)
!     %rename SetOptionInt %staticonly void SetOption(const wxString& name, int value)
  %endclass
  
--- 503,511 ----
      %staticonly bool HasOption(const wxString& name) const
      %staticonly bool IsFalse(const wxString& name) const
! 
!     %if wxUSE_SYSTEM_OPTIONS
!         %staticonly void SetOption(const wxString& name, const wxString& value)
!         %rename SetOptionInt %staticonly void SetOption(const wxString& name, int value)
!     %endif //wxUSE_SYSTEM_OPTIONS
  %endclass
  

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** defsutil.i	7 Dec 2006 06:32:42 -0000	1.30
--- defsutil.i	23 Feb 2007 04:35:30 -0000	1.31
***************
*** 606,610 ****
  // wxBusyInfo
  
! %if wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO
  
  %include "wx/busyinfo.h"
--- 606,610 ----
  // wxBusyInfo
  
! %if wxLUA_USE_wxBusyInfo & wxUSE_BUSYINFO
  
  %include "wx/busyinfo.h"
***************
*** 615,617 ****
  %endclass
  
! %endif //wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO
--- 615,617 ----
  %endclass
  
! %endif //wxLUA_USE_wxBusyInfo & wxUSE_BUSYINFO

Index: event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** event.i	7 Dec 2006 06:32:42 -0000	1.17
--- event.i	23 Feb 2007 04:35:30 -0000	1.18
***************
*** 635,638 ****
--- 635,640 ----
  // wxWindowCreateEvent
  
+ %include "wx/event.h"
+ 
  %class wxWindowCreateEvent, wxCommandEvent
      %define %event wxEVT_CREATE
***************
*** 646,649 ****
--- 648,653 ----
  // wxWindowDestroyEvent
  
+ %include "wx/event.h"
+ 
  %class wxWindowDestroyEvent, wxCommandEvent
      %define %event wxEVT_DESTROY
***************
*** 725,728 ****
--- 729,734 ----
  // wxHelpEvent
  
+ %include "wx/event.h"
+ 
  %class %delete wxHelpEvent, wxCommandEvent
      %define %event wxEVT_HELP

Index: config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config.i	7 Dec 2006 06:32:42 -0000	1.13
--- config.i	23 Feb 2007 04:35:30 -0000	1.14
***************
*** 13,17 ****
  // wxConfigBase
  
! %if wxLUA_USE_wxConfig
  
  %include "wx/confbase.h"
--- 13,17 ----
  // wxConfigBase
  
! %if wxLUA_USE_wxConfig & wxUSE_CONFIG
  
  %include "wx/confbase.h"
***************
*** 125,127 ****
  %endclass
  
! %endif //wxLUA_USE_wxConfig
--- 125,127 ----
  %endclass
  
! %endif //wxLUA_USE_wxConfig & wxUSE_CONFIG

Index: mdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/mdi.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mdi.i	7 Dec 2006 06:32:42 -0000	1.9
--- mdi.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 8,12 ****
  // ============================================================================
  
! %if wxLUA_USE_MDI
  
  %include "wx/cmdproc.h"
--- 8,12 ----
  // ============================================================================
  
! %if wxLUA_USE_MDI & wxUSE_MDI & wxUSE_DOC_VIEW_ARCHITECTURE
  
  %include "wx/cmdproc.h"
***************
*** 283,287 ****
  %endclass
  
! %endif //wxLUA_USE_MDI
  
  //-----------------------------------------------------------------------------
--- 283,287 ----
  %endclass
  
! %endif //wxLUA_USE_MDI & wxUSE_MDI & wxUSE_DOC_VIEW_ARCHITECTURE
  
  //-----------------------------------------------------------------------------
***************
*** 337,341 ****
  // wxFileHistory
  
! %if wxLUA_USE_wxFileHistory
  
  %include "wx/docview.h"
--- 337,341 ----
  // wxFileHistory
  
! %if wxLUA_USE_wxFileHistory & wxUSE_DOC_VIEW_ARCHITECTURE
  
  %include "wx/docview.h"
***************
*** 357,360 ****
  %endclass
  
! %endif //wxLUA_USE_wxFileHistory
  
--- 357,360 ----
  %endclass
  
! %endif //wxLUA_USE_wxFileHistory & wxUSE_DOC_VIEW_ARCHITECTURE
  

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** image.i	7 Dec 2006 06:32:42 -0000	1.15
--- image.i	23 Feb 2007 04:35:30 -0000	1.16
***************
*** 8,24 ****
  // ============================================================================
  
- %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_X
- %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_Y
- 
- %define %string wxIMAGE_OPTION_PNG_FORMAT
- %define %string wxIMAGE_OPTION_PNG_BITDEPTH
- 
- %define %string wxIMAGE_OPTION_QUALITY        _T("quality")
- %define %string wxIMAGE_OPTION_FILENAME       _T("FileName")
- %define %string wxIMAGE_OPTION_RESOLUTION     _T("Resolution")
- %define %string wxIMAGE_OPTION_RESOLUTIONX    _T("ResolutionX")
- %define %string wxIMAGE_OPTION_RESOLUTIONY    _T("ResolutionY")
- %define %string wxIMAGE_OPTION_RESOLUTIONUNIT _T("ResolutionUnit")
- 
  %enum
      wxIMAGE_RESOLUTION_INCHES
--- 8,11 ----
***************
*** 68,75 ****
  // wxImage
  
! %if wxLUA_USE_wxImage
  
  %include "wx/image.h"
  
  %class %delete wxImage, wxObject
      %define %object wxNullImage
--- 55,76 ----
  // wxImage
  
! %if wxLUA_USE_wxImage & wxUSE_IMAGE
  
  %include "wx/image.h"
  
+ %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_X
+ %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_Y
+ 
+ %define %string wxIMAGE_OPTION_PNG_FORMAT
+ %define %string wxIMAGE_OPTION_PNG_BITDEPTH
+ 
+ %define %string wxIMAGE_OPTION_QUALITY        _T("quality")
+ %define %string wxIMAGE_OPTION_FILENAME       _T("FileName")
+ %define %string wxIMAGE_OPTION_RESOLUTION     _T("Resolution")
+ %define %string wxIMAGE_OPTION_RESOLUTIONX    _T("ResolutionX")
+ %define %string wxIMAGE_OPTION_RESOLUTIONY    _T("ResolutionY")
+ %define %string wxIMAGE_OPTION_RESOLUTIONUNIT _T("ResolutionUnit")
+ 
+ 
  %class %delete wxImage, wxObject
      %define %object wxNullImage
***************
*** 225,229 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 226,230 ----
  %endclass
  
! %endif // wxUSE_ICO_CUR
  
  //-----------------------------------------------------------------------------
***************
*** 232,236 ****
  %include "wx/imagiff.h"
  
! %if wxUSE_IMAGE && wxUSE_IFF
  
  %class wxIFFHandler, wxImageHandler
--- 233,237 ----
  %include "wx/imagiff.h"
  
! %if wxUSE_IFF
  
  %class wxIFFHandler, wxImageHandler
***************
*** 238,242 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 239,243 ----
  %endclass
  
! %endif //wxUSE_IFF
  
  //-----------------------------------------------------------------------------
***************
*** 251,255 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 252,256 ----
  %endclass
  
! %endif //wxUSE_GIF
  
  //-----------------------------------------------------------------------------
***************
*** 264,268 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 265,269 ----
  %endclass
  
! %endif //wxUSE_LIBJPEG
  
  //-----------------------------------------------------------------------------
***************
*** 277,281 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 278,282 ----
  %endclass
  
! %endif //wxUSE_PCX
  
  //-----------------------------------------------------------------------------
***************
*** 296,300 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 297,301 ----
  %endclass
  
! %endif //wxUSE_LIBPNG
  
  //-----------------------------------------------------------------------------
***************
*** 309,313 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 310,314 ----
  %endclass
  
! %endif //wxUSE_PNM
  
  //-----------------------------------------------------------------------------
***************
*** 327,331 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 328,332 ----
  %endclass
  
! %endif //wxUSE_LIBTIFF
  
  //-----------------------------------------------------------------------------
***************
*** 339,343 ****
  
  
! %endif //wxLUA_USE_wxImage
  
  //-----------------------------------------------------------------------------
--- 340,344 ----
  
  
! %endif //wxLUA_USE_wxImage & wxUSE_IMAGE
  
  //-----------------------------------------------------------------------------

Index: help.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** help.i	7 Dec 2006 06:32:42 -0000	1.9
--- help.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 8,17 ****
  // ============================================================================
  
- %if wxUSE_HELP
- 
  //-----------------------------------------------------------------------------
  // wxHelpController and derived help controller classes
  
! %if wxLUA_USE_wxHelpController
  
  %include "wx/help.h"
--- 8,15 ----
  // ============================================================================
  
  //-----------------------------------------------------------------------------
  // wxHelpController and derived help controller classes
  
! %if wxLUA_USE_wxHelpController & wxUSE_HELP
  
  %include "wx/help.h"
***************
*** 52,56 ****
      wxWinHelpController()
  %endclass
! %endif
  
  //-----------------------------------------------------------------------------
--- 50,54 ----
      wxWinHelpController()
  %endclass
! %endif //%msw
  
  //-----------------------------------------------------------------------------
***************
*** 68,72 ****
  %class %noclassinfo wxBestHelpController, wxHelpController
  %endclass
! %endif
  
  //-----------------------------------------------------------------------------
--- 66,70 ----
  %class %noclassinfo wxBestHelpController, wxHelpController
  %endclass
! %endif //%msw
  
  //-----------------------------------------------------------------------------
***************
*** 78,88 ****
      wxExtHelpController()
  %endclass
! %endif
  
  //-----------------------------------------------------------------------------
  // wxHtmlHelpData
  
! %if wxUSE_WXHTML_HELP
! %if wxLUA_USE_wxHtmlHelpController
  
  //%if !%wxchkver25|%wxcompat24
--- 76,85 ----
      wxExtHelpController()
  %endclass
! %endif //!%win
  
  //-----------------------------------------------------------------------------
  // wxHtmlHelpData
  
! %if wxLUA_USE_wxHtmlHelpController & wxUSE_WXHTML_HELP
  
  //%if !%wxchkver25|%wxcompat24
***************
*** 183,188 ****
  %endclass
  
! %endif //wxUSE_WXHTML_HELP
! %endif //wxLUA_USE_wxHtmlHelpController
! %endif //wxLUA_USE_wxHelpController
! %endif //wxUSE_HELP
--- 180,183 ----
  %endclass
  
! %endif //wxLUA_USE_wxHtmlHelpController & wxUSE_WXHTML_HELP
! %endif //wxLUA_USE_wxHelpController & wxUSE_HELP

Index: socket.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/socket.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** socket.i	7 Dec 2006 06:32:42 -0000	1.9
--- socket.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 8,12 ****
  // ============================================================================
  
! %if wxLUA_USE_wxSocket
  
  //-----------------------------------------------------------------------------
--- 8,12 ----
  // ============================================================================
  
! %if wxLUA_USE_wxSocket & wxUSE_SOCKETS
  
  //-----------------------------------------------------------------------------
***************
*** 192,195 ****
--- 192,197 ----
  //  wxProtocol
  
+ %if wxUSE_PROTOCOL
+ 
  %include "wx/protocol/protocol.h"
  
***************
*** 219,226 ****
--- 221,233 ----
  %endclass
  
+ %endif //wxUSE_PROTOCOL
+ 
  //-----------------------------------------------------------------------------
  //  wxHTTP
  
+ %if wxUSE_PROTOCOL_HTTP
+ 
  %include "wx/protocol/http.h"
+ 
  %class %delete %noclassinfo wxHTTP, wxProtocol
      wxHTTP()
***************
*** 232,238 ****
--- 239,249 ----
  %endclass
  
+ %endif //wxUSE_PROTOCOL_HTTP
+ 
  //-----------------------------------------------------------------------------
  //  wxFTP
  
+ %if wxUSE_PROTOCOL_FTP
+ 
  %include "wx/protocol/ftp.h"
  
***************
*** 270,273 ****
--- 281,286 ----
  %endclass
  
+ %endif //wxUSE_PROTOCOL_FTP
+ 
  //-----------------------------------------------------------------------------
  //  wxURI
***************
*** 333,336 ****
--- 346,351 ----
  //  wxURL
  
+ %if wxUSE_URL
+ 
  %include "wx/url.h"
  
***************
*** 364,367 ****
--- 379,384 ----
  %endclass
  
+ %endif //wxUSE_URL
+ 
  //-----------------------------------------------------------------------------
  ////  wxConnectionBase
***************
*** 417,419 ****
  //
  
! %endif //wxLUA_USE_wxSocket
--- 434,436 ----
  //
  
! %endif //wxLUA_USE_wxSocket & wxUSE_SOCKETS

Index: grid.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/grid.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** grid.i	7 Dec 2006 06:32:42 -0000	1.10
--- grid.i	23 Feb 2007 04:35:30 -0000	1.11
***************
*** 8,12 ****
  // ============================================================================
  
! %if wxLUA_USE_wxGrid
  
  %include "wx/grid.h"
--- 8,12 ----
  // ============================================================================
  
! %if wxLUA_USE_wxGrid & wxUSE_GRID
  
  %include "wx/grid.h"
***************
*** 765,767 ****
  %endclass
  
! %endif //wxLUA_USE_wxGrid
--- 765,767 ----
  %endclass
  
! %endif //wxLUA_USE_wxGrid & wxUSE_GRID

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** controls.i	19 Jan 2007 04:17:38 -0000	1.25
--- controls.i	23 Feb 2007 04:35:30 -0000	1.26
***************
*** 11,15 ****
  // wxButton
  
! %if wxLUA_USE_wxButton
  
  %include "wx/button.h"
--- 11,15 ----
  // wxButton
  
! %if wxLUA_USE_wxButton & wxUSE_BUTTON
  
  %include "wx/button.h"
***************
*** 39,43 ****
  // wxBitmapButton
  
! %if wxLUA_USE_wxBitmapButton
  
  %include "wx/bmpbuttn.h"
--- 39,43 ----
  // wxBitmapButton
  
! %if wxLUA_USE_wxBitmapButton & wxUSE_BMPBUTTON
  
  %include "wx/bmpbuttn.h"
***************
*** 63,73 ****
  %endclass
  
! %endif //wxLUA_USE_wxBitmapButton
! %endif //wxLUA_USE_wxButton
  
  //-----------------------------------------------------------------------------
  // wxToggleButton
  
! %if wxLUA_USE_wxToggleButton
  
  %include "wx/tglbtn.h"
--- 63,73 ----
  %endclass
  
! %endif //wxLUA_USE_wxBitmapButton & wxUSE_BMPBUTTON
! %endif //wxLUA_USE_wxButton & wxUSE_BUTTON
  
  //-----------------------------------------------------------------------------
  // wxToggleButton
  
! %if wxLUA_USE_wxToggleButton & wxUSE_TOGGLEBTN
  
  %include "wx/tglbtn.h"
***************
*** 85,94 ****
  %endclass
  
! %endif //wxLUA_USE_wxToggleButton
  
  //-----------------------------------------------------------------------------
  // wxCheckBox
  
! %if wxLUA_USE_wxCheckBox
  
  %include "wx/checkbox.h"
--- 85,94 ----
  %endclass
  
! %endif //wxLUA_USE_wxToggleButton & wxUSE_TOGGLEBTN
  
  //-----------------------------------------------------------------------------
  // wxCheckBox
  
! %if wxLUA_USE_wxCheckBox & wxUSE_CHECKBOX
  
  %include "wx/checkbox.h"
***************
*** 120,129 ****
  %endclass
  
! %endif //wxLUA_USE_wxCheckBox
  
  //-----------------------------------------------------------------------------
  // wxControlWithItems
  
! %if wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox
  
  %include "wx/ctrlsub.h"
--- 120,129 ----
  %endclass
  
! %endif //wxLUA_USE_wxCheckBox & wxUSE_CHECKBOX
  
  //-----------------------------------------------------------------------------
  // wxControlWithItems
  
! %if (wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox) & wxUSE_CONTROLS
  
  %include "wx/ctrlsub.h"
***************
*** 165,174 ****
  %endclass
  
! %endif //wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox
  
  //-----------------------------------------------------------------------------
  // wxChoice
  
! %if wxLUA_USE_wxChoice
  
  %include "wx/choice.h"
--- 165,174 ----
  %endclass
  
! %endif //(wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox) & wxUSE_CONTROLS
  
  //-----------------------------------------------------------------------------
  // wxChoice
  
! %if wxLUA_USE_wxChoice & wxUSE_CHOICE
  
  %include "wx/choice.h"
***************
*** 184,193 ****
  %endclass
  
! %endif //wxLUA_USE_wxChoice
  
  //-----------------------------------------------------------------------------
  // wxComboBox
  
! %if wxUSE_COMBOBOX & wxLUA_USE_wxComboBox
  
  %include "wx/combobox.h"
--- 184,193 ----
  %endclass
  
! %endif //wxLUA_USE_wxChoice & wxUSE_CHOICE
  
  //-----------------------------------------------------------------------------
  // wxComboBox
  
! %if wxLUA_USE_wxComboBox & wxUSE_COMBOBOX
  
  %include "wx/combobox.h"
***************
*** 227,236 ****
  %endclass
  
! %endif //wxUSE_COMBOBOX & wxLUA_USE_wxComboBox
  
  //-----------------------------------------------------------------------------
  // wxGauge
  
! %if wxUSE_GAUGE & wxLUA_USE_wxGauge
  
  %include "wx/gauge.h"
--- 227,236 ----
  %endclass
  
! %endif //wxLUA_USE_wxComboBox & wxUSE_COMBOBOX
  
  //-----------------------------------------------------------------------------
  // wxGauge
  
! %if wxLUA_USE_wxGauge & wxUSE_GAUGE
  
  %include "wx/gauge.h"
***************
*** 262,271 ****
  %endclass
  
! %endif //wxUSE_GAUGE & wxLUA_USE_wxGauge
  
  //-----------------------------------------------------------------------------
  // wxListBox
  
! %if wxUSE_LISTBOX & wxLUA_USE_wxListBox
  
  %include "wx/listbox.h"
--- 262,271 ----
  %endclass
  
! %endif //wxLUA_USE_wxGauge & wxUSE_GAUGE
  
  //-----------------------------------------------------------------------------
  // wxListBox
  
! %if wxLUA_USE_wxListBox & wxUSE_LISTBOX
  
  %include "wx/listbox.h"
***************
*** 302,306 ****
  // wxCheckListBox
  
! %if wxUSE_CHECKLISTBOX & wxLUA_USE_wxCheckListBox
  
  %include "wx/checklst.h"
--- 302,306 ----
  // wxCheckListBox
  
! %if wxLUA_USE_wxCheckListBox & wxUSE_CHECKLISTBOX
  
  %include "wx/checklst.h"
***************
*** 315,325 ****
  %endclass
  
! %endif //wxUSE_CHECKLISTBOX & wxLUA_USE_wxCheckListBox
! %endif //wxUSE_LISTBOX & wxLUA_USE_wxListBox
  
  //-----------------------------------------------------------------------------
  // wxListCtrl
  
! %if wxUSE_LISTCTRL & wxLUA_USE_wxListCtrl
  
  %include "wx/listctrl.h"
--- 315,325 ----
  %endclass
  
! %endif //wxLUA_USE_wxCheckListBox & wxUSE_CHECKLISTBOX
! %endif //wxLUA_USE_wxListBox & wxUSE_LISTBOX
  
  //-----------------------------------------------------------------------------
  // wxListCtrl
  
! %if wxLUA_USE_wxListCtrl & wxUSE_LISTCTRL
  
  %include "wx/listctrl.h"
***************
*** 618,627 ****
  %endclass
  
! %endif //wxUSE_LISTCTRL & wxLUA_USE_wxListCtrl
  
  //-----------------------------------------------------------------------------
  // wxRadioBox
  
! %if wxUSE_RADIOBOX & wxLUA_USE_wxRadioBox
  
  %include "wx/radiobox.h"
--- 618,627 ----
  %endclass
  
! %endif //wxLUA_USE_wxListCtrl & wxUSE_LISTCTRL
  
  //-----------------------------------------------------------------------------
  // wxRadioBox
  
! %if wxLUA_USE_wxRadioBox & wxUSE_RADIOBOX
  
  %include "wx/radiobox.h"
***************
*** 662,671 ****
  %endclass
  
! %endif //wxUSE_RADIOBOX & wxLUA_USE_wxRadioBox
  
  //-----------------------------------------------------------------------------
  // wxRadioButton
  
! %if wxUSE_RADIOBTN & wxLUA_USE_wxRadioButton
  
  %include "wx/radiobut.h"
--- 662,671 ----
  %endclass
  
! %endif //wxLUA_USE_wxRadioBox & wxUSE_RADIOBOX
  
  //-----------------------------------------------------------------------------
  // wxRadioButton
  
! %if wxLUA_USE_wxRadioButton & wxUSE_RADIOBTN
  
  %include "wx/radiobut.h"
***************
*** 686,695 ****
  %endclass
  
! %endif //wxUSE_RADIOBTN & wxLUA_USE_wxRadioButton
  
  //-----------------------------------------------------------------------------
  // wxScrollBar
  
! %if wxLUA_USE_wxScrollBar
  
  %include "wx/scrolbar.h"
--- 686,695 ----
  %endclass
  
! %endif //wxLUA_USE_wxRadioButton & wxUSE_RADIOBTN
  
  //-----------------------------------------------------------------------------
  // wxScrollBar
  
! %if wxLUA_USE_wxScrollBar & wxUSE_SCROLLBAR
  
  %include "wx/scrolbar.h"
***************
*** 715,724 ****
  %endclass
  
! %endif //wxLUA_USE_wxScrollBar
  
  //-----------------------------------------------------------------------------
  // wxSlider
  
! %if wxLUA_USE_wxSlider
  
  %include "wx/slider.h"
--- 715,724 ----
  %endclass
  
! %endif //wxLUA_USE_wxScrollBar & wxUSE_SCROLLBAR
  
  //-----------------------------------------------------------------------------
  // wxSlider
  
! %if wxLUA_USE_wxSlider & wxUSE_SLIDER
  
  %include "wx/slider.h"
***************
*** 771,780 ****
  %endclass
  
! %endif //wxLUA_USE_wxSlider
  
  //-----------------------------------------------------------------------------
  // wxSpinButton
  
! %if wxLUA_USE_wxSpinButton
  
  %include "wx/spinbutt.h"
--- 771,780 ----
  %endclass
  
! %endif //wxLUA_USE_wxSlider & wxUSE_SLIDER
  
  //-----------------------------------------------------------------------------
  // wxSpinButton
  
! %if wxLUA_USE_wxSpinButton & wxUSE_SPINBTN
  
  %include "wx/spinbutt.h"
***************
*** 820,829 ****
  %endclass
  
! %endif //wxLUA_USE_wxSpinButton
  
  //-----------------------------------------------------------------------------
  // wxSpinCtrl
  
! %if wxLUA_USE_wxSpinCtrl
  
  %include "wx/spinctrl.h"
--- 820,829 ----
  %endclass
  
! %endif //wxLUA_USE_wxSpinButton & wxUSE_SPINBTN
  
  //-----------------------------------------------------------------------------
  // wxSpinCtrl
  
! %if wxLUA_USE_wxSpinCtrl & wxUSE_SPINCTRL
  
  %include "wx/spinctrl.h"
***************
*** 850,859 ****
  %endclass
  
! %endif //wxLUA_USE_wxSpinCtrl
  
  //-----------------------------------------------------------------------------
  // wxTextCtrl
  
! %if wxLUA_USE_wxTextCtrl
  
  %include "wx/textctrl.h"
--- 850,859 ----
  %endclass
  
! %endif //wxLUA_USE_wxSpinCtrl & wxUSE_SPINCTRL
  
  //-----------------------------------------------------------------------------
  // wxTextCtrl
  
! %if wxLUA_USE_wxTextCtrl & wxUSE_TEXTCTRL
  
  %include "wx/textctrl.h"
***************
*** 1012,1021 ****
  %endclass
  
! %endif //wxLUA_USE_wxTextCtrl
  
  //-----------------------------------------------------------------------------
  // wxTreeCtrl
  
! %if wxLUA_USE_wxTreeCtrl
  
  %include "wx/treectrl.h"
--- 1012,1021 ----
  %endclass
  
! %endif //wxLUA_USE_wxTextCtrl & wxUSE_TEXTCTRL
  
  //-----------------------------------------------------------------------------
  // wxTreeCtrl
  
! %if wxLUA_USE_wxTreeCtrl & wxUSE_TREECTRL
  
  %include "wx/treectrl.h"
***************
*** 1287,1296 ****
  %endclass
  
! %endif //wxLUA_USE_wxTreeCtrl
  
  //-----------------------------------------------------------------------------
  // wxGenericDirCtrl
  
! %if wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG
  
  %include "wx/dirctrl.h"
--- 1287,1296 ----
  %endclass
  
! %endif //wxLUA_USE_wxTreeCtrl & wxUSE_TREECTRL
  
  //-----------------------------------------------------------------------------
  // wxGenericDirCtrl
  
! %if wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG
  
  %include "wx/dirctrl.h"
***************
*** 1331,1333 ****
  %endclass
  
! %endif //wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG
--- 1331,1333 ----
  %endclass
  
! %endif //wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG

Index: sizer.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/sizer.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sizer.i	7 Dec 2006 06:32:42 -0000	1.9
--- sizer.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 264,268 ****
  // wxNotebookSizer - deprecated
  
! %if wxUSE_NOTEBOOK&(!%wxchkver25)
  
  %class wxNotebookSizer, wxSizer
--- 264,268 ----
  // wxNotebookSizer - deprecated
  
! %if wxUSE_NOTEBOOK & (!%wxchkver25)
  
  %class wxNotebookSizer, wxSizer
***************
*** 272,280 ****
  %endclass
  
! %endif //wxUSE_NOTEBOOK
  
  //-----------------------------------------------------------------------------
  // wxStaticBoxSizer
  
  %class wxStaticBoxSizer, wxBoxSizer
      wxStaticBoxSizer(wxStaticBox* box, int orient)
--- 272,285 ----
  %endclass
  
! %endif //wxUSE_NOTEBOOK & (!%wxchkver25)
! 
! //-----------------------------------------------------------------------------
! // wxBookCtrlSizer - also depricated since 2.6
  
  //-----------------------------------------------------------------------------
  // wxStaticBoxSizer
  
+ %if wxUSE_STATBOX
+ 
  %class wxStaticBoxSizer, wxBoxSizer
      wxStaticBoxSizer(wxStaticBox* box, int orient)
***************
*** 286,289 ****
--- 291,320 ----
  %endclass
  
+ %endif //wxUSE_STATBOX
+ 
+ //-----------------------------------------------------------------------------
+ // wxStdDialogButtonSizer
+ 
+ %if wxUSE_BUTTON
+ 
+ %class wxStdDialogButtonSizer, wxBoxSizer
+     wxStdDialogButtonSizer()
+ 
+     void AddButton(wxButton *button)
+     void SetAffirmativeButton( wxButton *button );
+     void SetNegativeButton( wxButton *button );
+     void SetCancelButton( wxButton *button );
+ 
+     void Realize();
+ 
+     wxButton *GetAffirmativeButton() const
+     wxButton *GetApplyButton() const
+     wxButton *GetNegativeButton() const
+     wxButton *GetCancelButton() const
+     wxButton *GetHelpButton() const
+ %endclass
+ 
+ %endif //wxUSE_BUTTON
+ 
  %endif //wxLUA_USE_wxSizer
  

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.51,1.52

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

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

Modified Files:
	wxbind.h 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** wxbind.h	22 Feb 2007 20:33:08 -0000	1.51
--- wxbind.h	23 Feb 2007 04:35:31 -0000	1.52
***************
*** 67,73 ****
  // ----------------------------------------------------------------------------
  
! #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
      #include "wx/generic/helpext.h"
! #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
  #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
--- 67,73 ----
  // ----------------------------------------------------------------------------
  
[...3449 lines suppressed...]
! 
! #if wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
!     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxListItemAttr, wxListItemAttr)
! #endif // wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
  
  
--- 2817,2829 ----
  #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME
  
! #if wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayTreeItemIds, wxArrayTreeItemIds)
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTreeItemId, wxTreeItemId)
! #endif // wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL
  
! #if wxLUA_USE_wxXMLResource && wxUSE_XML
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxXmlNode, wxXmlNode)
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxXmlProperty, wxXmlProperty)
! #endif // wxLUA_USE_wxXMLResource && wxUSE_XML
  
  

[Wxlua-commit] wxLua/docs changelog.txt, 1.23, 1.24 wxluaref.html, 1.14, 1.15

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

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

Modified Files:
	changelog.txt wxluaref.html 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: wxluaref.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxluaref.html	9 Feb 2007 05:17:09 -0000	1.14
--- wxluaref.html	23 Feb 2007 04:35:30 -0000	1.15
***************
*** 445,449 ****
  <a href="#wxStaticText">wxStaticText</a><br>
  <a href="#wxStatusBar">wxStatusBar</a><br>
! wxStdDialogButtonSizer - (Not wrapped)<br>
  wxStopWatch - (Not wrapped)<br>
  <a href="#wxStreamBase">wxStreamBase</a><br>
--- 445,449 ----
  <a href="#wxStaticText">wxStaticText</a><br>
  <a href="#wxStatusBar">wxStatusBar</a><br>
! <a href="#wxStdDialogButtonSizer">wxStdDialogButtonSizer</a><br>
  wxStopWatch - (Not wrapped)<br>
[...2111 lines suppressed...]
  !<i>%wxchkver25</i> <i>%include</i> "wx/xrc/xml.h"<br>
--- 13212,13216 ----
  // ============================================================================<br>
  <br>
! <i>%if</i> wxLUA_USE_wxXMLResource & wxUSE_XML<br>
  <br>
  !<i>%wxchkver25</i> <i>%include</i> "wx/xrc/xml.h"<br>
***************
*** 13308,13312 ****
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <i>%endif</i> //wxLUA_USE_wxXMLResource<br>
  <HR>
  <h2>../wxstc/stc.i</h2>
--- 13377,13381 ----
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <i>%endif</i> //wxLUA_USE_wxXMLResource & wxUSE_XML<br>
  <HR>
  <h2>../wxstc/stc.i</h2>

Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** changelog.txt	9 Feb 2007 17:34:21 -0000	1.23
--- changelog.txt	23 Feb 2007 04:35:30 -0000	1.24
***************
*** 6,12 ****
   --------------------------------------------------------------------
  
!  - added RUNTIME_LIBS and THREADING options to the build system to allow 
     to statically compile against the C runtime (only for some win compilers)
! 
  
   version 2.8.0.0 (released 24/12/2006)
--- 6,14 ----
   --------------------------------------------------------------------
  
!  - Added RUNTIME_LIBS and THREADING options to the build system to allow 
     to statically compile against the C runtime (only for some win compilers)
!  - Added all of the wxWidget's wxUSE_XXX conditions to the bindings
!  - Hopefully fixed the wx2lua and lua2wx string conversion for unicode
!    and high ascii characters.
  
   version 2.8.0.0 (released 24/12/2006)

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.100,1.101

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

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

Modified Files:
	genwxbind.lua 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** genwxbind.lua	22 Feb 2007 05:40:51 -0000	1.100
--- genwxbind.lua	23 Feb 2007 04:35:29 -0000	1.101
***************
*** 715,718 ****
--- 715,719 ----
      preprocConditionTable["wxUSE_APPLE_IEEE"]              = "wxUSE_APPLE_IEEE"
      preprocConditionTable["wxUSE_BMPBUTTON"]               = "wxUSE_BMPBUTTON"
+     preprocConditionTable["wxUSE_BOOKCTRL"]                = "wxUSE_BOOKCTRL"
      preprocConditionTable["wxUSE_BUILTIN_IODBC"]           = "wxUSE_BUILTIN_IODBC"
      preprocConditionTable["wxUSE_BUSYINFO"]                = "wxUSE_BUSYINFO"
***************
*** 723,726 ****
--- 724,728 ----
      preprocConditionTable["wxUSE_CHECKLISTBOX"]            = "wxUSE_CHECKLISTBOX"
      preprocConditionTable["wxUSE_CHOICE"]                  = "wxUSE_CHOICE"
+     preprocConditionTable["wxUSE_CHOICEBOOK"]              = "wxUSE_CHOICEBOOK"
      preprocConditionTable["wxUSE_CHOICEDLG"]               = "wxUSE_CHOICEDLG"
      preprocConditionTable["wxUSE_CLIPBOARD"]               = "wxUSE_CLIPBOARD"
***************
*** 1947,1953 ****
                  -- handle condition operators, note can have leading ! for not
                  if (tag == "!") or ((((lineState.DefType == "blockcondition") or lineState.InLineConditionIf) and preprocOperatorTable[tag])) then
!                     if not lineState.Condition and (preprocOperatorTable[tag] ~= "!") then
!                         print("Error: Unexpected Conditional Operator "..tag..". "..LineTableErrString(lineTable))
!                     else
                          if not lineState.Condition then
                              lineState.Condition = preprocOperatorTable[tag]
--- 1949,1953 ----
                  -- handle condition operators, note can have leading ! for not
                  if (tag == "!") or ((((lineState.DefType == "blockcondition") or lineState.InLineConditionIf) and preprocOperatorTable[tag])) then
!                     if lineState.Condition or (preprocOperatorTable[tag] == "!") or (preprocOperatorTable[tag] == "(") then
                          if not lineState.Condition then
                              lineState.Condition = preprocOperatorTable[tag]
***************
*** 1962,1965 ****
--- 1962,1967 ----
                              lineState.Condition = lineState.Condition..preprocOperatorTable[tag]
                          end
+                     else
+                         print("Error: Unexpected Conditional Operator "..tag..". "..LineTableErrString(lineTable))
                      end
  

[Wxlua-commit] wxLua/bindings/wxstc wxstc_datatypes.lua,1.43,1.44

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

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

Modified Files:
	wxstc_datatypes.lua 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: wxstc_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wxstc_datatypes.lua	22 Feb 2007 20:33:07 -0000	1.43
--- wxstc_datatypes.lua	23 Feb 2007 04:35:30 -0000	1.44
***************
*** 184,188 ****
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)",
      DefType = "class",
      IsNumber = false,
--- 184,188 ----
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)",
      DefType = "class",
[...3119 lines suppressed...]
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML",
      DefType = "class",
      IsNumber = false,
***************
*** 3467,3470 ****
--- 3474,3478 ----
    wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE",
    wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON",
+   wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL",
    wxUSE_BUILTIN_IODBC = "wxUSE_BUILTIN_IODBC",
    wxUSE_BUSYINFO = "wxUSE_BUSYINFO",
***************
*** 3475,3478 ****
--- 3483,3487 ----
    wxUSE_CHECKLISTBOX = "wxUSE_CHECKLISTBOX",
    wxUSE_CHOICE = "wxUSE_CHOICE",
+   wxUSE_CHOICEBOOK = "wxUSE_CHOICEBOOK",
    wxUSE_CHOICEDLG = "wxUSE_CHOICEDLG",
    wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD",

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.33, 1.34 clipdrag.cpp, 1.29, 1.30 config.cpp, 1.26, 1.27 controls.cpp, 1.41, 1.42 data.cpp, 1.32, 1.33 datetime.cpp, 1.27, 1.28 dialogs.cpp, 1.27, 1.28 file.cpp, 1.30, 1.31 gdi.cpp, 1.47, 1.48 geometry.cpp, 1.20, 1.21 grid.cpp, 1.25, 1.26 help.cpp, 1.22, 1.23 html.cpp, 1.27, 1.28 image.cpp, 1.25, 1.26 mdi.cpp, 1.24, 1.25 menutool.cpp, 1.26, 1.27 print.cpp, 1.26, 1.27 regex.cpp, 1.20, 1.21 sizer.cpp, 1.22, 1.23 socket.cpp, 1.26, 1.27 thread.cpp, 1.17, 1.18 wave.cpp, 1.25, 1.26 windows.cpp, 1.38, 1.39 wx_bind.cpp, 1.77, 1.78 wxlua.cpp, 1.27, 1.28 xml.cpp, 1.21, 1.22

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

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

Modified Files:
	appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp 
	datetime.cpp dialogs.cpp file.cpp gdi.cpp geometry.cpp 
	grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp 
	print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp 
	windows.cpp wx_bind.cpp wxlua.cpp xml.cpp 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: xml.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** xml.cpp	22 Feb 2007 05:40:53 -0000	1.21
--- xml.cpp	23 Feb 2007 04:35:33 -0000	1.22
***************
*** 27,31 ****
  
  
! #if wxLUA_USE_wxXMLResource
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlNode
--- 27,31 ----
  
  
! #if wxLUA_USE_wxXMLResource && wxUSE_XML
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlNode
***************
*** 547,554 ****
  
  int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource
  
  
! #if wxLUA_USE_wxXMLResource
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlProperty
--- 547,554 ----
  
  int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource && wxUSE_XML
  
  
! #if wxLUA_USE_wxXMLResource && wxUSE_XML
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlProperty
***************
*** 733,740 ****
  
  int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource
  
  
! #if wxLUA_USE_wxXMLResource
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlDocument
--- 733,740 ----
  
  int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource && wxUSE_XML
  
  
! #if wxLUA_USE_wxXMLResource && wxUSE_XML
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlDocument
***************
*** 977,984 ****
  
  int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource
  
  
! #if wxLUA_USE_wxXMLResource
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlResourceHandler
--- 977,984 ----
  
  int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource && wxUSE_XML
  
  
! #if wxLUA_USE_wxXMLResource && wxUSE_XML
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlResourceHandler
***************
*** 1001,1008 ****
  
  int wxXmlResourceHandler_methodCount = sizeof(wxXmlResourceHandler_methods)/sizeof(wxXmlResourceHandler_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource
  
  
! #if wxLUA_USE_wxXMLResource
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlResource
--- 1001,1008 ----
  
  int wxXmlResourceHandler_methodCount = sizeof(wxXmlResourceHandler_methods)/sizeof(wxXmlResourceHandler_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource && wxUSE_XML
  
  
! #if wxLUA_USE_wxXMLResource && wxUSE_XML
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXmlResource
***************
*** 1013,1017 ****
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluaarg_String, 0 };
  //     wxBitmap LoadBitmap(const wxString& name);
--- 1013,1017 ----
  
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluaarg_String, 0 };
  //     wxBitmap LoadBitmap(const wxString& name);
***************
*** 1035,1042 ****
  }
  
! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 };
  //     wxDialog* LoadDialog(wxWindow* parent, const wxString& name);
--- 1035,1042 ----
  }
  
! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 };
  //     wxDialog* LoadDialog(wxWindow* parent, const wxString& name);
***************
*** 1107,1114 ****
  }
  
! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 };
  //     bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name);
--- 1107,1114 ----
  }
  
! #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 };
  //     bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name);
***************
*** 1159,1166 ****
  }
  
! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluaarg_String, 0 };
  //     wxIcon LoadIcon(const wxString& name);
--- 1159,1166 ----
  }
  
! #endif // (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluaarg_String, 0 };
  //     wxIcon LoadIcon(const wxString& name);
***************
*** 1184,1191 ****
  }
  
! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluaarg_String, 0 };
  //     wxMenu* LoadMenu(const wxString& name);
--- 1184,1191 ----
  }
  
! #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluaarg_String, 0 };
  //     wxMenu* LoadMenu(const wxString& name);
***************
*** 1244,1251 ****
  }
  
! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 };
  //     wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name);
--- 1244,1251 ----
  }
  
! #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 };
  //     wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name);
***************
*** 1268,1272 ****
  }
  
! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
--- 1268,1272 ----
  }
  
! #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
***************
*** 1599,1635 ****
  WXLUAMETHOD wxXmlResource_methods[] = {
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap)
      { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap },
! #endif  // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog)
      { LuaMethod, "LoadDialog", wxLua_wxXmlResource_LoadDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog },
      { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialogCreate },
      { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog },
! #endif  // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame)
      { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame },
      { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame },
! #endif  // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon)
      { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon },
! #endif  // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu)
      { LuaMethod, "LoadMenu", wxLua_wxXmlResource_LoadMenu, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu },
      { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow },
      { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar },
! #endif  // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu)
  
  
! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar)
      { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar },
! #endif  // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar)
  
      { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor },
--- 1599,1635 ----
  WXLUAMETHOD wxXmlResource_methods[] = {
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
      { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap },
! #endif  // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
      { LuaMethod, "LoadDialog", wxLua_wxXmlResource_LoadDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog },
      { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialogCreate },
      { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog },
! #endif  // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
      { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame },
      { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame },
! #endif  // (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
      { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon },
! #endif  // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
      { LuaMethod, "LoadMenu", wxLua_wxXmlResource_LoadMenu, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu },
      { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow },
      { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar },
! #endif  // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  
! #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
      { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar },
! #endif  // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
      { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor },
***************
*** 1657,1660 ****
  
  int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource
  
--- 1657,1660 ----
  
  int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]);
! #endif  // wxLUA_USE_wxXMLResource && wxUSE_XML
  

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dialogs.cpp	22 Feb 2007 05:40:52 -0000	1.27
--- dialogs.cpp	23 Feb 2007 04:35:31 -0000	1.28
***************
*** 1006,1010 ****
  
  
! #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
  // -------------------------------------------------------------------------------------------------
  // Bind class wxColourDialog
--- 1006,1010 ----
  
  
! #if wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxColourDialog
***************
*** 1068,1075 ****
  
  int wxColourDialog_methodCount = sizeof(wxColourDialog_methods)/sizeof(wxColourDialog_methods[0]);
! #endif  // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
  
  
! #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
  // -------------------------------------------------------------------------------------------------
  // Bind class wxColourData
--- 1068,1075 ----
  
  int wxColourDialog_methodCount = sizeof(wxColourDialog_methods)/sizeof(wxColourDialog_methods[0]);
! #endif  // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG
  
  
! #if wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxColourData
***************
*** 1080,1084 ****
  
  
! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog)
  //     wxColour GetColour() const
  static int LUACALL wxLua_wxColourData_GetColour(lua_State *L)
--- 1080,1084 ----
  
  
! #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG)
  //     wxColour GetColour() const
  static int LUACALL wxLua_wxColourData_GetColour(lua_State *L)
***************
*** 1152,1156 ****
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog)
  
  //     wxColourData()
--- 1152,1156 ----
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG)
  
  //     wxColourData()
***************
*** 1247,1251 ****
  WXLUAMETHOD wxColourData_methods[] = {
  
! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog)
      { LuaMethod, "GetColour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetCustomColour", wxLua_wxColourData_GetCustomColour, 1, 1, s_wxluatagArray_wxLua_wxColourData_GetCustomColour },
--- 1247,1251 ----
  WXLUAMETHOD wxColourData_methods[] = {
  
! #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG)
      { LuaMethod, "GetColour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetCustomColour", wxLua_wxColourData_GetCustomColour, 1, 1, s_wxluatagArray_wxLua_wxColourData_GetCustomColour },
***************
*** 1254,1258 ****
      { LuaGetProp, "Colour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "Colour", wxLua_wxColourData_SetColour, 1, 1, s_wxluaargArray_None },
! #endif  // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog)
  
      { LuaConstructor, "wxColourData", wxLua_wxColourData_constructor, 0, 0, s_wxluaargArray_None },
--- 1254,1258 ----
      { LuaGetProp, "Colour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "Colour", wxLua_wxColourData_SetColour, 1, 1, s_wxluaargArray_None },
! #endif  // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG)
  
      { LuaConstructor, "wxColourData", wxLua_wxColourData_constructor, 0, 0, s_wxluaargArray_None },
***************
*** 1267,1274 ****
  
  int wxColourData_methodCount = sizeof(wxColourData_methods)/sizeof(wxColourData_methods[0]);
! #endif  // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
  
  
! #if wxLUA_USE_wxFileDialog
  // -------------------------------------------------------------------------------------------------
  // Bind class wxFileDialog
--- 1267,1274 ----
  
  int wxColourData_methodCount = sizeof(wxColourData_methods)/sizeof(wxColourData_methods[0]);
! #endif  // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG
  
  
! #if wxLUA_USE_wxFileDialog && wxUSE_FILEDLG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxFileDialog
***************
*** 1279,1283 ****
  
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog)
  //     !%wxchkver27 long GetStyle() const
  static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L)
--- 1279,1283 ----
  
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  //     !%wxchkver27 long GetStyle() const
  static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L)
***************
*** 1310,1317 ****
  }
  
! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog)
  
  
! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetFilenames[] = { &s_wxluatag_wxArrayString, 0 };
  // %override wxLua_wxFileDialog_GetFilenames
--- 1310,1317 ----
  }
  
! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
  
! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetFilenames[] = { &s_wxluatag_wxArrayString, 0 };
  // %override wxLua_wxFileDialog_GetFilenames
***************
*** 1346,1353 ****
  }
  
! #endif // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString)
  
  
! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
  //     wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition)
--- 1346,1353 ----
  }
  
! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
  //     wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition)
***************
*** 1383,1387 ****
  }
  
! #endif // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect)
  
  //     wxString GetDirectory() const
--- 1383,1387 ----
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
  //     wxString GetDirectory() const
***************
*** 1575,1595 ****
  WXLUAMETHOD wxFileDialog_methods[] = {
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog)
      { LuaMethod, "GetStyle", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetStyle", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_SetStyle },
      { LuaGetProp, "Style", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "Style", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluaargArray_None },
! #endif  // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog)
  
  
! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString)
      { LuaMethod, "GetFilenames", wxLua_wxFileDialog_GetFilenames, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetFilenames },
      { LuaMethod, "GetPaths", wxLua_wxFileDialog_GetPaths, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetPaths },
! #endif  // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString)
  
  
! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect)
      { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 7, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor },
! #endif  // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect)
  
      { LuaMethod, "GetDirectory", wxLua_wxFileDialog_GetDirectory, 0, 0, s_wxluaargArray_None },
--- 1575,1595 ----
  WXLUAMETHOD wxFileDialog_methods[] = {
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
      { LuaMethod, "GetStyle", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetStyle", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_SetStyle },
      { LuaGetProp, "Style", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "Style", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluaargArray_None },
! #endif  // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
  
! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
      { LuaMethod, "GetFilenames", wxLua_wxFileDialog_GetFilenames, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetFilenames },
      { LuaMethod, "GetPaths", wxLua_wxFileDialog_GetPaths, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetPaths },
! #endif  // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
      { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 7, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
      { LuaMethod, "GetDirectory", wxLua_wxFileDialog_GetDirectory, 0, 0, s_wxluaargArray_None },
***************
*** 1621,1628 ****
  
  int wxFileDialog_methodCount = sizeof(wxFileDialog_methods)/sizeof(wxFileDialog_methods[0]);
! #endif  // wxLUA_USE_wxFileDialog
  
  
! #if wxLUA_USE_wxDirDialog
  // -------------------------------------------------------------------------------------------------
  // Bind class wxDirDialog
--- 1621,1628 ----
  
  int wxFileDialog_methodCount = sizeof(wxFileDialog_methods)/sizeof(wxFileDialog_methods[0]);
! #endif  // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG
  
  
! #if wxLUA_USE_wxDirDialog && wxUSE_DIRDLG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxDirDialog
***************
*** 1633,1637 ****
  
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog)
  //     !%wxchkver27 long GetStyle() const
  static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L)
--- 1633,1637 ----
  
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
  //     !%wxchkver27 long GetStyle() const
  static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L)
***************
*** 1664,1671 ****
  }
  
! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
  //     wxDirDialog(wxWindow* parent, const wxString& message = "Choose a directory", const wxString& defaultPath = "", long style = 0, const wxPoint& pos = wxDefaultPosition)
--- 1664,1671 ----
  }
  
! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
  //     wxDirDialog(wxWindow* parent, const wxString& message = "Choose a directory", const wxString& defaultPath = "", long style = 0, const wxPoint& pos = wxDefaultPosition)
***************
*** 1694,1698 ****
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog)
  
  //     wxString GetPath() const
--- 1694,1698 ----
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
  
  //     wxString GetPath() const
***************
*** 1766,1780 ****
  WXLUAMETHOD wxDirDialog_methods[] = {
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog)
      { LuaMethod, "GetStyle", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetStyle", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxDirDialog_SetStyle },
      { LuaGetProp, "Style", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "Style", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluaargArray_None },
! #endif  // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog)
      { LuaConstructor, "wxDirDialog", wxLua_wxDirDialog_constructor, 5, 1, s_wxluatagArray_wxLua_wxDirDialog_constructor },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog)
  
      { LuaMethod, "GetPath", wxLua_wxDirDialog_GetPath, 0, 0, s_wxluaargArray_None },
--- 1766,1780 ----
  WXLUAMETHOD wxDirDialog_methods[] = {
  
! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
      { LuaMethod, "GetStyle", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetStyle", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxDirDialog_SetStyle },
      { LuaGetProp, "Style", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "Style", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluaargArray_None },
! #endif  // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
      { LuaConstructor, "wxDirDialog", wxLua_wxDirDialog_constructor, 5, 1, s_wxluatagArray_wxLua_wxDirDialog_constructor },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
  
      { LuaMethod, "GetPath", wxLua_wxDirDialog_GetPath, 0, 0, s_wxluaargArray_None },
***************
*** 1790,1797 ****
  
  int wxDirDialog_methodCount = sizeof(wxDirDialog_methods)/sizeof(wxDirDialog_methods[0]);
! #endif  // wxLUA_USE_wxDirDialog
  
  
! #if wxLUA_USE_wxMessageDialog
  // -------------------------------------------------------------------------------------------------
  // Bind class wxMessageDialog
--- 1790,1797 ----
  
  int wxDirDialog_methodCount = sizeof(wxDirDialog_methods)/sizeof(wxDirDialog_methods[0]);
! #endif  // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG
  
  
! #if wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxMessageDialog
***************
*** 1802,1806 ****
  
  
! #if (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxMessageDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
  //     wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition)
--- 1802,1806 ----
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxMessageDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
  //     wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition)
***************
*** 1832,1836 ****
  }
  
! #endif // (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect)
  
  static int LUACALL wxLua_wxMessageDialog_destructor(lua_State *)
--- 1832,1836 ----
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG)
  
  static int LUACALL wxLua_wxMessageDialog_destructor(lua_State *)
***************
*** 1844,1850 ****
  WXLUAMETHOD wxMessageDialog_methods[] = {
  
! #if (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect)
      { LuaConstructor, "wxMessageDialog", wxLua_wxMessageDialog_constructor, 5, 2, s_wxluatagArray_wxLua_wxMessageDialog_constructor },
! #endif  // (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect)
  
      { LuaDelete, "wxMessageDialog", wxLua_wxMessageDialog_destructor, 0, 0, s_wxluaargArray_None },
--- 1844,1850 ----
  WXLUAMETHOD wxMessageDialog_methods[] = {
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG)
      { LuaConstructor, "wxMessageDialog", wxLua_wxMessageDialog_constructor, 5, 2, s_wxluatagArray_wxLua_wxMessageDialog_constructor },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG)
  
      { LuaDelete, "wxMessageDialog", wxLua_wxMessageDialog_destructor, 0, 0, s_wxluaargArray_None },
***************
*** 1852,1856 ****
  
  int wxMessageDialog_methodCount = sizeof(wxMessageDialog_methods)/sizeof(wxMessageDialog_methods[0]);
! #endif  // wxLUA_USE_wxMessageDialog
  
  
--- 1852,1856 ----
  
  int wxMessageDialog_methodCount = sizeof(wxMessageDialog_methods)/sizeof(wxMessageDialog_methods[0]);
! #endif  // wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG
  
  

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wxlua.cpp	22 Feb 2007 05:40:53 -0000	1.27
--- wxlua.cpp	23 Feb 2007 04:35:33 -0000	1.28
***************
*** 399,403 ****
  
  
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML)
  //     const wxHtmlTag      *GetHtmlTag() const
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L)
--- 399,403 ----
  
  
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  //     const wxHtmlTag      *GetHtmlTag() const
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L)
***************
*** 430,434 ****
  }
  
! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 };
--- 430,434 ----
  }
  
! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 };
***************
*** 494,503 ****
  WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = {
  
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML)
      { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None },
      { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None },
      { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None },
! #endif  // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML)
  
      { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled },
--- 494,503 ----
  WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = {
  
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
      { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None },
      { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None },
      { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None },
! #endif  // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
      { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled },

Index: image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** image.cpp	22 Feb 2007 05:40:53 -0000	1.25
--- image.cpp	23 Feb 2007 04:35:32 -0000	1.26
***************
*** 27,31 ****
  
  
! #if wxLUA_USE_wxImage
  // -------------------------------------------------------------------------------------------------
  // Bind class wxImage
--- 27,31 ----
  
  
! #if wxLUA_USE_wxImage && wxUSE_IMAGE
  // -------------------------------------------------------------------------------------------------
  // Bind class wxImage
***************
*** 36,40 ****
  
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImageFromBitmap_constructor[] = { &s_wxluatag_wxBitmap, 0 };
  // %override wxLua_wxImageFromBitmap_constructor
--- 36,40 ----
  
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImageFromBitmap_constructor[] = { &s_wxluatag_wxBitmap, 0 };
  // %override wxLua_wxImageFromBitmap_constructor
***************
*** 56,63 ****
  }
  
! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
  
  
! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage)
  //     static wxList& GetHandlers()
  static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L)
--- 56,63 ----
  }
  
! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  //     static wxList& GetHandlers()
  static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L)
***************
*** 73,80 ****
  }
  
! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage)
  
  
! #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage)
  //     wxPalette GetPalette() const
  static int LUACALL wxLua_wxImage_GetPalette(lua_State *L)
--- 73,80 ----
  }
  
! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  //     wxPalette GetPalette() const
  static int LUACALL wxLua_wxImage_GetPalette(lua_State *L)
***************
*** 110,117 ****
  }
  
! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetSubImage[] = { &s_wxluatag_wxRect, 0 };
  //     wxImage GetSubImage(const wxRect& rect) const
--- 110,117 ----
  }
  
! #endif // (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetSubImage[] = { &s_wxluatag_wxRect, 0 };
  //     wxImage GetSubImage(const wxRect& rect) const
***************
*** 244,251 ****
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetImageCountStream[] = { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 };
  //     %rename GetImageCountStream static int GetImageCount(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY)
--- 244,251 ----
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetImageCountStream[] = { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 };
  //     %rename GetImageCountStream static int GetImageCount(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY)
***************
*** 292,296 ****
  }
  
! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_constructor[] = { &s_wxluatag_wxImage, 0 };
--- 292,296 ----
  }
  
! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_constructor[] = { &s_wxluatag_wxImage, 0 };
***************
*** 1480,1500 ****
  WXLUAMETHOD wxImage_methods[] = {
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
      { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, s_wxluatagArray_wxLua_wxImageFromBitmap_constructor },
! #endif  // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
  
  
! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage)
      { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None },
! #endif  // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage)
  
  
! #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage)
      { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, s_wxluatagArray_wxLua_wxImage_SetPalette },
! #endif  // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage)
      { LuaMethod, "GetSubImage", wxLua_wxImage_GetSubImage, 1, 1, s_wxluatagArray_wxLua_wxImage_GetSubImage },
      { LuaMethod, "Resize", wxLua_wxImage_Resize, 5, 2, s_wxluatagArray_wxLua_wxImage_Resize },
--- 1480,1500 ----
  WXLUAMETHOD wxImage_methods[] = {
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
      { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, s_wxluatagArray_wxLua_wxImageFromBitmap_constructor },
! #endif  // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
      { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None },
! #endif  // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
      { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, s_wxluatagArray_wxLua_wxImage_SetPalette },
! #endif  // (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
      { LuaMethod, "GetSubImage", wxLua_wxImage_GetSubImage, 1, 1, s_wxluatagArray_wxLua_wxImage_GetSubImage },
      { LuaMethod, "Resize", wxLua_wxImage_Resize, 5, 2, s_wxluatagArray_wxLua_wxImage_Resize },
***************
*** 1502,1512 ****
      { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, s_wxluatagArray_wxLua_wxImage_Size },
      { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, s_wxluatagArray_wxLua_wxImage_SetRGBRect },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
      { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, s_wxluatagArray_wxLua_wxImage_GetImageCountStream },
      { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, s_wxluatagArray_wxLua_wxImage_LoadFileStream },
! #endif  // (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
  
      { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, s_wxluatagArray_wxLua_wxImage_constructor },
--- 1502,1512 ----
      { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, s_wxluatagArray_wxLua_wxImage_Size },
      { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, s_wxluatagArray_wxLua_wxImage_SetRGBRect },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
      { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, s_wxluatagArray_wxLua_wxImage_GetImageCountStream },
      { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, s_wxluatagArray_wxLua_wxImage_LoadFileStream },
! #endif  // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
      { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, s_wxluatagArray_wxLua_wxImage_constructor },
***************
*** 1577,1584 ****
  
  int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]);
! #endif  // wxLUA_USE_wxImage
  
  
! #if wxLUA_USE_wxImage
  // -------------------------------------------------------------------------------------------------
  // Bind class wxImageHandler
--- 1577,1584 ----
  
  int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]);
! #endif  // wxLUA_USE_wxImage && wxUSE_IMAGE
  
  
! #if wxLUA_USE_wxImage && wxUSE_IMAGE
  // -------------------------------------------------------------------------------------------------
  // Bind class wxImageHandler
***************
*** 1589,1593 ****
  
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetImageCount[] = { &s_wxluatag_wxInputStream, 0 };
  //     int GetImageCount(wxInputStream& stream)
--- 1589,1593 ----
  
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetImageCount[] = { &s_wxluatag_wxInputStream, 0 };
  //     int GetImageCount(wxInputStream& stream)
***************
*** 1654,1658 ****
  }
  
! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
  
  //     wxString GetName() const
--- 1654,1658 ----
  }
  
! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  //     wxString GetName() const
***************
*** 1806,1814 ****
  WXLUAMETHOD wxImageHandler_methods[] = {
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
      { LuaMethod, "GetImageCount", wxLua_wxImageHandler_GetImageCount, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_GetImageCount },
      { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, s_wxluatagArray_wxLua_wxImageHandler_LoadFile },
      { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, s_wxluatagArray_wxLua_wxImageHandler_SaveFile },
! #endif  // (wxUSE_STREAMS) && (wxLUA_USE_wxImage)
  
      { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, s_wxluaargArray_None },
--- 1806,1814 ----
  WXLUAMETHOD wxImageHandler_methods[] = {
  
! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
      { LuaMethod, "GetImageCount", wxLua_wxImageHandler_GetImageCount, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_GetImageCount },
      { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, s_wxluatagArray_wxLua_wxImageHandler_LoadFile },
      { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, s_wxluatagArray_wxLua_wxImageHandler_SaveFile },
! #endif  // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
      { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, s_wxluaargArray_None },
***************
*** 1833,1840 ****
  
  int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]);
! #endif  // wxLUA_USE_wxImage
  
  
! #if wxLUA_USE_wxImage
  // -------------------------------------------------------------------------------------------------
  // Bind class wxBMPHandler
--- 1833,1840 ----
  
  int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]);
! #endif  // wxLUA_USE_wxImage && wxUSE_IMAGE
  
  
! #if wxLUA_USE_wxImage && wxUSE_IMAGE
  // -------------------------------------------------------------------------------------------------
  // Bind class wxBMPHandler
***************
*** 1874,1881 ****
  
  int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]);
! #endif  // wxLUA_USE_wxImage
  
  
! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxICOHandler
--- 1874,1881 ----
  
  int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]);
! #endif  // wxLUA_USE_wxImage && wxUSE_IMAGE
  
  
! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxICOHandler
***************
*** 1915,1922 ****
  
  int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]);
! #endif  // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxCURHandler
--- 1915,1922 ----
  
  int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]);
! #endif  // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxCURHandler
***************
*** 1956,1963 ****
  
  int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]);
! #endif  // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxANIHandler
--- 1956,1963 ----
  
  int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]);
! #endif  // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxANIHandler
***************
*** 1997,2004 ****
  
  int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]);
! #endif  // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxIFFHandler
--- 1997,2004 ----
  
  int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]);
! #endif  // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxIFFHandler
***************
*** 2038,2045 ****
  
  int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]);
! #endif  // (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_GIF) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxGIFHandler
--- 2038,2045 ----
  
  int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]);
! #endif  // (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxGIFHandler
***************
*** 2079,2086 ****
  
  int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]);
! #endif  // (wxUSE_GIF) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxJPEGHandler
--- 2079,2086 ----
  
  int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]);
! #endif  // (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxJPEGHandler
***************
*** 2120,2127 ****
  
  int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]);
! #endif  // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_PCX) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxPCXHandler
--- 2120,2127 ----
  
  int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]);
! #endif  // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxPCXHandler
***************
*** 2161,2168 ****
  
  int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]);
! #endif  // (wxUSE_PCX) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxPNGHandler
--- 2161,2168 ----
  
  int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]);
! #endif  // (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxPNGHandler
***************
*** 2202,2209 ****
  
  int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]);
! #endif  // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_PNM) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxPNMHandler
--- 2202,2209 ----
  
  int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]);
! #endif  // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxPNMHandler
***************
*** 2243,2250 ****
  
  int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]);
! #endif  // (wxUSE_PNM) && (wxLUA_USE_wxImage)
  
  
! #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxTIFFHandler
--- 2243,2250 ----
  
  int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]);
! #endif  // (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxTIFFHandler
***************
*** 2284,2291 ****
  
  int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]);
! #endif  // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage)
  
  
! #if wxLUA_USE_wxImage
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXPMHandler
--- 2284,2291 ----
  
  int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]);
! #endif  // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
  
  
! #if wxLUA_USE_wxImage && wxUSE_IMAGE
  // -------------------------------------------------------------------------------------------------
  // Bind class wxXPMHandler
***************
*** 2325,2329 ****
  
  int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]);
! #endif  // wxLUA_USE_wxImage
  
  
--- 2325,2329 ----
  
  int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]);
! #endif  // wxLUA_USE_wxImage && wxUSE_IMAGE
  
  

Index: mdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mdi.cpp	22 Feb 2007 05:40:53 -0000	1.24
--- mdi.cpp	23 Feb 2007 04:35:32 -0000	1.25
***************
*** 27,31 ****
  
  
! #if wxLUA_USE_MDI
  // -------------------------------------------------------------------------------------------------
  // Bind class wxMDIClientWindow
--- 27,31 ----
  
  
! #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
  // -------------------------------------------------------------------------------------------------
[...1116 lines suppressed...]
  
  
! #if (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS)
      { LuaMethod, "AddFilesToGivenMenu", wxLua_wxFileHistory_AddFilesToGivenMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_AddFilesToGivenMenu },
      { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_RemoveMenu },
      { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_UseMenu },
! #endif  // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS)
  
      { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, s_wxluatagArray_wxLua_wxFileHistory_constructor },
***************
*** 3546,3549 ****
  
  int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]);
! #endif  // wxLUA_USE_wxFileHistory
  
--- 3546,3549 ----
  
  int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]);
! #endif  // wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE
  

Index: config.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** config.cpp	22 Feb 2007 05:40:52 -0000	1.26
--- config.cpp	23 Feb 2007 04:35:31 -0000	1.27
***************
*** 27,31 ****
  
  
! #if wxLUA_USE_wxConfig
  // -------------------------------------------------------------------------------------------------
  // Bind class wxConfigBase
--- 27,31 ----
  
  
! #if wxLUA_USE_wxConfig && wxUSE_CONFIG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxConfigBase
***************
*** 787,794 ****
  
  int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]);
! #endif  // wxLUA_USE_wxConfig
  
  
! #if wxLUA_USE_wxConfig
  // -------------------------------------------------------------------------------------------------
  // Bind class wxConfig
--- 787,794 ----
  
  int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]);
! #endif  // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  
! #if wxLUA_USE_wxConfig && wxUSE_CONFIG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxConfig
***************
*** 838,845 ****
  
  int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]);
! #endif  // wxLUA_USE_wxConfig
  
  
! #if wxLUA_USE_wxConfig
  // -------------------------------------------------------------------------------------------------
  // Bind class wxFileConfig
--- 838,845 ----
  
  int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]);
! #endif  // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  
! #if wxLUA_USE_wxConfig && wxUSE_CONFIG
  // -------------------------------------------------------------------------------------------------
  // Bind class wxFileConfig
***************
*** 905,908 ****
  
  int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]);
! #endif  // wxLUA_USE_wxConfig
  
--- 905,908 ----
  
  int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]);
! #endif  // wxLUA_USE_wxConfig && wxUSE_CONFIG
  

Index: grid.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** grid.cpp	22 Feb 2007 05:40:52 -0000	1.25
--- grid.cpp	23 Feb 2007 04:35:32 -0000	1.26
***************
*** 27,31 ****
  
  
! #if wxLUA_USE_wxGrid
  // -------------------------------------------------------------------------------------------------
  // Bind class wxGridCellWorker
--- 27,31 ----
  
  
! #if wxLUA_USE_wxGrid && wxUSE_GRID
  // -------------------------------------------------------------------------------------------------
[...1153 lines suppressed...]
      { LuaMethod, "GetRow", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, s_wxluaargArray_None },
--- 7375,7381 ----
  WXLUAMETHOD wxGridEditorCreatedEvent_methods[] = {
  
! #if (wxLUA_USE_wxObject) && (wxLUA_USE_wxGrid && wxUSE_GRID)
      { LuaConstructor, "wxGridEditorCreatedEvent", wxLua_wxGridEditorCreatedEvent_constructor, 6, 6, s_wxluatagArray_wxLua_wxGridEditorCreatedEvent_constructor },
! #endif  // (wxLUA_USE_wxObject) && (wxLUA_USE_wxGrid && wxUSE_GRID)
  
      { LuaMethod, "GetRow", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, s_wxluaargArray_None },
***************
*** 7396,7399 ****
  
  int wxGridEditorCreatedEvent_methodCount = sizeof(wxGridEditorCreatedEvent_methods)/sizeof(wxGridEditorCreatedEvent_methods[0]);
! #endif  // wxLUA_USE_wxGrid
  
--- 7396,7399 ----
  
  int wxGridEditorCreatedEvent_methodCount = sizeof(wxGridEditorCreatedEvent_methods)/sizeof(wxGridEditorCreatedEvent_methods[0]);
! #endif  // wxLUA_USE_wxGrid && wxUSE_GRID
  

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** file.cpp	22 Feb 2007 05:40:52 -0000	1.30
--- file.cpp	23 Feb 2007 04:35:31 -0000	1.31
***************
*** 128,132 ****
  
  
! #if (wxLUA_USE_wxFile) && (wxLUA_USE_wxFileName)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 };
  //     void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
--- 128,132 ----
  
  
! #if (wxLUA_USE_wxFile && wxUSE_FILE) && (wxLUA_USE_wxFileName)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 };
  //     void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
***************
*** 168,172 ****
  }
  
! #endif // (wxLUA_USE_wxFile) && (wxLUA_USE_wxFileName)
  
  //     %constructor wxFi...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxbindstc/src stc.cpp,1.24,1.25

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

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

Modified Files:
	stc.cpp 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings


Index: stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** stc.cpp	22 Feb 2007 20:33:10 -0000	1.24
--- stc.cpp	23 Feb 2007 04:35:33 -0000	1.25
***************
*** 6781,6785 ****
  
  
! #if wxLUA_USE_wxScrollBar
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetVScrollBar[] = { &s_wxluatag_wxScrollBar, 0 };
  //     void SetVScrollBar(wxScrollBar* bar);
--- 6781,6785 ----
  
  
! #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetVScrollBar[] = { &s_wxluatag_wxScrollBar, 0 };
  //     void SetVScrollBar(wxScrollBar* bar);
***************
*** 6812,6816 ****
  }
  
! #endif // wxLUA_USE_wxScrollBar
  
  
--- 6812,6816 ----
  }
  
! #endif // wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR
  
  
***************
*** 7405,7412 ****
  
  
! #if wxLUA_USE_wxScrollBar
      { LuaMethod, "SetVScrollBar", wxLua_wxStyledTextCtrl_SetVScrollBar, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetVScrollBar },
      { LuaMethod, "SetHScrollBar", wxLua_wxStyledTextCtrl_SetHScrollBar, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHScrollBar },
! #endif  // wxLUA_USE_wxScrollBar
  
  };
--- 7405,7412 ----
  
  
! #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR
      { LuaMethod, "SetVScrollBar", wxLua_wxStyledTextCtrl_SetVScrollBar, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetVScrollBar },
      { LuaMethod, "SetHScrollBar", wxLua_wxStyledTextCtrl_SetHScrollBar, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHScrollBar },
! #endif  // wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR
  
  };
***************
*** 8084,8088 ****
  
  
! #if wxLUA_USE_wxDragDrop
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult[] = { &s_wxluaarg_Enumeration, 0 };
  //     void SetDragResult(wxDragResult val)
--- 8084,8088 ----
  
  
! #if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult[] = { &s_wxluaarg_Enumeration, 0 };
  //     void SetDragResult(wxDragResult val)
***************
*** 8115,8119 ****
  }
  
! #endif // wxLUA_USE_wxDragDrop
  
  
--- 8115,8119 ----
  }
  
! #endif // wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP
  
  
***************
*** 8207,8216 ****
      { LuaMethod, "Delete", wxLua_wxStyledTextEvent_Delete, 0, 0, s_wxluaargArray_None },
  
! #if wxLUA_USE_wxDragDrop
      { LuaMethod, "SetDragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult },
      { LuaMethod, "GetDragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None },
      { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluaargArray_None },
! #endif  // wxLUA_USE_wxDragDrop
  
  };
--- 8207,8216 ----
      { LuaMethod, "Delete", wxLua_wxStyledTextEvent_Delete, 0, 0, s_wxluaargArray_None },
  
! #if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP
      { LuaMethod, "SetDragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult },
      { LuaMethod, "GetDragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None },
      { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None },
      { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluaargArray_None },
! #endif  // wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP
  
  };

[Wxlua-commit] wxLua/bindings/wxwidgets wave.i, 1.11, 1.12 wx_datatypes.lua, 1.47, 1.48

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

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

Modified Files:
	wave.i wx_datatypes.lua 
Log Message:
change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to &


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wave.i	13 Dec 2006 00:27:56 -0000	1.11
--- wave.i	22 Feb 2007 20:33:08 -0000	1.12
***************
*** 128,132 ****
  //  wxJoystick
  
! %if wxLUA_USE_wxJoystick|wxUSE_JOYSTICK
  
  %include "wx/joystick.h"
--- 128,132 ----
  //  wxJoystick
  
! %if wxLUA_USE_wxJoystick & wxUSE_JOYSTICK
  
  %include "wx/joystick.h"
***************
*** 216,219 ****
  %endclass
  
! %endif //wxLUA_USE_wxJoystick|wxUSE_JOYSTICK
  
--- 216,219 ----
  %endclass
  
! %endif //wxLUA_USE_wxJoystick & wxUSE_JOYSTICK
  

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** wx_datatypes.lua	9 Feb 2007 05:17:08 -0000	1.47
--- wx_datatypes.lua	22 Feb 2007 20:33:08 -0000	1.48
***************
*** 1697,1701 ****
    wxJoystick = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,
--- 1697,1701 ----
    wxJoystick = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxJoystick && wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,
***************
*** 1704,1708 ****
    wxJoystickEvent = {
      BaseClass = "wxEvent",
!     Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,
--- 1704,1708 ----
    wxJoystickEvent = {
      BaseClass = "wxEvent",
!     Condition = "wxLUA_USE_wxJoystick && wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,