From 7ac1b576c496b3cd48d6a494b51261b8eb6fb635 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 6 May 2009 03:08:33 +0000 Subject: [PATCH] build fixes for wxUSE_CONFIG==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/config.h | 4 +--- src/common/persist.cpp | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/config.h b/include/wx/config.h index 74f90300f7..e8734bf25d 100644 --- 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 76ab2698bd..64b5957c7c 100644 --- 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