Fixed some duff #ifdefs

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

diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h
index a6b59d8ca3aed5813af65de9a7d089ab8c8d2b4d..9c183e338e6f60fe3b0ecc44cd96e766f4505cc1 100644 (file)
--- a/include/wx/fmappriv.h
+++ b/include/wx/fmappriv.h
@@ -35,7 +35,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
 // wxFontMapperPathChanger: change the config path during our lifetime
 // ----------------------------------------------------------------------------
 
 // wxFontMapperPathChanger: change the config path during our lifetime
 // ----------------------------------------------------------------------------
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

 
 class wxFontMapperPathChanger
 {
 
 class wxFontMapperPathChanger
 {

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 0af055a93e5ba48685930c91c66fd30c0e73c758..f13cf47a50e92f787a9da4056dadbc4b6a4c8303 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -24,7 +24,7 @@
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     class WXDLLIMPEXP_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 
     class WXDLLIMPEXP_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 


@@ -62,10 +62,9 @@ public:
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 

-    // set the sigleton to 'mapper' instance and return previous one
+    // set the singleton to 'mapper' instance and return previous one

     static wxFontMapper *Set(wxFontMapper *mapper);
 
     static wxFontMapper *Set(wxFontMapper *mapper);
 

-

     // translates charset strings to encoding
     // --------------------------------------
 
     // translates charset strings to encoding
     // --------------------------------------
 


@@ -77,7 +76,6 @@ public:
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 

-

     // information about supported encodings
     // -------------------------------------
 
     // information about supported encodings
     // -------------------------------------
 


@@ -103,7 +101,7 @@ public:
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 
     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 


@@ -116,7 +114,7 @@ public:
 
 
 protected:
 
 
 protected:

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // 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();
     // 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();

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 83e91e70161ed271d2f13acbce03ee66c8c8130a..f39c95e01da9cb1e220def466a0d7887ea09ab95 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -353,6 +353,8 @@ void wxFontMapperBase::RestorePath(const wxString& pathOld)
     GetConfig()->SetPath(pathOld);
 }
 
     GetConfig()->SetPath(pathOld);
 }
 

+#endif
+

 // ----------------------------------------------------------------------------
 // charset/encoding correspondence
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // charset/encoding correspondence
 // ----------------------------------------------------------------------------


@@ -642,7 +644,5 @@ wxString wxFontMapperBase::GetEncodingName(wxFontEncoding encoding)
     return str;
 }
 
     return str;
 }
 

-#endif // wxUSE_CONFIG
-

 #endif // wxUSE_FONTMAP
 
 #endif // wxUSE_FONTMAP
 

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 171639e6e38555ce9d6d2a8fe624042e4c8d5a42..4df6f648b1f0dd3bdfc56fcc70df2c8fe05c1270 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -153,7 +153,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
             encoding = GetEncoding(n);
         }
 
             encoding = GetEncoding(n);
         }
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

         // save the result in the config now
         wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
         if ( path.IsOk() )
         // save the result in the config now
         wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
         if ( path.IsOk() )


@@ -187,7 +187,7 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
     if ( wxGetNativeFontEncoding(encReplacement, info) &&
          wxTestFontEncoding(*info) )
     {
     if ( wxGetNativeFontEncoding(encReplacement, info) &&
          wxTestFontEncoding(*info) )
     {

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

         // remember the mapping in the config
         wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
 
         // remember the mapping in the config
         wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
 


@@ -253,7 +253,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     configEntry += encName;
 
     }
     configEntry += encName;
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // do we have a font spec for this encoding?
     wxString fontinfo;
     wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
     // do we have a font spec for this encoding?
     wxString fontinfo;
     wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);


@@ -365,7 +365,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                 *info = retData.EncodingInfo();
                 info->encoding = retData.GetEncoding();
 
                 *info = retData.EncodingInfo();
                 info->encoding = retData.GetEncoding();
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

                 // remember this in the config
                 wxFontMapperPathChanger path(this,
                                              FONTMAPPER_FONT_FROM_ENCODING_PATH);
                 // remember this in the config
                 wxFontMapperPathChanger path(this,
                                              FONTMAPPER_FONT_FROM_ENCODING_PATH);


@@ -385,7 +385,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             // or selected to use equivalent encoding
             //
             // remember it to avoid asking the same question again later
             // or selected to use equivalent encoding
             //
             // remember it to avoid asking the same question again later

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

             wxFontMapperPathChanger path(this,
                                          FONTMAPPER_FONT_FROM_ENCODING_PATH);
             if ( path.IsOk() )
             wxFontMapperPathChanger path(this,
                                          FONTMAPPER_FONT_FROM_ENCODING_PATH);
             if ( path.IsOk() )