Made it possible to switch off more settings; fixed wxScrollWindow::Scroll bug

(if x == oldx, skipped processing of y direction)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/fontmap.h

@@ -23,7 +23,10 @@
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 
+#if wxUSE_CONFIG
 class WXDLLEXPORT wxConfigBase;
+#endif
+
 class WXDLLEXPORT wxWindow;
 
 // ----------------------------------------------------------------------------
@@ -102,6 +105,7 @@ public:
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 
+#if wxUSE_CONFIG
     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 
@@ -110,8 +114,11 @@ public:
 
     // return default config path
     static const wxChar *GetDefaultConfigPath();
+#endif
 
 protected:
+
+#if wxUSE_CONFIG
     // get the config object we're using - if it wasn't set explicitly, this
     // function will use wxConfig::Get() to get the global one
     wxConfigBase *GetConfig();
@@ -119,6 +126,7 @@ protected:
     // gets the root path for our settings - if itwasn't set explicitly, use
     // GetDefaultConfigPath()
     const wxString& GetConfigPath();
+#endif
 
     // change to the given (relative) path in the config, return TRUE if ok
     // (then GetConfig() will return something !NULL), FALSE if no config
@@ -142,8 +150,11 @@ protected:
                          wxFontEncoding encReplacement,
                          wxNativeEncodingInfo *info);
 
+#if wxUSE_CONFIG
     // config object and path (in it) to use
     wxConfigBase *m_config;
+#endif
+
     wxString  m_configRootPath;
 
     // the title for our dialogs

include/wx/msw/setup0.h

@@ -631,6 +631,11 @@
 #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 
+#if !wxUSE_OWNER_DRAWN
+#undef wxUSE_CHECKLISTBOX
+#define wxUSE_CHECKLISTBOX 0
+#endif
+
 // Salford C++ doesn't like some of the memory operator definitions
 #ifdef __SALFORDC__
 #undef  wxUSE_MEMORY_TRACING

include/wx/process.h

@@ -19,7 +19,10 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"
+
+#if wxUSE_STREAMS
 #include "wx/stream.h"
+#endif
 
 // Process Event handling
 class WXDLLEXPORT wxProcessEvent : public wxEvent
@@ -72,20 +75,24 @@ public:
     // before the process it started terminates
     void Detach();
 
+#if wxUSE_STREAMS
     // Pipe handling
     wxInputStream *GetInputStream() const { return m_inputStream; }
     wxOutputStream *GetOutputStream() const { return m_outputStream; }
 
     // implementation only (for wxExecute)
     void SetPipeStreams(wxInputStream *inStream, wxOutputStream *outStream);
+#endif
 
 protected:
     void Init(wxEvtHandler *parent, int id, bool redirect);
 
     int m_id;
 
+#if wxUSE_STREAMS
     wxInputStream  *m_inputStream;
     wxOutputStream *m_outputStream;
+#endif
 
     bool m_redirect;
 };