Menu
▾
▴
wxlua-commit
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12669/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp dialogs.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: added all wxWidget's wxUSE_XXX conditions to the bindings Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** xml.cpp 22 Feb 2007 05:40:53 -0000 1.21 --- xml.cpp 23 Feb 2007 04:35:33 -0000 1.22 *************** *** 27,31 **** ! #if wxLUA_USE_wxXMLResource // ------------------------------------------------------------------------------------------------- // Bind class wxXmlNode --- 27,31 ---- ! #if wxLUA_USE_wxXMLResource && wxUSE_XML // ------------------------------------------------------------------------------------------------- // Bind class wxXmlNode *************** *** 547,554 **** int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]); ! #endif // wxLUA_USE_wxXMLResource ! #if wxLUA_USE_wxXMLResource // ------------------------------------------------------------------------------------------------- // Bind class wxXmlProperty --- 547,554 ---- int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]); ! #endif // wxLUA_USE_wxXMLResource && wxUSE_XML ! #if wxLUA_USE_wxXMLResource && wxUSE_XML // ------------------------------------------------------------------------------------------------- // Bind class wxXmlProperty *************** *** 733,740 **** int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]); ! #endif // wxLUA_USE_wxXMLResource ! #if wxLUA_USE_wxXMLResource // ------------------------------------------------------------------------------------------------- // Bind class wxXmlDocument --- 733,740 ---- int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]); ! #endif // wxLUA_USE_wxXMLResource && wxUSE_XML ! #if wxLUA_USE_wxXMLResource && wxUSE_XML // ------------------------------------------------------------------------------------------------- // Bind class wxXmlDocument *************** *** 977,984 **** int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]); ! #endif // wxLUA_USE_wxXMLResource ! #if wxLUA_USE_wxXMLResource // ------------------------------------------------------------------------------------------------- // Bind class wxXmlResourceHandler --- 977,984 ---- int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]); ! #endif // wxLUA_USE_wxXMLResource && wxUSE_XML ! #if wxLUA_USE_wxXMLResource && wxUSE_XML // ------------------------------------------------------------------------------------------------- // Bind class wxXmlResourceHandler *************** *** 1001,1008 **** int wxXmlResourceHandler_methodCount = sizeof(wxXmlResourceHandler_methods)/sizeof(wxXmlResourceHandler_methods[0]); ! #endif // wxLUA_USE_wxXMLResource ! #if wxLUA_USE_wxXMLResource // ------------------------------------------------------------------------------------------------- // Bind class wxXmlResource --- 1001,1008 ---- int wxXmlResourceHandler_methodCount = sizeof(wxXmlResourceHandler_methods)/sizeof(wxXmlResourceHandler_methods[0]); ! #endif // wxLUA_USE_wxXMLResource && wxUSE_XML ! #if wxLUA_USE_wxXMLResource && wxUSE_XML // ------------------------------------------------------------------------------------------------- // Bind class wxXmlResource *************** *** 1013,1017 **** ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluaarg_String, 0 }; // wxBitmap LoadBitmap(const wxString& name); --- 1013,1017 ---- ! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluaarg_String, 0 }; // wxBitmap LoadBitmap(const wxString& name); *************** *** 1035,1042 **** } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); --- 1035,1042 ---- } ! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); *************** *** 1107,1114 **** } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); --- 1107,1114 ---- } ! #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); *************** *** 1159,1166 **** } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluaarg_String, 0 }; // wxIcon LoadIcon(const wxString& name); --- 1159,1166 ---- } ! #endif // (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluaarg_String, 0 }; // wxIcon LoadIcon(const wxString& name); *************** *** 1184,1191 **** } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluaarg_String, 0 }; // wxMenu* LoadMenu(const wxString& name); --- 1184,1191 ---- } ! #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluaarg_String, 0 }; // wxMenu* LoadMenu(const wxString& name); *************** *** 1244,1251 **** } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); --- 1244,1251 ---- } ! #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); *************** *** 1268,1272 **** } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; --- 1268,1272 ---- } ! #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; *************** *** 1599,1635 **** WXLUAMETHOD wxXmlResource_methods[] = { ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) { LuaMethod, "LoadDialog", wxLua_wxXmlResource_LoadDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }, { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialogCreate }, { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame }, { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) { LuaMethod, "LoadMenu", wxLua_wxXmlResource_LoadMenu, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu }, { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow }, { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) ! #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }, --- 1599,1635 ---- WXLUAMETHOD wxXmlResource_methods[] = { ! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap }, ! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadDialog", wxLua_wxXmlResource_LoadDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }, { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialogCreate }, { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog }, ! #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame }, { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame }, ! #endif // (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon }, ! #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadMenu", wxLua_wxXmlResource_LoadMenu, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu }, { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow }, { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }, ! #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }, ! #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }, *************** *** 1657,1660 **** int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]); ! #endif // wxLUA_USE_wxXMLResource --- 1657,1660 ---- int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]); ! #endif // wxLUA_USE_wxXMLResource && wxUSE_XML Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dialogs.cpp 22 Feb 2007 05:40:52 -0000 1.27 --- dialogs.cpp 23 Feb 2007 04:35:31 -0000 1.28 *************** *** 1006,1010 **** ! #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog // ------------------------------------------------------------------------------------------------- // Bind class wxColourDialog --- 1006,1010 ---- ! #if wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG // ------------------------------------------------------------------------------------------------- // Bind class wxColourDialog *************** *** 1068,1075 **** int wxColourDialog_methodCount = sizeof(wxColourDialog_methods)/sizeof(wxColourDialog_methods[0]); ! #endif // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog ! #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog // ------------------------------------------------------------------------------------------------- // Bind class wxColourData --- 1068,1075 ---- int wxColourDialog_methodCount = sizeof(wxColourDialog_methods)/sizeof(wxColourDialog_methods[0]); ! #endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG ! #if wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG // ------------------------------------------------------------------------------------------------- // Bind class wxColourData *************** *** 1080,1084 **** ! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog) // wxColour GetColour() const static int LUACALL wxLua_wxColourData_GetColour(lua_State *L) --- 1080,1084 ---- ! #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG) // wxColour GetColour() const static int LUACALL wxLua_wxColourData_GetColour(lua_State *L) *************** *** 1152,1156 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog) // wxColourData() --- 1152,1156 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG) // wxColourData() *************** *** 1247,1251 **** WXLUAMETHOD wxColourData_methods[] = { ! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog) { LuaMethod, "GetColour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetCustomColour", wxLua_wxColourData_GetCustomColour, 1, 1, s_wxluatagArray_wxLua_wxColourData_GetCustomColour }, --- 1247,1251 ---- WXLUAMETHOD wxColourData_methods[] = { ! #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG) { LuaMethod, "GetColour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetCustomColour", wxLua_wxColourData_GetCustomColour, 1, 1, s_wxluatagArray_wxLua_wxColourData_GetCustomColour }, *************** *** 1254,1258 **** { LuaGetProp, "Colour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Colour", wxLua_wxColourData_SetColour, 1, 1, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog) { LuaConstructor, "wxColourData", wxLua_wxColourData_constructor, 0, 0, s_wxluaargArray_None }, --- 1254,1258 ---- { LuaGetProp, "Colour", wxLua_wxColourData_GetColour, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Colour", wxLua_wxColourData_SetColour, 1, 1, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG) { LuaConstructor, "wxColourData", wxLua_wxColourData_constructor, 0, 0, s_wxluaargArray_None }, *************** *** 1267,1274 **** int wxColourData_methodCount = sizeof(wxColourData_methods)/sizeof(wxColourData_methods[0]); ! #endif // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog ! #if wxLUA_USE_wxFileDialog // ------------------------------------------------------------------------------------------------- // Bind class wxFileDialog --- 1267,1274 ---- int wxColourData_methodCount = sizeof(wxColourData_methods)/sizeof(wxColourData_methods[0]); ! #endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG ! #if wxLUA_USE_wxFileDialog && wxUSE_FILEDLG // ------------------------------------------------------------------------------------------------- // Bind class wxFileDialog *************** *** 1279,1283 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog) // !%wxchkver27 long GetStyle() const static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L) --- 1279,1283 ---- ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) // !%wxchkver27 long GetStyle() const static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L) *************** *** 1310,1317 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog) ! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetFilenames[] = { &s_wxluatag_wxArrayString, 0 }; // %override wxLua_wxFileDialog_GetFilenames --- 1310,1317 ---- } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetFilenames[] = { &s_wxluatag_wxArrayString, 0 }; // %override wxLua_wxFileDialog_GetFilenames *************** *** 1346,1353 **** } ! #endif // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString) ! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 }; // wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) --- 1346,1353 ---- } ! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 }; // wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) *************** *** 1383,1387 **** } ! #endif // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect) // wxString GetDirectory() const --- 1383,1387 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) // wxString GetDirectory() const *************** *** 1575,1595 **** WXLUAMETHOD wxFileDialog_methods[] = { ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog) { LuaMethod, "GetStyle", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetStyle", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_SetStyle }, { LuaGetProp, "Style", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Style", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluaargArray_None }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog) ! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString) { LuaMethod, "GetFilenames", wxLua_wxFileDialog_GetFilenames, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetFilenames }, { LuaMethod, "GetPaths", wxLua_wxFileDialog_GetPaths, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetPaths }, ! #endif // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxArrayString) ! #if (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 7, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor }, ! #endif // (wxLUA_USE_wxFileDialog) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetDirectory", wxLua_wxFileDialog_GetDirectory, 0, 0, s_wxluaargArray_None }, --- 1575,1595 ---- WXLUAMETHOD wxFileDialog_methods[] = { ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { LuaMethod, "GetStyle", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetStyle", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_SetStyle }, { LuaGetProp, "Style", wxLua_wxFileDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Style", wxLua_wxFileDialog_SetStyle, 1, 1, s_wxluaargArray_None }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { LuaMethod, "GetFilenames", wxLua_wxFileDialog_GetFilenames, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetFilenames }, { LuaMethod, "GetPaths", wxLua_wxFileDialog_GetPaths, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetPaths }, ! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 7, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { LuaMethod, "GetDirectory", wxLua_wxFileDialog_GetDirectory, 0, 0, s_wxluaargArray_None }, *************** *** 1621,1628 **** int wxFileDialog_methodCount = sizeof(wxFileDialog_methods)/sizeof(wxFileDialog_methods[0]); ! #endif // wxLUA_USE_wxFileDialog ! #if wxLUA_USE_wxDirDialog // ------------------------------------------------------------------------------------------------- // Bind class wxDirDialog --- 1621,1628 ---- int wxFileDialog_methodCount = sizeof(wxFileDialog_methods)/sizeof(wxFileDialog_methods[0]); ! #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG ! #if wxLUA_USE_wxDirDialog && wxUSE_DIRDLG // ------------------------------------------------------------------------------------------------- // Bind class wxDirDialog *************** *** 1633,1637 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog) // !%wxchkver27 long GetStyle() const static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L) --- 1633,1637 ---- ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) // !%wxchkver27 long GetStyle() const static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L) *************** *** 1664,1671 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 }; // wxDirDialog(wxWindow* parent, const wxString& message = "Choose a directory", const wxString& defaultPath = "", long style = 0, const wxPoint& pos = wxDefaultPosition) --- 1664,1671 ---- } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 }; // wxDirDialog(wxWindow* parent, const wxString& message = "Choose a directory", const wxString& defaultPath = "", long style = 0, const wxPoint& pos = wxDefaultPosition) *************** *** 1694,1698 **** } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog) // wxString GetPath() const --- 1694,1698 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) // wxString GetPath() const *************** *** 1766,1780 **** WXLUAMETHOD wxDirDialog_methods[] = { ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog) { LuaMethod, "GetStyle", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetStyle", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxDirDialog_SetStyle }, { LuaGetProp, "Style", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Style", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluaargArray_None }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog) { LuaConstructor, "wxDirDialog", wxLua_wxDirDialog_constructor, 5, 1, s_wxluatagArray_wxLua_wxDirDialog_constructor }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog) { LuaMethod, "GetPath", wxLua_wxDirDialog_GetPath, 0, 0, s_wxluaargArray_None }, --- 1766,1780 ---- WXLUAMETHOD wxDirDialog_methods[] = { ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { LuaMethod, "GetStyle", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetStyle", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluatagArray_wxLua_wxDirDialog_SetStyle }, { LuaGetProp, "Style", wxLua_wxDirDialog_GetStyle, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Style", wxLua_wxDirDialog_SetStyle, 1, 1, s_wxluaargArray_None }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { LuaConstructor, "wxDirDialog", wxLua_wxDirDialog_constructor, 5, 1, s_wxluatagArray_wxLua_wxDirDialog_constructor }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { LuaMethod, "GetPath", wxLua_wxDirDialog_GetPath, 0, 0, s_wxluaargArray_None }, *************** *** 1790,1797 **** int wxDirDialog_methodCount = sizeof(wxDirDialog_methods)/sizeof(wxDirDialog_methods[0]); ! #endif // wxLUA_USE_wxDirDialog ! #if wxLUA_USE_wxMessageDialog // ------------------------------------------------------------------------------------------------- // Bind class wxMessageDialog --- 1790,1797 ---- int wxDirDialog_methodCount = sizeof(wxDirDialog_methods)/sizeof(wxDirDialog_methods[0]); ! #endif // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG ! #if wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG // ------------------------------------------------------------------------------------------------- // Bind class wxMessageDialog *************** *** 1802,1806 **** ! #if (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxMessageDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 }; // wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) --- 1802,1806 ---- ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxMessageDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 }; // wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) *************** *** 1832,1836 **** } ! #endif // (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxMessageDialog_destructor(lua_State *) --- 1832,1836 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG) static int LUACALL wxLua_wxMessageDialog_destructor(lua_State *) *************** *** 1844,1850 **** WXLUAMETHOD wxMessageDialog_methods[] = { ! #if (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxMessageDialog", wxLua_wxMessageDialog_constructor, 5, 2, s_wxluatagArray_wxLua_wxMessageDialog_constructor }, ! #endif // (wxLUA_USE_wxMessageDialog) && (wxLUA_USE_wxPointSizeRect) { LuaDelete, "wxMessageDialog", wxLua_wxMessageDialog_destructor, 0, 0, s_wxluaargArray_None }, --- 1844,1850 ---- WXLUAMETHOD wxMessageDialog_methods[] = { ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG) { LuaConstructor, "wxMessageDialog", wxLua_wxMessageDialog_constructor, 5, 2, s_wxluatagArray_wxLua_wxMessageDialog_constructor }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG) { LuaDelete, "wxMessageDialog", wxLua_wxMessageDialog_destructor, 0, 0, s_wxluaargArray_None }, *************** *** 1852,1856 **** int wxMessageDialog_methodCount = sizeof(wxMessageDialog_methods)/sizeof(wxMessageDialog_methods[0]); ! #endif // wxLUA_USE_wxMessageDialog --- 1852,1856 ---- int wxMessageDialog_methodCount = sizeof(wxMessageDialog_methods)/sizeof(wxMessageDialog_methods[0]); ! #endif // wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlua.cpp 22 Feb 2007 05:40:53 -0000 1.27 --- wxlua.cpp 23 Feb 2007 04:35:33 -0000 1.28 *************** *** 399,403 **** ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) // const wxHtmlTag *GetHtmlTag() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) --- 399,403 ---- ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) // const wxHtmlTag *GetHtmlTag() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) *************** *** 430,434 **** } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; --- 430,434 ---- } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; *************** *** 494,503 **** WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, --- 494,503 ---- WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** image.cpp 22 Feb 2007 05:40:53 -0000 1.25 --- image.cpp 23 Feb 2007 04:35:32 -0000 1.26 *************** *** 27,31 **** ! #if wxLUA_USE_wxImage // ------------------------------------------------------------------------------------------------- // Bind class wxImage --- 27,31 ---- ! #if wxLUA_USE_wxImage && wxUSE_IMAGE // ------------------------------------------------------------------------------------------------- // Bind class wxImage *************** *** 36,40 **** ! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage) static wxLuaArgTag s_wxluatagArray_wxLua_wxImageFromBitmap_constructor[] = { &s_wxluatag_wxBitmap, 0 }; // %override wxLua_wxImageFromBitmap_constructor --- 36,40 ---- ! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxImageFromBitmap_constructor[] = { &s_wxluatag_wxBitmap, 0 }; // %override wxLua_wxImageFromBitmap_constructor *************** *** 56,63 **** } ! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage) ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) // static wxList& GetHandlers() static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L) --- 56,63 ---- } ! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // static wxList& GetHandlers() static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L) *************** *** 73,80 **** } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) ! #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) // wxPalette GetPalette() const static int LUACALL wxLua_wxImage_GetPalette(lua_State *L) --- 73,80 ---- } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // wxPalette GetPalette() const static int LUACALL wxLua_wxImage_GetPalette(lua_State *L) *************** *** 110,117 **** } ! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetSubImage[] = { &s_wxluatag_wxRect, 0 }; // wxImage GetSubImage(const wxRect& rect) const --- 110,117 ---- } ! #endif // (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetSubImage[] = { &s_wxluatag_wxRect, 0 }; // wxImage GetSubImage(const wxRect& rect) const *************** *** 244,251 **** } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage) static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetImageCountStream[] = { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 }; // %rename GetImageCountStream static int GetImageCount(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY) --- 244,251 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetImageCountStream[] = { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 }; // %rename GetImageCountStream static int GetImageCount(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY) *************** *** 292,296 **** } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_constructor[] = { &s_wxluatag_wxImage, 0 }; --- 292,296 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_constructor[] = { &s_wxluatag_wxImage, 0 }; *************** *** 1480,1500 **** WXLUAMETHOD wxImage_methods[] = { ! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, s_wxluatagArray_wxLua_wxImageFromBitmap_constructor }, ! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage) ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) ! #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, s_wxluatagArray_wxLua_wxImage_SetPalette }, ! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) { LuaMethod, "GetSubImage", wxLua_wxImage_GetSubImage, 1, 1, s_wxluatagArray_wxLua_wxImage_GetSubImage }, { LuaMethod, "Resize", wxLua_wxImage_Resize, 5, 2, s_wxluatagArray_wxLua_wxImage_Resize }, --- 1480,1500 ---- WXLUAMETHOD wxImage_methods[] = { ! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, s_wxluatagArray_wxLua_wxImageFromBitmap_constructor }, ! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, s_wxluatagArray_wxLua_wxImage_SetPalette }, ! #endif // (wxLUA_USE_wxPalette && wxUSE_PALETTE) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetSubImage", wxLua_wxImage_GetSubImage, 1, 1, s_wxluatagArray_wxLua_wxImage_GetSubImage }, { LuaMethod, "Resize", wxLua_wxImage_Resize, 5, 2, s_wxluatagArray_wxLua_wxImage_Resize }, *************** *** 1502,1512 **** { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, s_wxluatagArray_wxLua_wxImage_Size }, { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, s_wxluatagArray_wxLua_wxImage_SetRGBRect }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, s_wxluatagArray_wxLua_wxImage_GetImageCountStream }, { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, s_wxluatagArray_wxLua_wxImage_LoadFileStream }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, s_wxluatagArray_wxLua_wxImage_constructor }, --- 1502,1512 ---- { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, s_wxluatagArray_wxLua_wxImage_Size }, { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, s_wxluatagArray_wxLua_wxImage_SetRGBRect }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, s_wxluatagArray_wxLua_wxImage_GetImageCountStream }, { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, s_wxluatagArray_wxLua_wxImage_LoadFileStream }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, s_wxluatagArray_wxLua_wxImage_constructor }, *************** *** 1577,1584 **** int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]); ! #endif // wxLUA_USE_wxImage ! #if wxLUA_USE_wxImage // ------------------------------------------------------------------------------------------------- // Bind class wxImageHandler --- 1577,1584 ---- int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]); ! #endif // wxLUA_USE_wxImage && wxUSE_IMAGE ! #if wxLUA_USE_wxImage && wxUSE_IMAGE // ------------------------------------------------------------------------------------------------- // Bind class wxImageHandler *************** *** 1589,1593 **** ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage) static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetImageCount[] = { &s_wxluatag_wxInputStream, 0 }; // int GetImageCount(wxInputStream& stream) --- 1589,1593 ---- ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetImageCount[] = { &s_wxluatag_wxInputStream, 0 }; // int GetImageCount(wxInputStream& stream) *************** *** 1654,1658 **** } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) // wxString GetName() const --- 1654,1658 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // wxString GetName() const *************** *** 1806,1814 **** WXLUAMETHOD wxImageHandler_methods[] = { ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaMethod, "GetImageCount", wxLua_wxImageHandler_GetImageCount, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_GetImageCount }, { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, s_wxluatagArray_wxLua_wxImageHandler_LoadFile }, { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, s_wxluatagArray_wxLua_wxImageHandler_SaveFile }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, s_wxluaargArray_None }, --- 1806,1814 ---- WXLUAMETHOD wxImageHandler_methods[] = { ! #if (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetImageCount", wxLua_wxImageHandler_GetImageCount, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_GetImageCount }, { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, s_wxluatagArray_wxLua_wxImageHandler_LoadFile }, { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, s_wxluatagArray_wxLua_wxImageHandler_SaveFile }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, s_wxluaargArray_None }, *************** *** 1833,1840 **** int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]); ! #endif // wxLUA_USE_wxImage ! #if wxLUA_USE_wxImage // ------------------------------------------------------------------------------------------------- // Bind class wxBMPHandler --- 1833,1840 ---- int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]); ! #endif // wxLUA_USE_wxImage && wxUSE_IMAGE ! #if wxLUA_USE_wxImage && wxUSE_IMAGE // ------------------------------------------------------------------------------------------------- // Bind class wxBMPHandler *************** *** 1874,1881 **** int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]); ! #endif // wxLUA_USE_wxImage ! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxICOHandler --- 1874,1881 ---- int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]); ! #endif // wxLUA_USE_wxImage && wxUSE_IMAGE ! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxICOHandler *************** *** 1915,1922 **** int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) ! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxCURHandler --- 1915,1922 ---- int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxCURHandler *************** *** 1956,1963 **** int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) ! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxANIHandler --- 1956,1963 ---- int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxANIHandler *************** *** 1997,2004 **** int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) ! #if (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxIFFHandler --- 1997,2004 ---- int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxIFFHandler *************** *** 2038,2045 **** int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]); ! #endif // (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage) ! #if (wxUSE_GIF) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxGIFHandler --- 2038,2045 ---- int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]); ! #endif // (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxGIFHandler *************** *** 2079,2086 **** int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]); ! #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage) ! #if (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxJPEGHandler --- 2079,2086 ---- int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]); ! #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxJPEGHandler *************** *** 2120,2127 **** int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]); ! #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage) ! #if (wxUSE_PCX) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxPCXHandler --- 2120,2127 ---- int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]); ! #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxPCXHandler *************** *** 2161,2168 **** int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]); ! #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage) ! #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxPNGHandler --- 2161,2168 ---- int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]); ! #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxPNGHandler *************** *** 2202,2209 **** int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]); ! #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) ! #if (wxUSE_PNM) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxPNMHandler --- 2202,2209 ---- int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]); ! #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxPNMHandler *************** *** 2243,2250 **** int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]); ! #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage) ! #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) // ------------------------------------------------------------------------------------------------- // Bind class wxTIFFHandler --- 2243,2250 ---- int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]); ! #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // ------------------------------------------------------------------------------------------------- // Bind class wxTIFFHandler *************** *** 2284,2291 **** int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]); ! #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) ! #if wxLUA_USE_wxImage // ------------------------------------------------------------------------------------------------- // Bind class wxXPMHandler --- 2284,2291 ---- int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]); ! #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if wxLUA_USE_wxImage && wxUSE_IMAGE // ------------------------------------------------------------------------------------------------- // Bind class wxXPMHandler *************** *** 2325,2329 **** int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]); ! #endif // wxLUA_USE_wxImage --- 2325,2329 ---- int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]); ! #endif // wxLUA_USE_wxImage && wxUSE_IMAGE Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mdi.cpp 22 Feb 2007 05:40:53 -0000 1.24 --- mdi.cpp 23 Feb 2007 04:35:32 -0000 1.25 *************** *** 27,31 **** ! #if wxLUA_USE_MDI // ------------------------------------------------------------------------------------------------- // Bind class wxMDIClientWindow --- 27,31 ---- ! #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE // ------------------------------------------------------------------------------------------------- [...1116 lines suppressed...] ! #if (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { LuaMethod, "AddFilesToGivenMenu", wxLua_wxFileHistory_AddFilesToGivenMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_AddFilesToGivenMenu }, { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_RemoveMenu }, { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_UseMenu }, ! #endif // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, s_wxluatagArray_wxLua_wxFileHistory_constructor }, *************** *** 3546,3549 **** int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]); ! #endif // wxLUA_USE_wxFileHistory --- 3546,3549 ---- int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]); ! #endif // wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** config.cpp 22 Feb 2007 05:40:52 -0000 1.26 --- config.cpp 23 Feb 2007 04:35:31 -0000 1.27 *************** *** 27,31 **** ! #if wxLUA_USE_wxConfig // ------------------------------------------------------------------------------------------------- // Bind class wxConfigBase --- 27,31 ---- ! #if wxLUA_USE_wxConfig && wxUSE_CONFIG // ------------------------------------------------------------------------------------------------- // Bind class wxConfigBase *************** *** 787,794 **** int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]); ! #endif // wxLUA_USE_wxConfig ! #if wxLUA_USE_wxConfig // ------------------------------------------------------------------------------------------------- // Bind class wxConfig --- 787,794 ---- int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]); ! #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG ! #if wxLUA_USE_wxConfig && wxUSE_CONFIG // ------------------------------------------------------------------------------------------------- // Bind class wxConfig *************** *** 838,845 **** int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]); ! #endif // wxLUA_USE_wxConfig ! #if wxLUA_USE_wxConfig // ------------------------------------------------------------------------------------------------- // Bind class wxFileConfig --- 838,845 ---- int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]); ! #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG ! #if wxLUA_USE_wxConfig && wxUSE_CONFIG // ------------------------------------------------------------------------------------------------- // Bind class wxFileConfig *************** *** 905,908 **** int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]); ! #endif // wxLUA_USE_wxConfig --- 905,908 ---- int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]); ! #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** grid.cpp 22 Feb 2007 05:40:52 -0000 1.25 --- grid.cpp 23 Feb 2007 04:35:32 -0000 1.26 *************** *** 27,31 **** ! #if wxLUA_USE_wxGrid // ------------------------------------------------------------------------------------------------- // Bind class wxGridCellWorker --- 27,31 ---- ! #if wxLUA_USE_wxGrid && wxUSE_GRID // ------------------------------------------------------------------------------------------------- [...1153 lines suppressed...] { LuaMethod, "GetRow", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, s_wxluaargArray_None }, --- 7375,7381 ---- WXLUAMETHOD wxGridEditorCreatedEvent_methods[] = { ! #if (wxLUA_USE_wxObject) && (wxLUA_USE_wxGrid && wxUSE_GRID) { LuaConstructor, "wxGridEditorCreatedEvent", wxLua_wxGridEditorCreatedEvent_constructor, 6, 6, s_wxluatagArray_wxLua_wxGridEditorCreatedEvent_constructor }, ! #endif // (wxLUA_USE_wxObject) && (wxLUA_USE_wxGrid && wxUSE_GRID) { LuaMethod, "GetRow", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, s_wxluaargArray_None }, *************** *** 7396,7399 **** int wxGridEditorCreatedEvent_methodCount = sizeof(wxGridEditorCreatedEvent_methods)/sizeof(wxGridEditorCreatedEvent_methods[0]); ! #endif // wxLUA_USE_wxGrid --- 7396,7399 ---- int wxGridEditorCreatedEvent_methodCount = sizeof(wxGridEditorCreatedEvent_methods)/sizeof(wxGridEditorCreatedEvent_methods[0]); ! #endif // wxLUA_USE_wxGrid && wxUSE_GRID Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** file.cpp 22 Feb 2007 05:40:52 -0000 1.30 --- file.cpp 23 Feb 2007 04:35:31 -0000 1.31 *************** *** 128,132 **** ! #if (wxLUA_USE_wxFile) && (wxLUA_USE_wxFileName) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 }; // void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) --- 128,132 ---- ! #if (wxLUA_USE_wxFile && wxUSE_FILE) && (wxLUA_USE_wxFileName) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 }; // void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) *************** *** 168,172 **** } ! #endif // (wxLUA_USE_wxFile) && (wxLUA_USE_wxFileName) // %constructor wxFi... [truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X