patch 1306473

[wxWidgets.git] / src / mac / carbon / fontenum.cpp

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 4a91e5703f1bee306fd2166efeb7f78a3bdb2df1..83ffa6ef4008e9f25a19f31d26db489571e2eab0 100644 (file)
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -17,13 +17,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "fontenum.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_FONTMAP
+

 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif


@@ -36,6 +34,7 @@
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"

+#include "wx/encinfo.h"

 
 #include "wx/mac/private.h"
 
 
 #include "wx/mac/private.h"
 


@@ -103,46 +102,46 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 
 void wxFontEnumeratorHelper::DoEnumerate()
 {
 
 void wxFontEnumeratorHelper::DoEnumerate()
 {

-       MenuHandle      menu ;
-       Str255          p_name ;
-
-       short           lines ;
-       
-       menu = NewMenu( 32000 , "\pFont" )  ;
-       AppendResMenu( menu , 'FONT' ) ;
-       lines = CountMenuItems( menu ) ;
-
-       for ( int i = 1 ; i < lines+1  ; i ++ )
-       {
-           GetMenuItemText( menu , i , p_name ) ;
-           wxString c_name = wxMacMakeStringFromPascal(p_name) ;
-
-           /*
-             
-             if ( m_fixedOnly )
-           {
-               // check that it's a fixed pitch font (there is *no* error here, the
-               // flag name is misleading!)
-               if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
-               {
-                   // not a fixed pitch font
-                   return TRUE;
-               }
-           }
-       
-           if ( m_charset != -1 )
-           {
-               // check that we have the right encoding
-               if ( lf->lfCharSet != m_charset )
-               {
-                   return TRUE;
-               }
-           }
-       
-               */
-               m_fontEnum->OnFacename( c_name ) ;
-       }
-       DisposeMenu( menu ) ;
+    MenuHandle    menu ;
+    Str255        p_name ;
+
+    short         lines ;
+    
+    menu = NewMenu( 32000 , "\pFont" )  ;
+    AppendResMenu( menu , 'FONT' ) ;
+    lines = CountMenuItems( menu ) ;
+
+    for ( int i = 1 ; i < lines+1  ; i ++ )
+    {
+        GetMenuItemText( menu , i , p_name ) ;
+        wxString c_name = wxMacMakeStringFromPascal(p_name) ;
+
+        /*
+          
+          if ( m_fixedOnly )
+        {
+            // check that it's a fixed pitch font (there is *no* error here, the
+            // flag name is misleading!)
+            if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
+            {
+                // not a fixed pitch font
+                return TRUE;
+            }
+        }
+    
+        if ( m_charset != -1 )
+        {
+            // check that we have the right encoding
+            if ( lf->lfCharSet != m_charset )
+            {
+                return TRUE;
+            }
+        }
+    
+        */
+        m_fontEnum->OnFacename( c_name ) ;
+    }
+    DisposeMenu( menu ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -170,3 +169,5 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     return TRUE;
 }
 
     return TRUE;
 }

+
+#endif