aui notebook sizing calculations streamlined

[wxWidgets.git] / include / wx / aui / auibook.h

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index a44977a86fde5c8baf2e81888bc68e678430556c..94d5bfef24e93eb0aa05584531bbaad7d7b8d8a2 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -36,6 +36,10 @@ public:
 
     wxTabArt() { }
     virtual ~wxTabArt() { }
+    
+    virtual void SetNormalFont(const wxFont& font) = 0;
+    virtual void SetSelectedFont(const wxFont& font) = 0;
+    virtual void SetMeasuringFont(const wxFont& font) = 0;
 
     virtual void DrawBackground(
                          wxDC* dc,
@@ -62,10 +66,8 @@ public:
                          const wxString& caption,
                          bool active,
                          int* x_extent) = 0;
-                       
-    virtual void SetNormalFont(const wxFont& font) = 0;
-    virtual void SetSelectedFont(const wxFont& font) = 0;
-    virtual void SetMeasuringFont(const wxFont& font) = 0;
+                         
+    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;      
 };
 
 
@@ -77,6 +79,10 @@ public:
     wxDefaultTabArt();
     virtual ~wxDefaultTabArt();
     
+    void SetNormalFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font);
+    
     void DrawBackground(
                  wxDC* dc,
                  const wxRect& rect);
@@ -102,11 +108,9 @@ public:
                  const wxString& caption,
                  bool active,
                  int* x_extent);
-                                   
-    void SetNormalFont(const wxFont& font);
-    void SetSelectedFont(const wxFont& font);
-    void SetMeasuringFont(const wxFont& font);
-   
+    
+    int GetBestTabCtrlSize(wxWindow* wnd);
+
 private:
 
     wxFont m_normal_font;