build fixes for wxUSE_CONFIG==0

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

diff --git a/include/wx/config.h b/include/wx/config.h
index 74f90300f786d204bde25b2f21a927448a332ac2..e8734bf25d51c19180cc0771767c574f9092428f 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -12,12 +12,10 @@
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
-#include "wx/defs.h"
+#include "wx/confbase.h"
 
 #if wxUSE_CONFIG
 
-#include "wx/confbase.h"
-
 // ----------------------------------------------------------------------------
 // define the native wxConfigBase implementation
 // ----------------------------------------------------------------------------

diff --git a/src/common/persist.cpp b/src/common/persist.cpp
index 76ab2698bdcde2c7d133df5071b5953b8686da92..64b5957c7cd4fe89863dce0ae1a3f210e3d904db 100644 (file)
--- a/src/common/persist.cpp
+++ b/src/common/persist.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CONFIG
+
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
@@ -151,3 +153,5 @@ wxPERSIST_DEFINE_SAVE_RESTORE_FOR(long)
 wxPERSIST_DEFINE_SAVE_RESTORE_FOR(wxString)
 
 #undef wxPERSIST_DEFINE_SAVE_RESTORE_FOR  
+
+#endif // wxUSE_CONFIG