Correct compilation for GTK < 2.4.

Remove double testing for __WXMGL__ and __WXX11__
    after testing for __UNIVERSAL__


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-06-08 10:05:42 +00:00
parent da452b9eec
commit a84f5f39b8
3 changed files with 6 additions and 12 deletions

View File

@@ -32,10 +32,6 @@ class WXDLLEXPORT wxListItem;
class WXDLLEXPORT wxStaticText;
class WXDLLEXPORT wxTextCtrl;
#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
#define USE_GENERIC_FILEDIALOG
#endif
//-------------------------------------------------------------------------
// wxGenericFileDialog
//-------------------------------------------------------------------------
@@ -128,7 +124,7 @@ private:
static bool ms_lastShowHidden; // did we show hidden files?
};
#ifdef USE_GENERIC_FILEDIALOG
#ifdef wxUSE_GENERIC_FILEDIALOG
class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
{
@@ -150,7 +146,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxFileDialog)
};
#endif // USE_GENERIC_FILEDIALOG
#endif // wxUSE_GENERIC_FILEDIALOG
//-----------------------------------------------------------------------------
// wxFileData - a class to hold the file info for the wxFileCtrl