Compile fix for --disable-ffile.

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

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 046fec20893b084a342826ccbb77b40baa410785..1859a296da7defb81c178481e6dfb1b5717978f6 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -192,7 +192,8 @@ public:
                          int active_idx) = 0;
     
     virtual int GetBestTabCtrlSize(wxWindow* wnd,
-                                   wxAuiNotebookPageArray& pages) = 0;    
+                                   wxAuiNotebookPageArray& pages,
+                                   const wxSize& required_bmp_size) = 0;    
 };
 
 
@@ -256,7 +257,8 @@ public:
                  int active_idx);
 
     int GetBestTabCtrlSize(wxWindow* wnd,
-                 wxAuiNotebookPageArray& pages);  
+                 wxAuiNotebookPageArray& pages,
+                 const wxSize& required_bmp_size);  
 
 protected:
 
@@ -265,6 +267,7 @@ protected:
     wxFont m_measuring_font;
     wxColour m_base_colour;
     wxPen m_base_colour_pen;
+    wxPen m_border_pen;
     wxBrush m_base_colour_brush;
     wxBitmap m_active_close_bmp;
     wxBitmap m_disabled_close_bmp;
@@ -342,7 +345,8 @@ public:
                  int active_idx);
 
     int GetBestTabCtrlSize(wxWindow* wnd,
-                 wxAuiNotebookPageArray& pages);  
+                 wxAuiNotebookPageArray& pages,
+                 const wxSize& required_bmp_size);  
 
 protected:
 
@@ -525,12 +529,16 @@ public:
 
     void SetArtProvider(wxAuiTabArt* art);
     wxAuiTabArt* GetArtProvider() const;
-
+    
+    virtual void SetUniformBitmapSize(const wxSize& size);
+    virtual void SetTabCtrlHeight(int height);
+    
 protected:
 
     // these can be overridden
-    virtual void SetTabCtrlHeight(int height);
+    virtual void UpdateTabCtrlHeight();
     virtual int CalculateTabCtrlHeight();
+    virtual wxSize CalculateNewSplitSize();
     
 protected:
 
@@ -541,10 +549,10 @@ protected:
     wxAuiTabCtrl* GetActiveTabCtrl();
     bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx);
     void RemoveEmptyTabFrames();
-
+    void UpdateHintWindowSize();
+    
 protected:
 
-
     void OnChildFocus(wxChildFocusEvent& evt);
     void OnRender(wxAuiManagerEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
@@ -563,10 +571,12 @@ protected:
     int m_tab_id_counter;
     wxWindow* m_dummy_wnd;
 
+    wxSize m_requested_bmp_size;
+    int m_requested_tabctrl_height;
     wxFont m_selected_font;
     wxFont m_normal_font;
     int m_tab_ctrl_height;
-    
+        
     int m_last_drag_x;
     unsigned int m_flags;