[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.58, 1.59 clipdrag.cpp, 1.49, 1.50 controls.cpp, 1.70, 1.71 data.cpp, 1.56, 1.57 datetime.cpp, 1.48, 1.49 defsutil.cpp, 1.44, 1.45 dialogs.cpp, 1.50, 1.51 event.cpp, 1.54, 1.55 gdi.cpp, 1.74, 1.75 grid.cpp, 1.45, 1.46 help.cpp, 1.42, 1.43 html.cpp, 1.52, 1.53 image.cpp, 1.48, 1.49 menutool.cpp, 1.48, 1.49 picker.cpp, 1.2, 1.3 print.cpp, 1.47, 1.48 sizer.cpp, 1.41, 1.42 socket.cpp, 1.45, 1.46 wave.cpp, 1.45, 1.46 windows.cpp, 1.65, 1.66 wx_bind.cpp, 1.111, 1.112 wxlua.cpp, 1.45, 1.46

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/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 wxlua.cpp 
Log Message:
Fix last commit of trying to preserve the order of the binding conditions, this way works.


Index: defsutil.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** defsutil.cpp	18 Jun 2007 14:54:59 -0000	1.44
--- defsutil.cpp	18 Jun 2007 21:40:42 -0000	1.45
***************
*** 823,827 ****
  
  
! #if (wxLUA_USE_wxBusyCursor) && (defined (__X__ ))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L);
--- 823,827 ----
  
  
! #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, NULL };
  static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L);
***************
*** 851,855 ****
  
  
! #endif // (wxLUA_USE_wxBusyCursor) && (defined (__X__ ))
  
  
--- 851,855 ----
  
  
! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
  
  
***************
*** 859,865 ****
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxBusyCursor_delete, 1, NULL },
  
! #if (wxLUA_USE_wxBusyCursor) && (defined (__X__ ))
      { "wxBusyCursor", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxBusyCursor_constructor, 1, NULL },
! #endif // (wxLUA_USE_wxBusyCursor) && (defined (__X__ ))
  
      { 0, 0, 0, 0 },
--- 859,865 ----
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxBusyCursor_delete, 1, NULL },
  
! #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
      { "wxBusyCursor", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxBusyCursor_constructor, 1, NULL },
! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
  
      { 0, 0, 0, 0 },

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxlua.cpp	18 Jun 2007 19:51:38 -0000	1.45
--- wxlua.cpp	18 Jun 2007 21:40:52 -0000	1.46
***************
*** 231,235 ****
  int s_wxluatag_wxLuaHtmlWinTagEvent = -1;
  
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL };
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L);
--- 231,235 ----
  int s_wxluatag_wxLuaHtmlWinTagEvent = -1;
  
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL };
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L);
***************
*** 268,272 ****
  }
  
! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0))
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL };
--- 268,272 ----
  }
  
! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL };
***************
*** 328,335 ****
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[] = {
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0))
      { "GetHtmlParser", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 1, NULL },
      { "GetHtmlTag", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 1, NULL },
! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0))
  
      { "GetParseInnerCalled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 1, NULL },
--- 328,335 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[] = {
! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
      { "GetHtmlParser", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 1, NULL },
      { "GetHtmlTag", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 1, NULL },
! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
      { "GetParseInnerCalled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 1, NULL },

Index: image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** image.cpp	18 Jun 2007 14:55:02 -0000	1.48
--- image.cpp	18 Jun 2007 21:40:46 -0000	1.49
***************
*** 3247,3251 ****
  
  
! #if (wxUSE_ICO_CUR) && (wxUSE_IFF)
  // ---------------------------------------------------------------------------
  // Bind class wxIFFHandler
--- 3247,3251 ----
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_IFF)
  // ---------------------------------------------------------------------------
  // Bind class wxIFFHandler
***************
*** 3285,3292 ****
  int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_ICO_CUR) && (wxUSE_IFF)
  
  
! #if (wxUSE_IFF) && (wxUSE_GIF)
  // ---------------------------------------------------------------------------
  // Bind class wxGIFHandler
--- 3285,3292 ----
  int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_IFF)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_GIF)
  // ---------------------------------------------------------------------------
  // Bind class wxGIFHandler
***************
*** 3326,3333 ****
  int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_IFF) && (wxUSE_GIF)
  
  
! #if (wxUSE_GIF) && (wxUSE_LIBJPEG)
  // ---------------------------------------------------------------------------
  // Bind class wxJPEGHandler
--- 3326,3333 ----
  int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_GIF)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBJPEG)
  // ---------------------------------------------------------------------------
  // Bind class wxJPEGHandler
***************
*** 3367,3374 ****
  int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_GIF) && (wxUSE_LIBJPEG)
  
  
! #if (wxUSE_LIBJPEG) && (wxUSE_PCX)
  // ---------------------------------------------------------------------------
  // Bind class wxPCXHandler
--- 3367,3374 ----
  int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBJPEG)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PCX)
  // ---------------------------------------------------------------------------
  // Bind class wxPCXHandler
***************
*** 3408,3415 ****
  int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_LIBJPEG) && (wxUSE_PCX)
  
  
! #if (wxUSE_PCX) && (wxUSE_LIBPNG)
  // ---------------------------------------------------------------------------
  // Bind class wxPNGHandler
--- 3408,3415 ----
  int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PCX)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBPNG)
  // ---------------------------------------------------------------------------
  // Bind class wxPNGHandler
***************
*** 3449,3456 ****
  int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_PCX) && (wxUSE_LIBPNG)
  
  
! #if (wxUSE_LIBPNG) && (wxUSE_PNM)
  // ---------------------------------------------------------------------------
  // Bind class wxPNMHandler
--- 3449,3456 ----
  int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBPNG)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PNM)
  // ---------------------------------------------------------------------------
  // Bind class wxPNMHandler
***************
*** 3490,3497 ****
  int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_LIBPNG) && (wxUSE_PNM)
  
  
! #if (wxUSE_PNM) && (wxUSE_LIBTIFF)
  // ---------------------------------------------------------------------------
  // Bind class wxTIFFHandler
--- 3490,3497 ----
  int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PNM)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBTIFF)
  // ---------------------------------------------------------------------------
  // Bind class wxTIFFHandler
***************
*** 3531,3538 ****
  int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_PNM) && (wxUSE_LIBTIFF)
  
  
! #if (wxUSE_LIBTIFF) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA)
  // ---------------------------------------------------------------------------
  // Bind class wxTGAHandler
--- 3531,3538 ----
  int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBTIFF)
  
  
! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA)
  // ---------------------------------------------------------------------------
  // Bind class wxTGAHandler
***************
*** 3572,3579 ****
  int wxTGAHandler_methodCount = sizeof(wxTGAHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxUSE_LIBTIFF) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA)
  
  
! #if wxCHECK_VERSION(2,8,0) && wxUSE_TGA
  // ---------------------------------------------------------------------------
  // Bind class wxXPMHandler
--- 3572,3579 ----
  int wxTGAHandler_methodCount = sizeof(wxTGAHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA)
  
  
! #if wxLUA_USE_wxImage && wxUSE_IMAGE
  // ---------------------------------------------------------------------------
  // Bind class wxXPMHandler
***************
*** 3613,3617 ****
  int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // wxCHECK_VERSION(2,8,0) && wxUSE_TGA
  
  
--- 3613,3617 ----
  int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // wxLUA_USE_wxImage && wxUSE_IMAGE
  
  
***************
*** 3645,3649 ****
  #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
  
! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetBitmap[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL };
  static int LUACALL wxLua_wxArtProvider_GetBitmap(lua_State *L);
--- 3645,3649 ----
  #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
  
! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetBitmap[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL };
  static int LUACALL wxLua_wxArtProvider_GetBitmap(lua_State *L);
***************
*** 3673,3679 ****
  }
  
! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  
! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetIcon[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL };
  static int LUACALL wxLua_wxArtProvider_GetIcon(lua_State *L);
--- 3673,3679 ----
  }
  
! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
  
! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetIcon[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL };
  static int LUACALL wxLua_wxArtProvider_GetIcon(lua_State *L);
***************
*** 3703,3709 ****
  }
  
! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint[] = { &s_wxluaarg_String, &s_wxluaarg_Boolean, NULL };
  static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L);
--- 3703,3709 ----
  }
  
! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint[] = { &s_wxluaarg_String, &s_wxluaarg_Boolean, NULL };
  static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L);
***************
*** 3731,3735 ****
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
  
  #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
--- 3731,3735 ----
  }
  
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider)
  
  #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
***************
*** 3812,3826 ****
  #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
  
! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
      { "GetBitmap", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetBitmap, 1, NULL },
! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  
! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
      { "GetIcon", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetIcon, 1, NULL },
! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0))
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
      { "GetSizeHint", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint, 1, NULL },
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
  
  #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
--- 3812,3826 ----
  #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))
  
! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
      { "GetBitmap", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetBitmap, 1, NULL },
! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
  
! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
      { "GetIcon", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetIcon, 1, NULL },
! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider)
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider)
      { "GetSizeHint", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint, 1, NULL },
! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider)
  
  #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0)))

Index: picker.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/picker.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** picker.cpp	18 Jun 2007 14:55:02 -0000	1.2
--- picker.cpp	18 Jun 2007 21:40:46 -0000	1.3
***************
*** 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);
--- 343,347 ----
  int s_wxluatag_wxColourPickerCtrl = -1;
  
! #if (wxLUA_USE_wxColourPenBrush) && ((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 // (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 };
--- 365,369 ----
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && ((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 (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);
--- 388,392 ----
  
  
! #if (wxLUA_USE_wxColourPenBrush) && ((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 // (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);
--- 406,412 ----
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (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);
***************
*** 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);
--- 446,450 ----
  }
  
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
  static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L);
***************
*** 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
--- 469,473 ----
  
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((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 (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);
--- 477,483 ----
      { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 },
  
! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour },
! #endif // (wxLUA_USE_wxColourPenBrush) && ((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 // ((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
--- 490,496 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)))
  
! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((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_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 },
  };
--- 499,505 ----
      { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None },
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 },
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None },
  };
***************
*** 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 },
--- 513,531 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxColourPickerCtrl_methods[] = {
! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
      { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL },
! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((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))||((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)))
  
! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((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_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
      { 0, 0, 0, 0 },
***************
*** 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);
--- 545,549 ----
  int s_wxluatag_wxColourPickerEvent = -1;
  
! #if (wxLUA_USE_wxColourPenBrush) && ((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 // (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 };
--- 584,588 ----
  }
  
! #endif // (wxLUA_USE_wxColourPenBrush) && ((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 (((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);
--- 603,607 ----
  
  
! #if ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (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);
***************
*** 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);
--- 629,633 ----
  }
  
! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject)
  
  static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L);
***************
*** 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
--- 652,656 ----
  
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((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 (((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 },
  };
--- 659,665 ----
      { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None },
  
! #if ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject)
      { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 },
! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject)
      { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None },
  };
***************
*** 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 },
--- 673,690 ----
      return wxlState.CallOverloadedFunction(&overload_method);
  }
! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxColourPickerEvent_methods[] = {
! #if (wxLUA_USE_wxColourPenBrush) && ((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 // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL },
  
! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((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 // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))
  
      { 0, 0, 0, 0 },
***************
*** 696,700 ****
  
  
! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)
  // ---------------------------------------------------------------------------
  // Bind class wxDatePickerCtrl
--- 696,700 ----
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)
  // ---------------------------------------------------------------------------
  // Bind class wxDatePickerCtrl
***************
*** 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);
--- 730,734 ----
  
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (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_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);
--- 788,794 ----
  }
  
! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  
! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (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_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect)
  
  
--- 828,832 ----
  }
  
! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (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_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 },
--- 836,848 ----
      { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL },
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (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 // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)
  
! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (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) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (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_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
--- 851,858 ----
  int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((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_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
--- 950,957 ----
  int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxFileDirPickerEvent
***************
*** 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);
--- 1013,1017 ----
  
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (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);
***************
*** 1041,1045 ****
  }
  
! #endif // (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))
  
  
--- 1041,1045 ----
  }
  
! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject)
  
  
***************
*** 1051,1057 ****
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileDirPickerEvent_delete, 1, NULL },
  
! #if (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))
      { "wxFileDirPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFileDirPickerEvent_constructor, 1, NULL },
! #endif // (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))
  
      { 0, 0, 0, 0 },
--- 1051,1057 ----
      { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileDirPickerEvent_delete, 1, NULL },
  
! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject)
      { "wxFileDirPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFileDirPickerEvent_constructor, 1, NULL },
! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject)
  
      { 0, 0, 0, 0 },
***************
*** 1060,1067 ****
  int wxFileDirPickerEvent_methodCount = sizeof(wxFileDirPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxDirPickerCtrl
--- 1060,1067 ----
  int wxFileDirPickerEvent_methodCount = sizeof(wxFileDirPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxDirPickerCtrl
***************
*** 1071,1075 ****
  int s_wxluatag_wxDirPickerCtrl = -1;
  
! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDirPickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxDirPickerCtrl_constructor(lua_State *L);
--- 1071,1075 ----
  int s_wxluatag_wxDirPickerCtrl = -1;
  
! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDirPickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxDirPickerCtrl_constructor(lua_State *L);
***************
*** 1111,1115 ****
  }
  
! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect)
  
  
--- 1111,1115 ----
  }
  
! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
  
***************
*** 1117,1123 ****
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxDirPickerCtrl_methods[] = {
! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect)
      { "wxDirPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDirPickerCtrl_constructor, 1, NULL },
! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect)
  
      { 0, 0, 0, 0 },
--- 1117,1123 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxDirPickerCtrl_methods[] = {
! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { "wxDirPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDirPickerCtrl_constructor, 1, NULL },
! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
      { 0, 0, 0, 0 },
***************
*** 1126,1133 ****
  int wxDirPickerCtrl_methodCount = sizeof(wxDirPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxFilePickerCtrl
--- 1126,1133 ----
  int wxDirPickerCtrl_methodCount = sizeof(wxDirPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  // ---------------------------------------------------------------------------
  // Bind class wxFilePickerCtrl
***************
*** 1137,1141 ****
  int s_wxluatag_wxFilePickerCtrl = -1;
  
! #if (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFilePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxFilePickerCtrl_constructor(lua_State *L);
--- 1137,1141 ----
  int s_wxluatag_wxFilePickerCtrl = -1;
  
! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFilePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxFilePickerCtrl_constructor(lua_State *L);
***************
*** 1179,1183 ****
  }
  
! #endif // (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
  
--- 1179,1183 ----
  }
  
! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
  
***************
*** 1185,1191 ****
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxFilePickerCtrl_methods[] = {
! #if (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { "wxFilePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFilePickerCtrl_constructor, 1, NULL },
! #endif // (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
      { 0, 0, 0, 0 },
--- 1185,1191 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxFilePickerCtrl_methods[] = {
! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
      { "wxFilePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFilePickerCtrl_constructor, 1, NULL },
! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect)
  
      { 0, 0, 0, 0 },
***************
*** 1194,1201 ****
  int wxFilePickerCtrl_methodCount = sizeof(wxFilePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))
  
  
! #if (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)
  // ---------------------------------------------------------------------------
  // Bind class wxFontPickerCtrl
--- 1194,1201 ----
  int wxFilePickerCtrl_methodCount = sizeof(wxFilePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1;
  
! #endif  // (wxchkver_2_8 && wxLUA_U...
 
[truncated message content]