removed unused wxUSE_XXX options (patch 1759328)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
1e0f0a90e0
commit
b2f0b9342a
12
configure.in
12
configure.in
@ -6393,10 +6393,6 @@ if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
|
||||
AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl big GUI components: MDI, doc/view, printing, help, ...
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -6458,8 +6454,6 @@ fi
|
||||
|
||||
AC_DEFINE(wxUSE_AFM_FOR_POSTSCRIPT)
|
||||
|
||||
AC_DEFINE(wxUSE_NORMALIZED_PS_FONTS)
|
||||
|
||||
if test "$wxUSE_SVG" = "yes"; then
|
||||
AC_DEFINE(wxUSE_SVG)
|
||||
fi
|
||||
@ -6782,12 +6776,6 @@ if test "$wxUSE_ODCOMBOBOX" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo"
|
||||
fi
|
||||
|
||||
dnl if test "$wxUSE_PROPSHEET" = "yes"; then
|
||||
dnl AC_DEFINE(wxUSE_PROPSHEET)
|
||||
dnl USES_CONTROLS=1
|
||||
dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
|
||||
dnl fi
|
||||
|
||||
if test "$wxUSE_RADIOBOX" = "yes"; then
|
||||
AC_DEFINE(wxUSE_RADIOBOX)
|
||||
USES_CONTROLS=1
|
||||
|
||||
@ -186,7 +186,7 @@ wxSaveFileSelector(const wxString& what,
|
||||
|
||||
|
||||
#if defined (__WXUNIVERSAL__)
|
||||
#define wxUSE_GENERIC_FILEDIALOG
|
||||
#define wxHAS_GENERIC_FILEDIALOG
|
||||
#include "wx/generic/filedlgg.h"
|
||||
#elif defined(__WXMSW__)
|
||||
#include "wx/msw/filedlg.h"
|
||||
@ -195,7 +195,7 @@ wxSaveFileSelector(const wxString& what,
|
||||
#elif defined(__WXGTK24__)
|
||||
#include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version
|
||||
#elif defined(__WXGTK20__)
|
||||
#define wxUSE_GENERIC_FILEDIALOG
|
||||
#define wxHAS_GENERIC_FILEDIALOG
|
||||
#include "wx/generic/filedlgg.h"
|
||||
#elif defined(__WXGTK__)
|
||||
#include "wx/gtk1/filedlg.h"
|
||||
|
||||
@ -124,7 +124,7 @@ private:
|
||||
static bool ms_lastShowHidden; // did we show hidden files?
|
||||
};
|
||||
|
||||
#ifdef wxUSE_GENERIC_FILEDIALOG
|
||||
#ifdef wxHAS_GENERIC_FILEDIALOG
|
||||
|
||||
class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
|
||||
{
|
||||
@ -146,7 +146,7 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxFileDialog)
|
||||
};
|
||||
|
||||
#endif // wxUSE_GENERIC_FILEDIALOG
|
||||
#endif // wxHAS_GENERIC_FILEDIALOG
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxFileData - a class to hold the file info for the wxFileCtrl
|
||||
|
||||
@ -146,14 +146,3 @@
|
||||
//
|
||||
// Recommended setting: 1, set to 0 if your programs never crash
|
||||
#define wxUSE_CRASHREPORT 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// obsolete settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// NB: all settings in this section are obsolete and should not be used/changed
|
||||
// at all, they will disappear
|
||||
|
||||
// Define 1 to use bitmap messages.
|
||||
#define wxUSE_BITMAP_MESSAGE 1
|
||||
|
||||
|
||||
@ -361,15 +361,6 @@
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_DATETIME 1
|
||||
|
||||
// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
|
||||
// the same as wxDateTime!). These classes are obsolete and shouldn't be used
|
||||
// in new code
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 unless you have legacy code which uses these classes
|
||||
#define wxUSE_TIMEDATE 0
|
||||
|
||||
// Set wxUSE_TIMER to 1 to compile wxTimer class
|
||||
//
|
||||
// Default is 1
|
||||
@ -543,20 +534,6 @@
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use QuickTime
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
|
||||
#define wxUSE_QUICKTIME 0
|
||||
|
||||
// Use DirectShow
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
|
||||
#define wxUSE_DIRECTSHOW 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
@ -765,9 +742,6 @@
|
||||
//
|
||||
#define wxUSE_GRID 1
|
||||
|
||||
// wxProperty[Value/Form/List] classes, used by Dialog Editor
|
||||
#define wxUSE_PROPSHEET 1
|
||||
|
||||
// wxComboCtrl and related classes: combobox with custom popup window and
|
||||
// not necessarily a listbox.
|
||||
//
|
||||
@ -1043,9 +1017,6 @@
|
||||
// smaller library.
|
||||
#define wxUSE_RICHTEXT 1
|
||||
|
||||
// wxTreeLayout class
|
||||
#define wxUSE_TREELAYOUT 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Data transfer
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -1303,10 +1274,6 @@
|
||||
// unknown settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// If 1, enables provision of run-time type information.
|
||||
// NOW MANDATORY: don't change.
|
||||
#define wxUSE_DYNAMIC_CLASSES 1
|
||||
|
||||
//??????
|
||||
#if defined(__WIN32__)
|
||||
#define wxUSE_DDE_FOR_IPC 0
|
||||
|
||||
31
setup.h.in
31
setup.h.in
@ -717,10 +717,6 @@
|
||||
* Use iODBC
|
||||
*/
|
||||
#define wxUSE_BUILTIN_IODBC 0
|
||||
/*
|
||||
* Use freetype
|
||||
*/
|
||||
#define wxUSE_FREETYPE 0
|
||||
/*
|
||||
* Have glibc2
|
||||
*/
|
||||
@ -733,40 +729,13 @@
|
||||
* Define if you have pthread_cleanup_push/pop()
|
||||
*/
|
||||
#undef wxHAVE_PTHREAD_CLEANUP
|
||||
/*
|
||||
* Use consistent PostScript fonts for AFM and printing (!)
|
||||
*/
|
||||
#define wxUSE_NORMALIZED_PS_FONTS 0
|
||||
|
||||
/* compatibility */
|
||||
#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
|
||||
|
||||
/*
|
||||
* Use OpenGL
|
||||
*/
|
||||
#define wxUSE_OPENGL 0
|
||||
|
||||
/*
|
||||
* Work around a bug in GNU libc 5.x wcstombs() implementation.
|
||||
*
|
||||
* Note that you must link your programs with libc.a if you enable this and you
|
||||
* have libc 5 (you should enable this for libc6 where wcsrtombs() is
|
||||
* thread-safe version of wcstombs()).
|
||||
*/
|
||||
#define wxUSE_WCSRTOMBS 0
|
||||
|
||||
/*
|
||||
* Use the new experimental implementation of wxString::Printf()?
|
||||
*
|
||||
* Warning: enabling this may cause internal compiler errors with gcc!
|
||||
*/
|
||||
#define wxUSE_EXPERIMENTAL_PRINTF 0
|
||||
|
||||
/*
|
||||
* Use wxGetResource & wxWriteResource (change .Xdefaults)
|
||||
*/
|
||||
#define wxUSE_X_RESOURCES 0
|
||||
|
||||
/*
|
||||
* Use MS HTML Help via libmspack (Unix)
|
||||
*/
|
||||
|
||||
47
setup.h_vms
47
setup.h_vms
@ -167,7 +167,7 @@ typedef pid_t GPid;
|
||||
#endif
|
||||
|
||||
|
||||
#define WXWIN_COMPATIBILITY_2_6 1
|
||||
#define WXWIN_COMPATIBILITY_2_6 0
|
||||
|
||||
#define WXWIN_COMPATIBILITY_2_8 1
|
||||
|
||||
@ -503,13 +503,6 @@ typedef pid_t GPid;
|
||||
|
||||
#define wxUSE_WXHTML_HELP 1
|
||||
|
||||
#define wxUSE_RESOURCES 1
|
||||
|
||||
/*
|
||||
* Use Prolog IO
|
||||
*/
|
||||
#define wxUSE_PROLOGIO 1
|
||||
|
||||
#define wxUSE_CONSTRAINTS 1
|
||||
|
||||
|
||||
@ -712,10 +705,6 @@ typedef pid_t GPid;
|
||||
* Use iODBC
|
||||
*/
|
||||
#define wxUSE_BUILTIN_IODBC 0
|
||||
/*
|
||||
* Use freetype
|
||||
*/
|
||||
#define wxUSE_FREETYPE 1
|
||||
/*
|
||||
* Have glibc2
|
||||
*/
|
||||
@ -728,14 +717,8 @@ typedef pid_t GPid;
|
||||
* Define if you have pthread_cleanup_push/pop()
|
||||
*/
|
||||
#define wxHAVE_PTHREAD_CLEANUP 1
|
||||
/*
|
||||
* Use consistent PostScript fonts for AFM and printing (!)
|
||||
*/
|
||||
#define wxUSE_NORMALIZED_PS_FONTS 1
|
||||
|
||||
/* compatibility */
|
||||
#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
|
||||
|
||||
/*
|
||||
* Use OpenGL
|
||||
*/
|
||||
@ -746,32 +729,6 @@ typedef pid_t GPid;
|
||||
*/
|
||||
/* #define wxUSE_UXTHEME 1 */
|
||||
|
||||
/*
|
||||
* Set to 1 to auto-adapt to MS Windows XP themes where possible
|
||||
* (notably, wxNotebook pages)
|
||||
*/
|
||||
/* #define wxUSE_UXTHEME_AUTO 1*/
|
||||
|
||||
/*
|
||||
* Work around a bug in GNU libc 5.x wcstombs() implementation.
|
||||
*
|
||||
* Note that you must link your programs with libc.a if you enable this and you
|
||||
* have libc 5 (you should enable this for libc6 where wcsrtombs() is
|
||||
* thread-safe version of wcstombs()).
|
||||
*/
|
||||
#define wxUSE_WCSRTOMBS 0
|
||||
|
||||
/*
|
||||
* Use the new experimental implementation of wxString::Printf()?
|
||||
*
|
||||
* Warning: enabling this may cause internal compiler errors with gcc!
|
||||
*/
|
||||
#define wxUSE_EXPERIMENTAL_PRINTF 0
|
||||
|
||||
/*
|
||||
* Use wxGetResource & wxWriteResource (change .Xdefaults)
|
||||
*/
|
||||
#define wxUSE_X_RESOURCES 1
|
||||
/*
|
||||
* Use OLE and OLE Automation (MSW only)
|
||||
*/
|
||||
@ -780,8 +737,6 @@ typedef pid_t GPid;
|
||||
#define wxUSE_ACTIVEX 0
|
||||
|
||||
/* for compatibility */
|
||||
#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
|
||||
|
||||
/*
|
||||
* Use wxWindows help facility
|
||||
*/
|
||||
|
||||
@ -1639,10 +1639,10 @@ void wxGenericFileDialog::UpdateControls()
|
||||
#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
|
||||
}
|
||||
|
||||
#ifdef wxUSE_GENERIC_FILEDIALOG
|
||||
#ifdef wxHAS_GENERIC_FILEDIALOG
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
|
||||
|
||||
#endif // wxUSE_GENERIC_FILEDIALOG
|
||||
#endif // wxHAS_GENERIC_FILEDIALOG
|
||||
|
||||
#endif // wxUSE_FILEDLG
|
||||
|
||||
Loading…
Reference in New Issue
Block a user