Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h
index 4b485d7f39c011806df735739963f2c9b833ab37..3ccdebb42241158dec9ca25e19f47d375e7df10d 100644 (file)
--- a/include/wx/dfb/font.h
+++ b/include/wx/dfb/font.h
@@ -60,6 +60,19 @@ public:
         SetPixelSize(pixelSize);
     }
 
         SetPixelSize(pixelSize);
     }
 

+    wxFont(int pointSize,
+           wxFontFamily family,
+           int flags = wxFONTFLAG_DEFAULT,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(pointSize, family,
+               GetStyleFromFlags(flags),
+               GetWeightFromFlags(flags),
+               GetUnderlinedFromFlags(flags),
+               face, encoding);
+    }
+

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


@@ -71,7 +84,6 @@ public:
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;

-    virtual wxFontFamily GetFamily() const;

     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual wxString GetFaceName() const;
     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual wxString GetFaceName() const;


@@ -90,10 +102,6 @@ public:
 
     wxDECLARE_COMMON_FONT_METHODS();
 
 
     wxDECLARE_COMMON_FONT_METHODS();
 

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

     // implementation from now on:
     wxIDirectFBFontPtr GetDirectFBFont(bool antialiased) const;
 
     // implementation from now on:
     wxIDirectFBFontPtr GetDirectFBFont(bool antialiased) const;
 


@@ -101,6 +109,8 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 

+    virtual wxFontFamily DoGetFamily() const;
+

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