Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct compilation for GTK < 2.4.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/filedlg.h
View File

@@ -179,6 +179,7 @@ wxSaveFileSelector(const wxChar *what,
#if defined (__WXUNIVERSAL__) #if defined (__WXUNIVERSAL__)
#define wxUSE_GENERIC_FILEDIALOG
#include "wx/generic/filedlgg.h" #include "wx/generic/filedlgg.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/filedlg.h" #include "wx/msw/filedlg.h"
@@ -187,13 +188,10 @@ wxSaveFileSelector(const wxChar *what,
#elif defined(__WXGTK24__) #elif defined(__WXGTK24__)
#include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version #include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version
#elif defined(__WXGTK20__) #elif defined(__WXGTK20__)
#define wxUSE_GENERIC_FILEDIALOG
#include "wx/generic/filedlgg.h" #include "wx/generic/filedlgg.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk1/filedlg.h" #include "wx/gtk1/filedlg.h"
#elif defined(__WXX11__)
#include "wx/generic/filedlgg.h"
#elif defined(__WXMGL__)
#include "wx/generic/filedlgg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/filedlg.h" #include "wx/mac/filedlg.h"
#elif defined(__WXCOCOA__) #elif defined(__WXCOCOA__)

8
include/wx/generic/filedlgg.h
View File

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

4
src/generic/filedlgg.cpp
View File

@@ -1627,10 +1627,10 @@ void wxGenericFileDialog::UpdateControls()
#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) #endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
} }
#ifdef USE_GENERIC_FILEDIALOG #ifdef wxUSE_GENERIC_FILEDIALOG
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog) IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
#endif // USE_GENERIC_FILEDIALOG #endif // wxUSE_GENERIC_FILEDIALOG
#endif // wxUSE_FILEDLG #endif // wxUSE_FILEDLG