Fixed regression: in wxPropertyGrid::PerformValidation(), wxPGProperty::ValidateValue...

[wxWidgets.git] / include / wx / osx / font.h

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 158df31e4df6663dff57eddabcbedf2585f68d49..6f379089c0d9dbca08ab288a85d3554ee997f93d 100644 (file)
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -60,7 +60,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -72,7 +72,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,


@@ -91,7 +91,7 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool CreateSystemFont(wxOSXSystemFont font);
     bool Create(const wxNativeFontInfo& info);
 
     bool CreateSystemFont(wxOSXSystemFont font);

-    
+

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


@@ -113,7 +113,7 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 

-    WXDECLARE_COMPAT_SETTERS
+    wxDECLARE_COMMON_FONT_METHODS();

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -166,6 +166,8 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+

     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;