Patch from Hartwig and me for implementing reorderable dataview columns. Works on...

[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 9863e0325de4e298d2265e73607dd0cebd1a03e0..6266ea102c97a3e85e11952082a08b45ceec5c90 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -52,11 +52,11 @@ public:
 
     bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
 #if wxMAC_USE_CORE_TEXT
 
     bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
 #if wxMAC_USE_CORE_TEXT

-       bool MacCreateFromUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromUIFont( wxUint32 coreTextFontType );

     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
     bool MacCreateFromCTFont( const void * ctFont );
 #endif
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
     bool MacCreateFromCTFont( const void * ctFont );
 #endif

-    
+

     virtual ~wxFont();
 
     // implement base class pure virtuals
     virtual ~wxFont();
 
     // implement base class pure virtuals


@@ -88,13 +88,13 @@ public:
     virtual bool GetNoAntiAliasing() const  ;
 
     // Mac-specific, risks to change, don't use in portable code
     virtual bool GetNoAntiAliasing() const  ;
 
     // Mac-specific, risks to change, don't use in portable code

-    
+

 #if wxMAC_USE_ATSU_TEXT
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
 #if wxMAC_USE_ATSU_TEXT
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;

-    
+

     // 'new' ATSUI accessors
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     // 'new' ATSUI accessors
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;


@@ -107,14 +107,17 @@ public:
     const void * MacGetCTFontDescriptor() const;
 #endif
 #if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
     const void * MacGetCTFontDescriptor() const;
 #endif
 #if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT

-    void* MacGetATSUStyle() const ; 
+    void* MacGetATSUStyle() const ;

 #endif
 #endif

-    
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     void Unshare();
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
 private:
     void Unshare();
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

-#endif
-    // _WX_FONT_H_
+#endif // _WX_FONT_H_