fix gcc warning about possibly uninitialized variables

[wxWidgets.git] / include / wx / mac / carbon / font.h

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 9fc1171abbde4bbe91779e588d559912d6a3f9fa..9863e0325de4e298d2265e73607dd0cebd1a03e0 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -50,9 +50,11 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
 
     bool Create(const wxNativeFontInfo& info);
 

-    bool MacCreateThemeFont( wxUint16 themeFontID ) ;
-#ifdef __LP64__
-       bool MacCreateUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
+#if wxMAC_USE_CORE_TEXT
+       bool MacCreateFromUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
+    bool MacCreateFromCTFont( const void * ctFont );

 #endif
     
     virtual ~wxFont();
 #endif
     
     virtual ~wxFont();


@@ -87,7 +89,7 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
     
 
     // Mac-specific, risks to change, don't use in portable code
     

-#ifndef __LP64__    
+#if wxMAC_USE_ATSU_TEXT

     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;


@@ -99,10 +101,12 @@ public:
     wxUint16 MacGetThemeFontID() const ;
 
     // Returns an ATSUStyle not ATSUStyle*
     wxUint16 MacGetThemeFontID() const ;
 
     // Returns an ATSUStyle not ATSUStyle*

-    void* MacGetATSUStyle() const ; 
-#else
+#endif
+#if wxMAC_USE_CORE_TEXT

     const void * MacGetCTFont() const;
     const void * MacGetCTFont() const;

-    // soon to be removed for 64bit, Returns an ATSUStyle not ATSUStyle*
+    const void * MacGetCTFontDescriptor() const;
+#endif
+#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT

     void* MacGetATSUStyle() const ; 
 #endif
     
     void* MacGetATSUStyle() const ; 
 #endif