Applied patch for wxComboBox and wxListBox to

[wxWidgets.git] / include / wx / confbase.h

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 4b06078b0ebb0482eed9684dbed6b337b804f65d..25b97678b819c4d3919dbf16ab5f147e96bc0d52 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -19,9 +19,6 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-
-#if wxUSE_CONFIG
-

 #include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/string.h"
 
 // ----------------------------------------------------------------------------


@@ -44,6 +41,10 @@
   #define   wxCONFIG_IMMUTABLE_PREFIX   _T('!')
 #endif
 
   #define   wxCONFIG_IMMUTABLE_PREFIX   _T('!')
 #endif
 

+#if wxUSE_CONFIG
+
+#include "wx/string.h"
+

 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  FALSE) or wxRegConfig (if it's true and we're under Win32) or wxIniConfig
 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  FALSE) or wxRegConfig (if it's true and we're under Win32) or wxIniConfig


@@ -302,21 +303,19 @@ private:
 
 #endif // wxUSE_CONFIG
 
 
 #endif // wxUSE_CONFIG
 

-// ----------------------------------------------------------------------------
-// various helper global functions (defined even if !wxUSE_CONFIG)
-// ----------------------------------------------------------------------------
-

 /*
   Replace environment variables ($SOMETHING) with their values. The format is
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
 /*
   Replace environment variables ($SOMETHING) with their values. The format is
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.

- */
-extern WXDLLEXPORT wxString wxExpandEnvVars(const wxString &sz);
+*/
+
+WXDLLEXPORT wxString wxExpandEnvVars(const wxString &sz);

 
 /*
   Split path into parts removing '..' in progress
  */
 
 /*
   Split path into parts removing '..' in progress
  */

-extern WXDLLEXPORT void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
+WXDLLEXPORT void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
+

 
 #endif
   // _WX_CONFIG_H_
 
 #endif
   // _WX_CONFIG_H_