[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.56, 1.57 clipdrag.cpp, 1.48, 1.49 controls.cpp, 1.68, 1.69 data.cpp, 1.54, 1.55 datetime.cpp, 1.47, 1.48 defsutil.cpp, 1.43, 1.44 dialogs.cpp, 1.49, 1.50 event.cpp, 1.53, 1.54 gdi.cpp, 1.73, 1.74 grid.cpp, 1.44, 1.45 help.cpp, 1.41, 1.42 html.cpp, 1.50, 1.51 image.cpp, 1.47, 1.48 menutool.cpp, 1.47, 1.48 picker.cpp, 1.1, 1.2 print.cpp, 1.46, 1.47 sizer.cpp, 1.40, 1.41 socket.cpp, 1.44, 1.45 wave.cpp, 1.44, 1.45 windows.cpp, 1.63, 1.64 wx_bind.cpp, 1.109, 1.110

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

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

Modified Files:
	appframe.cpp clipdrag.cpp controls.cpp data.cpp datetime.cpp 
	defsutil.cpp dialogs.cpp event.cpp gdi.cpp grid.cpp help.cpp 
	html.cpp image.cpp menutool.cpp picker.cpp print.cpp sizer.cpp 
	socket.cpp wave.cpp windows.cpp wx_bind.cpp 
Log Message:
Fix compilation in MSW, add includes, etc
Change genwxbind.lua to preserve the order of conditions, fifo instead of filo
   not sure why it reversed the order before, but it doesn't seem right.


Index: print.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** print.cpp	18 Jun 2007 02:56:32 -0000	1.46
--- print.cpp	18 Jun 2007 14:55:02 -0000	1.47
***************
*** 35,39 ****
  int s_wxluatag_wxPrintout = -1;
  
! #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetDC[] = { &s_wxluatag_wxPrintout, NULL };
  static int LUACALL wxLua_wxPrintout_GetDC(lua_State *L);
--- 35,39 ----
  int s_wxluatag_wxPrintout = -1;
  
! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetDC[] = { &s_wxluatag_wxPrintout, NULL };
[...1890 lines suppressed...]
      { 0, 0, 0, 0 },
--- 4008,4014 ----
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrinterDC_delete, 1, NULL },
  
! #if ((wxUSE_POSTSCRIPT) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxCHECK_VERSION(2,6,0))
      { "wxPrinterDC", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxPrinterDC_constructor, 1, NULL },
! #endif // ((wxUSE_POSTSCRIPT) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxCHECK_VERSION(2,6,0))
  
      { 0, 0, 0, 0 },
***************
*** 3954,3957 ****
  int wxPrinterDC_methodCount = sizeof(wxPrinterDC_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)
  
--- 4017,4020 ----
  int wxPrinterDC_methodCount = sizeof(wxPrinterDC_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_POSTSCRIPT) && (defined(__WXMSW__) || defined(__WXMAC__))
  

Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** controls.cpp	18 Jun 2007 02:56:27 -0000	1.68
--- controls.cpp	18 Jun 2007 14:54:59 -0000	1.69
***************
*** 219,223 ****
  
  
! #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
  // ---------------------------------------------------------------------------
  // Bind class wxBitmapButton
--- 219,223 ----
  
  
! #if (wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON)
  // ---------------------------------------------------------------------------
[...1513 lines suppressed...]
      { "SetTextColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemAttr_SetTextColour, 1, NULL },
! #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxColourPenBrush)
  
! #if ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL)
      { "wxTreeItemAttr", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxTreeItemAttr_constructor, 1, NULL },
! #endif // ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL)
  
      { 0, 0, 0, 0 },
--- 12738,12748 ----
  #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)
  
! #if (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxCHECK_VERSION(2,8,0))
      { "SetTextColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemAttr_SetTextColour, 1, NULL },
! #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxCHECK_VERSION(2,8,0))
  
! #if ((wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)) && (wxCHECK_VERSION(2,8,0))
      { "wxTreeItemAttr", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxTreeItemAttr_constructor, 1, NULL },
! #endif // ((wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)) && (wxCHECK_VERSION(2,8,0))
  
      { 0, 0, 0, 0 },

Index: clipdrag.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** clipdrag.cpp	18 Jun 2007 02:56:27 -0000	1.48
--- clipdrag.cpp	18 Jun 2007 14:54:59 -0000	1.49
***************
*** 294,298 ****
  
  
! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
  // ---------------------------------------------------------------------------
  // Bind class wxClipboardTextEvent
--- 294,298 ----
  
  
! #if (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) && (wxCHECK_VERSION(2,8,0))
  // ---------------------------------------------------------------------------
  // Bind class wxClipboardTextEvent
***************
*** 356,360 ****
  int wxClipboardTextEvent_methodCount = sizeof(wxClipboardTextEvent_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
  
  
--- 356,360 ----
  int wxClipboardTextEvent_methodCount = sizeof(wxClipboardTextEvent_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) && (wxCHECK_VERSION(2,8,0))
  
  
***************
*** 1353,1357 ****
  
  
! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  // ---------------------------------------------------------------------------
  // Bind class wxURLDataObject
--- 1353,1357 ----
  
  
! #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0))
  // ---------------------------------------------------------------------------
  // Bind class wxURLDataObject
***************
*** 1431,1435 ****
  int wxURLDataObject_methodCount = sizeof(wxURLDataObject_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
  
--- 1431,1435 ----
  int wxURLDataObject_methodCount = sizeof(wxURLDataObject_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0))
  
  
***************
*** 1525,1529 ****
  
  
! #if (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_SetCursor[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Integer, &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxDropSource_SetCursor(lua_State *L);
--- 1525,1529 ----
  
  
! #if (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_SetCursor[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Integer, &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxDropSource_SetCursor(lua_State *L);
***************
*** 1545,1549 ****
  }
  
! #endif // (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  
  #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
--- 1545,1549 ----
  }
  
! #endif // (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  
  #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
***************
*** 1618,1622 ****
  #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor2[] = { &s_wxluatag_wxDataObject, &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxDropSource_constructor2(lua_State *L);
--- 1618,1622 ----
  #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ ))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor2[] = { &s_wxluatag_wxDataObject, &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxDropSource_constructor2(lua_State *L);
***************
*** 1650,1654 ****
  }
  
! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor)
  
  #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
--- 1650,1654 ----
  }
  
! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ ))
  
  #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
***************
*** 1684,1688 ****
  #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  
! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxDropSource_constructor(lua_State *L);
--- 1684,1688 ----
  #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  
! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxDropSource_constructor(lua_State *L);
***************
*** 1714,1722 ****
  }
  
! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  
  
  
! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
  static int LUACALL wxLua_wxDropSource_constructor_overload(lua_State *L);
  // function overload table
--- 1714,1722 ----
  }
  
! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  
  
  
! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
  static int LUACALL wxLua_wxDropSource_constructor_overload(lua_State *L);
  // function overload table
***************
*** 1729,1735 ****
  #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor)
      { wxLua_wxDropSource_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxDropSource_constructor2 },
! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor)
  
  #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
--- 1729,1735 ----
  #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ ))
      { wxLua_wxDropSource_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxDropSource_constructor2 },
! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ ))
  
  #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
***************
*** 1737,1743 ****
  #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  
! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
      { wxLua_wxDropSource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 4, s_wxluatagArray_wxLua_wxDropSource_constructor },
! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  };
  static int s_wxluafunc_wxLua_wxDropSource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDropSource_constructor_overload)/sizeof(wxLuaBindCFunc);
--- 1737,1743 ----
  #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  
! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
      { wxLua_wxDropSource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 4, s_wxluatagArray_wxLua_wxDropSource_constructor },
! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))
  };
  static int s_wxluafunc_wxLua_wxDropSource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDropSource_constructor_overload)/sizeof(wxLuaBindCFunc);
***************
*** 1750,1754 ****
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
  
  // Map Lua Class Methods to C Binding Functions
--- 1750,1754 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
  
  // Map Lua Class Methods to C Binding Functions
***************
*** 1760,1766 ****
      { "GiveFeedback", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_GiveFeedback, 1, NULL },
  
! #if (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
      { "SetCursor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_SetCursor, 1, NULL },
! #endif // (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  
  #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
--- 1760,1766 ----
      { "GiveFeedback", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_GiveFeedback, 1, NULL },
  
! #if (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
      { "SetCursor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_SetCursor, 1, NULL },
! #endif // (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  
  #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
***************
*** 1770,1776 ****
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxDropSource_delete, 1, NULL },
  
! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
      { "wxDropSource", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDropSource_constructor_overload, s_wxluafunc_wxLua_wxDropSource_constructor_overload_count, 0 },
! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
  
      { 0, 0, 0, 0 },
--- 1770,1776 ----
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxDropSource_delete, 1, NULL },
  
! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
      { "wxDropSource", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDropSource_constructor_overload, s_wxluafunc_wxLua_wxDropSource_constructor_overload_count, 0 },
! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))
  
      { 0, 0, 0, 0 },
***************
*** 1925,1929 ****
  
  
! #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_Play[] = { &s_wxluatag_wxMetafile, &s_wxluatag_wxDC, NULL };
  static int LUACALL wxLua_wxMetafile_Play(lua_State *L);
--- 1925,1929 ----
  
  
! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_Play[] = { &s_wxluatag_wxMetafile, &s_wxluatag_wxDC, NULL };
  static int LUACALL wxLua_wxMetafile_Play(lua_State *L);
***************
*** 1946,1950 ****
  }
  
! #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_SetClipboard[] = { &s_wxluatag_wxMetafile, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
--- 1946,1950 ----
  }
  
! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_SetClipboard[] = { &s_wxluatag_wxMetafile, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
***************
*** 2000,2006 ****
      { "Ok", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Ok, 1, NULL },
  
! #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
      { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Play, 1, NULL },
! #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
  
      { "SetClipboard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_SetClipboard, 1, NULL },
--- 2000,2006 ----
      { "Ok", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Ok, 1, NULL },
  
! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
      { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Play, 1, NULL },
! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)))
  
      { "SetClipboard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_SetClipboard, 1, NULL },

Index: picker.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/picker.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** picker.cpp	17 Jun 2007 18:36:24 -0000	1.1
--- picker.cpp	18 Jun 2007 14:55:02 -0000	1.2
***************
*** 335,339 ****
  
  
! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  // ---------------------------------------------------------------------------
  // Bind class wxColourPickerCtrl
--- 335,339 ----
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)
  // ---------------------------------------------------------------------------
  // Bind class wxColourPickerCtrl
***************
*** 343,347 ****
  int s_wxluatag_wxColourPickerCtrl = -1;
  
! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_GetColour[] = { &s_wxluatag_wxColourPickerCtrl, NULL };
  static int LUACALL wxLua_wxColourPickerCtrl_GetColour(lua_State *L);
--- 343,347 ----
  int s_wxluatag_wxColourPickerCtrl = -1;
  
! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_GetColour[] = { &s_wxluatag_wxColourPickerCtrl, NULL };
  static int LUACALL wxLua_wxColourPickerCtrl_GetColour(lua_State *L);
***************
*** 365,369 ****
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluaarg_String, NULL };
--- 365,369 ----
  }
  
! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluaarg_String, NULL };
***************
*** 388,392 ****
  
  
! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluatag_wxColour, NULL };
  static int LUACALL wxLua_wxColourPickerCtrl_SetColour(lua_State *L);
--- 388,392 ----
  
  
! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluatag_wxColour, NULL };
  static int LUACALL wxLua_wxColourPickerCtrl_SetColour(lua_State *L);
***************
*** 406,412 ****
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxColourPickerCtrl_constructor1(lua_State *L);
--- 406,412 ----
  }
  
! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxColourPickerCtrl_constructor1(lua_State *L);
***************
*** 446,450 ****
  }
  
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
  static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L);
--- 446,450 ----
  }
  
! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  
  static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L);
***************
*** 469,473 ****
  
  
! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)))
  static int LUACALL wxLua_wxColourPickerCtrl_SetColour_overload(lua_State *L);
  // function overload table
--- 469,473 ----
  
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)))
  static int LUACALL wxLua_wxColourPickerCtrl_SetColour_overload(lua_State *L);
  // function overload table
***************
*** 477,483 ****
      { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 },
  
! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
      { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour },
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  };
  static int s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count = sizeof(s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload)/sizeof(wxLuaBindCFunc);
--- 477,483 ----
      { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 },
  
! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour },
! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  };
  static int s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count = sizeof(s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload)/sizeof(wxLuaBindCFunc);
***************
*** 490,496 ****
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)))
  
! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  static int LUACALL wxLua_wxColourPickerCtrl_constructor_overload(lua_State *L);
  // function overload table
--- 490,496 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)))
  
! #if ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  static int LUACALL wxLua_wxColourPickerCtrl_constructor_overload(lua_State *L);
  // function overload table
***************
*** 499,505 ****
      { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None },
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 },
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None },
  };
--- 499,505 ----
      { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None },
  
! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
      { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 },
! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
      { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None },
  };
***************
*** 513,531 ****
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxColourPickerCtrl_methods[] = {
! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
      { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL },
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)))
      { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count, 0 },
! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)))
  
! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
      { "wxColourPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload_count, 0 },
! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
      { 0, 0, 0, 0 },
--- 513,531 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxColourPickerCtrl_methods[] = {
! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL },
! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)))
      { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count, 0 },
! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)))
  
! #if ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { "wxColourPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload_count, 0 },
! #endif // ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
      { 0, 0, 0, 0 },
***************
*** 534,541 ****
  int wxColourPickerCtrl_methodCount = sizeof(wxColourPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  
  
! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  // ---------------------------------------------------------------------------
  // Bind class wxColourPickerEvent
--- 534,541 ----
  int wxColourPickerCtrl_methodCount = sizeof(wxColourPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)
  // ---------------------------------------------------------------------------
  // Bind class wxColourPickerEvent
***************
*** 545,549 ****
  int s_wxluatag_wxColourPickerEvent = -1;
  
! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_GetColour[] = { &s_wxluatag_wxColourPickerEvent, NULL };
  static int LUACALL wxLua_wxColourPickerEvent_GetColour(lua_State *L);
--- 545,549 ----
  int s_wxluatag_wxColourPickerEvent = -1;
  
! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_GetColour[] = { &s_wxluatag_wxColourPickerEvent, NULL };
  static int LUACALL wxLua_wxColourPickerEvent_GetColour(lua_State *L);
***************
*** 584,588 ****
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_delete[] = { &s_wxluatag_wxColourPickerEvent, NULL };
--- 584,588 ----
  }
  
! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_delete[] = { &s_wxluatag_wxColourPickerEvent, NULL };
***************
*** 603,607 ****
  
  
! #if ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL };
  static int LUACALL wxLua_wxColourPickerEvent_constructor1(lua_State *L);
--- 603,607 ----
  
  
! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL };
  static int LUACALL wxLua_wxColourPickerEvent_constructor1(lua_State *L);
***************
*** 629,633 ****
  }
  
! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject)
  
  static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L);
--- 629,633 ----
  }
  
! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0))
  
  static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L);
***************
*** 652,656 ****
  
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  static int LUACALL wxLua_wxColourPickerEvent_constructor_overload(lua_State *L);
  // function overload table
--- 652,656 ----
  
  
! #if ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  static int LUACALL wxLua_wxColourPickerEvent_constructor_overload(lua_State *L);
  // function overload table
***************
*** 659,665 ****
      { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None },
  
! #if ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject)
      { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 },
! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject)
      { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None },
  };
--- 659,665 ----
      { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None },
  
! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0))
      { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 },
! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0))
      { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None },
  };
***************
*** 673,690 ****
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxColourPickerEvent_methods[] = {
! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
      { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_GetColour, 1, NULL },
      { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_SetColour, 1, NULL },
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL },
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
      { "wxColourPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload_count, 0 },
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
  
      { 0, 0, 0, 0 },
--- 673,690 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxColourPickerEvent_methods[] = {
! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_GetColour, 1, NULL },
      { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_SetColour, 1, NULL },
! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL },
  
! #if ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { "wxColourPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload_count, 0 },
! #endif // ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
      { 0, 0, 0, 0 },
***************
*** 693,700 ****
  int wxColourPickerEvent_methodCount = sizeof(wxColourPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  
  
! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  // ---------------------------------------------------------------------------
  // Bind class wxDatePickerCtrl
--- 693,700 ----
  int wxColourPickerEvent_methodCount = sizeof(wxColourPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)
  
  
! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)
  // ---------------------------------------------------------------------------
  // Bind class wxDatePickerCtrl
***************
*** 730,734 ****
  
  
! #if ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue[] = { &s_wxluatag_wxDatePickerCtrl, NULL };
  static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L);
--- 730,734 ----
  
  
! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue[] = { &s_wxluatag_wxDatePickerCtrl, NULL };
  static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L);
***************
*** 788,794 ****
  }
  
! #endif // ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  
! #if ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L);
--- 788,794 ----
  }
  
! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  
! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L);
***************
*** 828,832 ****
  }
  
! #endif // ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  
  
--- 828,832 ----
  }
  
! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  
  
***************
*** 836,848 ****
      { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL },
  
! #if ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
      { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetValue, 1, NULL },
      { "SetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetRange, 1, NULL },
      { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetValue, 1, NULL },
! #endif // ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  
! #if ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
      { "wxDatePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDatePickerCtrl_constructor, 1, NULL },
! #endif // ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  
      { 0, 0, 0, 0 },
--- 836,848 ----
      { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL },
  
! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
      { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetValue, 1, NULL },
      { "SetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetRange, 1, NULL },
      { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetValue, 1, NULL },
! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  
! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
      { "wxDatePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDatePickerCtrl_constructor, 1, NULL },
! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  
      { 0, 0, 0, 0 },
***************
*** 851,858 ****
  int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  
  
! #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  // ---------------------------------------------------------------------------
  // Bind class wxFileDirPickerCtrlBase
--- 851,858 ----
  int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)
  
  
! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxFileDirPickerCtrlBase
***************
*** 950,957 ****
  int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  
  
! #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)
  // ---------------------------------------------------------------------------
  // Bind class wxFileDirPickerEvent
--- 950,957 ----
  int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxFileDirPickerEvent
***************
*** 1013,1017 ****
  
  
! #if (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxObject)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDirPickerEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxFileDirPickerEvent_constructor(lua_State *L);
--- 1013,1017 ----
  
  
! #if (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDirPickerEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxFileDirPickerEvent_constructor(lua_State *L);
***************
*** 1041,1045 ****
  }
  
! #endif // (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxObject)
  
  
--- 1041,1045 ----
  }
  
! #endif // (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))
  
  
***************
*** 1051,1057 ****
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileDirPickerEvent_delete, 1, NULL },
  
! #if (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxObject)
      { "wxFileDirPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFileDirPickerEvent_constructor, 1,...
 
[truncated message content]