Set initial window size as its minimal size.

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

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 79fb78b7c49402a18e279e66f612d7b09fd501ba..bcd86e775a896fc4e2c68a0d44c25eff0a67754e 100644 (file)
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -37,6 +37,10 @@ public:
     // ctors and such
     wxFont() { }
 
     // ctors and such
     wxFont() { }
 

+#if wxOSX_USE_COCOA
+    wxFont(WX_NSFont nsfont);
+#endif
+

 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,


@@ -60,7 +64,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 +76,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 +95,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


@@ -120,10 +124,6 @@ public:
 
     virtual bool RealizeResource();
 
 
     virtual bool RealizeResource();
 

-    // Unofficial API, don't use
-    virtual void SetNoAntiAliasing( bool noAA = TRUE ) ;
-    virtual bool GetNoAntiAliasing() const  ;
-

     // Mac-specific, risks to change, don't use in portable code
 
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     // Mac-specific, risks to change, don't use in portable code
 
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT


@@ -157,6 +157,7 @@ public:
     WX_NSFont OSXGetNSFont() const;
     static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
     static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);
     WX_NSFont OSXGetNSFont() const;
     static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
     static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);

+    static void SetNativeInfoFromNSFont(WX_NSFont nsfont, wxNativeFontInfo* info);

 #endif
 
 #if wxOSX_USE_IPHONE
 #endif
 
 #if wxOSX_USE_IPHONE