Get rid of wxFontMapper in wxBase library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
class WXDLLIMPEXP_BASE wxConfigBase;
|
||||
#endif // wxUSE_CONFIG
|
||||
|
||||
class WXDLLIMPEXP_BASE wxFontMapper;
|
||||
class WXDLLIMPEXP_CORE wxFontMapper;
|
||||
|
||||
#if wxUSE_GUI
|
||||
class WXDLLIMPEXP_CORE wxWindow;
|
||||
@@ -60,7 +60,14 @@ public:
|
||||
virtual ~wxFontMapperBase();
|
||||
|
||||
// return instance of the wxFontMapper singleton
|
||||
#if wxUSE_GUI
|
||||
// GUI code needs to know it's a wxFontMapper because there
|
||||
// are additional methods in the subclass.
|
||||
static wxFontMapper *Get();
|
||||
#else
|
||||
// wxBase code only cares that it's a wxFontMapperBase
|
||||
static wxFontMapperBase *Get();
|
||||
#endif
|
||||
|
||||
// set the singleton to 'mapper' instance and return previous one
|
||||
static wxFontMapper *Set(wxFontMapper *mapper);
|
||||
@@ -251,13 +258,7 @@ private:
|
||||
DECLARE_NO_COPY_CLASS(wxFontMapper)
|
||||
};
|
||||
|
||||
#else // !wxUSE_GUI
|
||||
|
||||
class WXDLLIMPEXP_BASE wxFontMapper : public wxFontMapperBase
|
||||
{
|
||||
};
|
||||
|
||||
#endif // wxUSE_GUI/!wxUSE_GUI
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// global variables
|
||||
|
Reference in New Issue
Block a user