move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 759c7541eb789c6f30a159869c1df7302df02af7..e473054fe8e1de1239f8859fd9e7c04e9ad4335a 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -199,7 +199,7 @@ class wxFontMapperModule : public wxModule
 public:
     wxFontMapperModule() : wxModule() { }
     virtual bool OnInit() { return true; }
 public:
     wxFontMapperModule() : wxModule() { }
     virtual bool OnInit() { return true; }

-    virtual void OnExit() { delete wxFontMapperBase::Set(NULL); }
+    virtual void OnExit() { delete (wxFontMapperBase*)wxFontMapperBase::Set(NULL); }

 
     DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
 };


@@ -233,11 +233,10 @@ wxFontMapperBase::~wxFontMapperBase()
 #endif // wxUSE_CONFIG
 }
 
 #endif // wxUSE_CONFIG
 }
 

+bool wxFontMapperBase::IsWxFontMapper()
+{   return false; }
+

 /* static */
 /* static */

-// Declared as returning wxFontMapper when wxUSE_GUI=1.  Unfortunately, it's
-// only implemented in wxBase library.  Note that if the last resort
-// is taken and GUI code tries to treat it as a real wxFontMapper
-// then you'd be in trouble.

 wxFontMapperBase *wxFontMapperBase::Get()
 {
     if ( !sm_instance )
 wxFontMapperBase *wxFontMapperBase::Get()
 {
     if ( !sm_instance )