Build fix.

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

diff --git a/build/palmos/makefile b/build/palmos/makefile
index 80cf7c1c1e5b4b0dbf85106b0838faeb06b554e1..0f4e0184982ad728732b7cf1313830963e4088b3 100644 (file)
--- a/build/palmos/makefile
+++ b/build/palmos/makefile
@@ -244,6 +244,7 @@ GUI_CMN_SRC = \
 ../../src/common/fddlgcmn.cpp \
 ../../src/common/fldlgcmn.cpp \
 ../../src/common/fontcmn.cpp \
+../../src/common/fontenumcmn.cpp \
 ../../src/common/fontmap.cpp \
 ../../src/common/framecmn.cpp \
 ../../src/common/gaugecmn.cpp \

diff --git a/src/palmos/fontenum.cpp b/src/palmos/fontenum.cpp
index ad4e66ee714bacab96f0c2de8196c57d03851eaf..08e6aaa6af7df59131c6fd4ce84dde9b3971933a 100644 (file)
--- a/src/palmos/fontenum.cpp
+++ b/src/palmos/fontenum.cpp
@@ -24,115 +24,20 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FONTMAP
+#include "wx/fontenum.h"
 
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/encinfo.h"
 #endif
 
-#include "wx/palmos/private.h"
-
 #include "wx/fontutil.h"
-#include "wx/fontenum.h"
 #include "wx/fontmap.h"
 
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// the helper class which calls ::EnumFontFamilies() and whose OnFont() is
-// called from the callback passed to this function and, in its turn, calls the
-// appropariate wxFontEnumerator method
-class wxFontEnumeratorHelper
-{
-public:
-    wxFontEnumeratorHelper(wxFontEnumerator *fontEnum);
-
-    // control what exactly are we enumerating
-        // we enumerate fonts with given enocding
-    bool SetEncoding(wxFontEncoding encoding);
-        // we enumerate fixed-width fonts
-    void SetFixedOnly(bool fixedOnly) { m_fixedOnly = fixedOnly; }
-        // we enumerate the encodings available in this family
-    void SetFamily(const wxString& family);
-
-    // call to start enumeration
-    void DoEnumerate();
-
-    // called by our font enumeration proc
-    bool OnFont(const LPLOGFONT lf, const LPTEXTMETRIC tm) const;
-
-private:
-    // the object we forward calls to OnFont() to
-    wxFontEnumerator *m_fontEnum;
-
-    // if != -1, enum only fonts which have this encoding
-    int m_charset;
-
-    // if not empty, enum only the fonts with this facename
-    wxString m_facename;
-
-    // if not empty, enum only the fonts in this family
-    wxString m_family;
-
-    // if TRUE, enum only fixed fonts
-    bool m_fixedOnly;
-
-    // if TRUE, we enumerate the encodings, not fonts
-    bool m_enumEncodings;
-
-    // the list of charsets we already found while enumerating charsets
-    wxArrayInt m_charsets;
-
-    // the list of facenames we already found while enumerating facenames
-    wxArrayString m_facenames;
-
-    DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)
-};
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-#ifndef __WXMICROWIN__
-int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
-                                  DWORD dwStyle, LONG lParam);
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxFontEnumeratorHelper
-// ----------------------------------------------------------------------------
-
-wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
-{
-}
-
-void wxFontEnumeratorHelper::SetFamily(const wxString& family)
-{
-}
-
-bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
-{
-    return FALSE;
-}
-
-#define wxFONTENUMPROC FONTENUMPROC
-
-void wxFontEnumeratorHelper::DoEnumerate()
-{
-}
-
-bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
-                                    const LPTEXTMETRIC tm) const
-{
-    return false;
-}
-
 // ----------------------------------------------------------------------------
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
@@ -147,5 +52,3 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
     return false;
 }
-
-#endif // wxUSE_FONTMAP