From 5c704db5e1f7bb65882870cef8f40439ee4285c7 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 19 Nov 2002 02:43:41 +0000 Subject: [PATCH] More wxUSE_PROLOGIO==0 changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/misc2.i | 2 ++ wxPython/src/windows.i | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index c6695509c1..7137e58bc1 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -183,6 +183,7 @@ wxWindow* wxGetTopLevelParent(wxWindow *win); //--------------------------------------------------------------------------- // Resource System +#ifdef wxUSE_WX_RESOURCES bool wxResourceAddIdentifier(char* name, int value); void wxResourceClear(void); wxBitmap wxResourceCreateBitmap(char* resource); @@ -192,6 +193,7 @@ int wxResourceGetIdentifier(char* name); bool wxResourceParseData(char* resource, wxResourceTable *table = NULL); bool wxResourceParseFile(char* filename, wxResourceTable *table = NULL); bool wxResourceParseString(char* resource, wxResourceTable *table = NULL); +#endif //--------------------------------------------------------------------------- // System Settings diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i index cf178ee181..4236bcd14f 100644 --- a/wxPython/src/windows.i +++ b/wxPython/src/windows.i @@ -295,7 +295,7 @@ public: bool IsShown(); bool IsTopLevel(); void Layout(); -#ifdef INCLUDE_DEPRECATED +#ifdef wxUSE_WX_RESOURCES bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL); #endif void Lower();