added wxUSE_STDPATHS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
1aca952110
commit
07158944d8
@ -425,6 +425,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_STOPWATCH=no
|
||||
DEFAULT_wxUSE_FILE=no
|
||||
DEFAULT_wxUSE_FFILE=no
|
||||
DEFAULT_wxUSE_STDPATHS=no
|
||||
DEFAULT_wxUSE_TEXTBUFFER=no
|
||||
DEFAULT_wxUSE_TEXTFILE=no
|
||||
DEFAULT_wxUSE_SOUND=no
|
||||
@ -618,6 +619,7 @@ else
|
||||
DEFAULT_wxUSE_STOPWATCH=yes
|
||||
DEFAULT_wxUSE_FILE=yes
|
||||
DEFAULT_wxUSE_FFILE=yes
|
||||
DEFAULT_wxUSE_STDPATHS=yes
|
||||
DEFAULT_wxUSE_TEXTBUFFER=yes
|
||||
DEFAULT_wxUSE_TEXTFILE=yes
|
||||
DEFAULT_wxUSE_SOUND=yes
|
||||
@ -906,9 +908,10 @@ WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], w
|
||||
WX_ARG_ENABLE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE)
|
||||
WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
|
||||
WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
|
||||
WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS)
|
||||
WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
|
||||
WX_ARG_ENABLE(stdpaths, [ --enable-stdpaths use wxStandardPaths class], wxUSE_STDPATHS)
|
||||
WX_ARG_ENABLE(stopwatch, [ --enable-stopwatch use wxStopWatch class], wxUSE_STOPWATCH)
|
||||
WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS)
|
||||
WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
|
||||
WX_ARG_ENABLE(textbuf, [ --enable-textbuf use wxTextBuffer class], wxUSE_TEXTBUFFER)
|
||||
WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], wxUSE_TEXTFILE)
|
||||
@ -4848,6 +4851,10 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
|
||||
AC_DEFINE(wxUSE_STD_IOSTREAM)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_STDPATHS" = "yes"; then
|
||||
AC_DEFINE(wxUSE_STDPATHS)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_TEXTBUFFER" = "yes"; then
|
||||
AC_DEFINE(wxUSE_TEXTBUFFER)
|
||||
fi
|
||||
|
@ -80,9 +80,11 @@ public:
|
||||
// NB: returned pointer will be deleted by the caller
|
||||
virtual wxRendererNative *CreateRenderer() = 0;
|
||||
|
||||
#if wxUSE_STDPATHS
|
||||
// wxStandardPaths object is normally the same for wxBase and wxGUI
|
||||
// except in the case of wxMac and wxCocoa
|
||||
virtual wxStandardPathsBase& GetStandardPaths();
|
||||
#endif // wxUSE_STDPATHS
|
||||
|
||||
// functions abstracting differences between GUI and console modes
|
||||
// ------------------------------------------------------------------------
|
||||
|
@ -170,6 +170,14 @@
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_REGEX) */
|
||||
|
||||
#ifndef wxUSE_STDPATHS
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_STDPATHS must be defined."
|
||||
# else
|
||||
# define wxUSE_STDPATHS 1
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_STDPATHS) */
|
||||
|
||||
#ifndef wxUSE_XML
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_XML must be defined."
|
||||
|
@ -296,6 +296,14 @@
|
||||
// Recommended setting: 1 (but may be safely disabled if you don't use it)
|
||||
#define wxUSE_FSVOLUME 1
|
||||
|
||||
// Use wxStandardPaths class which allows to retrieve some standard locations
|
||||
// in the file system
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1 (may be disabled to save space, but not much)
|
||||
#define wxUSE_STDPATHS 1
|
||||
|
||||
// use wxTextBuffer class: required by wxTextFile
|
||||
#define wxUSE_TEXTBUFFER 1
|
||||
|
||||
|
@ -295,6 +295,14 @@
|
||||
// Recommended setting: 1 (but may be safely disabled if you don't use it)
|
||||
#define wxUSE_FSVOLUME 1
|
||||
|
||||
// Use wxStandardPaths class which allows to retrieve some standard locations
|
||||
// in the file system
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1 (may be disabled to save space, but not much)
|
||||
#define wxUSE_STDPATHS 1
|
||||
|
||||
// use wxTextBuffer class: required by wxTextFile
|
||||
#define wxUSE_TEXTBUFFER 1
|
||||
|
||||
|
@ -280,6 +280,14 @@
|
||||
// Recommended setting: 1 (but may be safely disabled if you don't use it)
|
||||
#define wxUSE_FSVOLUME 1
|
||||
|
||||
// Use wxStandardPaths class which allows to retrieve some standard locations
|
||||
// in the file system
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1 (may be disabled to save space, but not much)
|
||||
#define wxUSE_STDPATHS 1
|
||||
|
||||
// use wxTextBuffer class: required by wxTextFile
|
||||
#define wxUSE_TEXTBUFFER 1
|
||||
|
||||
|
@ -12,6 +12,10 @@
|
||||
#ifndef _WX_STDPATHS_H_
|
||||
#define _WX_STDPATHS_H_
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_STDPATHS
|
||||
|
||||
#include "wx/string.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -93,5 +97,7 @@ protected:
|
||||
#include "wx/palmos/stdpaths.h"
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_STDPATHS
|
||||
|
||||
#endif // _WX_STDPATHS_H_
|
||||
|
||||
|
@ -205,6 +205,8 @@
|
||||
|
||||
#define wxUSE_FSVOLUME 0
|
||||
|
||||
#define wxUSE_STDPATHS 0
|
||||
|
||||
#define wxUSE_TEXTBUFFER 0
|
||||
|
||||
#define wxUSE_TEXTFILE 0
|
||||
|
@ -24,6 +24,8 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_STDPATHS
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#endif //WX_PRECOMP
|
||||
@ -90,3 +92,4 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
|
||||
return subdir;
|
||||
}
|
||||
|
||||
#endif // wxUSE_STDPATHS
|
||||
|
@ -10,6 +10,9 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#if wxUSE_STDPATHS
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/intl.h"
|
||||
#endif //ndef WX_PRECOMP
|
||||
@ -107,3 +110,4 @@ wxString wxStandardPathsCF::GetPluginsDir() const
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif // wxUSE_STDPATHS
|
||||
|
@ -20,6 +20,8 @@
|
||||
// for compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#if wxUSE_STDPATHS
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
@ -87,3 +89,5 @@ wxString wxStandardPaths::GetPluginsDir() const
|
||||
{
|
||||
return wxString();
|
||||
}
|
||||
|
||||
#endif // wxUSE_STDPATHS
|
||||
|
@ -24,6 +24,8 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_STDPATHS
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#endif //WX_PRECOMP
|
||||
@ -115,3 +117,4 @@ wxString wxStandardPaths::GetPluginsDir() const
|
||||
return wxString();
|
||||
}
|
||||
|
||||
#endif // wxUSE_STDPATHS
|
||||
|
Loading…
Reference in New Issue
Block a user