Added call to top-level window OnInternalIdle

[wxWidgets.git] / src / common / fmapbase.cpp

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index fa6dcd0d65eb693774c2c590cea1f6861060ee82..f39c95e01da9cb1e220def466a0d7887ea09ab95 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -43,7 +43,8 @@
 #include "wx/apptrait.h"
 #include "wx/module.h"
 
 #include "wx/apptrait.h"
 #include "wx/module.h"
 

-#if wxUSE_CONFIG
+// wxMemoryConfig uses wxFileConfig
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     #include "wx/config.h"
     #include "wx/memconf.h"
 #endif
     #include "wx/config.h"
     #include "wx/memconf.h"
 #endif


@@ -197,7 +198,7 @@ wxFontMapper *wxFontMapperBase::sm_instance = NULL;
 
 wxFontMapperBase::wxFontMapperBase()
 {
 
 wxFontMapperBase::wxFontMapperBase()
 {

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     m_config = NULL;
     m_configIsDummy = FALSE;
 #endif // wxUSE_CONFIG
     m_config = NULL;
     m_configIsDummy = FALSE;
 #endif // wxUSE_CONFIG


@@ -205,7 +206,7 @@ wxFontMapperBase::wxFontMapperBase()
 
 wxFontMapperBase::~wxFontMapperBase()
 {
 
 wxFontMapperBase::~wxFontMapperBase()
 {

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     if ( m_configIsDummy )
         delete m_config;
 #endif // wxUSE_CONFIG
     if ( m_configIsDummy )
         delete m_config;
 #endif // wxUSE_CONFIG


@@ -244,7 +245,7 @@ wxFontMapper *wxFontMapperBase::Set(wxFontMapper *mapper)
     return old;
 }
 
     return old;
 }
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

 
 // ----------------------------------------------------------------------------
 // config usage customisation
 
 // ----------------------------------------------------------------------------
 // config usage customisation


@@ -352,6 +353,8 @@ void wxFontMapperBase::RestorePath(const wxString& pathOld)
     GetConfig()->SetPath(pathOld);
 }
 
     GetConfig()->SetPath(pathOld);
 }
 

+#endif
+

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


@@ -365,7 +368,7 @@ wxFontMapperBase::CharsetToEncoding(const wxString& charset,
     // we're going to modify it, make a copy
     wxString cs = charset;
 
     // we're going to modify it, make a copy
     wxString cs = charset;
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // first try the user-defined settings
     wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
     if ( path.IsOk() )
     // first try the user-defined settings
     wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
     if ( path.IsOk() )


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

-#endif // wxUSE_CONFIG
-

 #endif // wxUSE_FONTMAP
 
 #endif // wxUSE_FONTMAP