Further wxUniv fixes

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

include/wx/confbase.h

@@ -20,10 +20,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_CONFIG
-
-#include "wx/string.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -44,6 +40,10 @@
   #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
@@ -302,21 +302,18 @@ private:
 
 #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.
  */
-extern WXDLLEXPORT wxString wxExpandEnvVars(const wxString &sz);
+WXDLLEXPORT wxString wxExpandEnvVars(const wxString &sz);
 
 /*
   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_

include/wx/generic/msgdlgg.h

@@ -43,7 +43,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#if !defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)
+#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)) || defined(__WXUNIVERSAL__)
 #define wxMessageDialog wxGenericMessageDialog
 #endif
 

include/wx/msgdlg.h

@@ -3,7 +3,9 @@
 
 #if wxUSE_MSGDLG
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/msgdlg.h"

include/wx/univ/setup.h

@@ -136,7 +136,7 @@
 #define wxUSE_RESOURCES   0
 #define wxUSE_CONSTRAINTS 1
 #define wxUSE_CLIPBOARD   1
-#define wxUSE_DATAOBJ 1
+#define wxUSE_DATAOBJ     1
 #define wxUSE_SPLINES     0
 #define wxUSE_DRAG_AND_DROP 0
 #define wxUSE_XPM_IN_MSW   1