activating DrawRectangle optimization

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

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index aa162f7230c2f73b7cbca1356f90ac5811c91797..d42d784c5d828f4e76a0d0e2647249efacb19d08 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -95,6 +95,7 @@ class WXDLLIMPEXP_AUI wxAuiNotebookPage
 public:
     wxWindow* window;     // page's associated window
     wxString caption;     // caption displayed on the tab
 public:
     wxWindow* window;     // page's associated window
     wxString caption;     // caption displayed on the tab

+    wxString tooltip;     // tooltip displayed when hovering over tab title

     wxBitmap bitmap;      // tab's bitmap
     wxRect rect;          // tab's hit rectangle
     bool active;          // true if the page is currently active
     wxBitmap bitmap;      // tab's bitmap
     wxRect rect;          // tab's hit rectangle
     bool active;          // true if the page is currently active


@@ -288,13 +289,16 @@ public:
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
 
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
 

-    size_t GetPageCount() const;
-    wxWindow* GetPage(size_t pageIdx) const;
+    virtual size_t GetPageCount() const;
+    virtual wxWindow* GetPage(size_t pageIdx) const;

     int GetPageIndex(wxWindow* pageWnd) const;
 
     bool SetPageText(size_t page, const wxString& text);
     wxString GetPageText(size_t pageIdx) const;
 
     int GetPageIndex(wxWindow* pageWnd) const;
 
     bool SetPageText(size_t page, const wxString& text);
     wxString GetPageText(size_t pageIdx) const;
 

+    bool SetPageToolTip(size_t page, const wxString& text);
+    wxString GetPageToolTip(size_t pageIdx) const;
+

     bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
     wxBitmap GetPageBitmap(size_t pageIdx) const;
 
     bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
     wxBitmap GetPageBitmap(size_t pageIdx) const;
 


@@ -323,9 +327,6 @@ public:
     // Gets the height of the notebook for a given page height
     int GetHeightForPageHeight(int pageHeight);
 
     // Gets the height of the notebook for a given page height
     int GetHeightForPageHeight(int pageHeight);
 

-    // Advances the selection, generation page selection events
-    void AdvanceSelection(bool forward = true);
-

     // Shows the window menu
     bool ShowWindowMenu();
 
     // Shows the window menu
     bool ShowWindowMenu();
 


@@ -335,9 +336,6 @@ public:
     // we don't want focus for ourselves
     // virtual bool AcceptsFocus() const { return false; }
 
     // we don't want focus for ourselves
     // virtual bool AcceptsFocus() const { return false; }
 

-    // Redo sizing after thawing
-    virtual void Thaw();
-

     //wxBookCtrlBase functions
 
     virtual void SetPageSize (const wxSize &size);
     //wxBookCtrlBase functions
 
     virtual void SetPageSize (const wxSize &size);


@@ -346,8 +344,6 @@ public:
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
 
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
 

-    wxWindow* GetCurrentPage () const;
-

     virtual int ChangeSelection(size_t n);
 
     virtual bool AddPage(wxWindow *page, const wxString &text, bool select, 
     virtual int ChangeSelection(size_t n);
 
     virtual bool AddPage(wxWindow *page, const wxString &text, bool select, 


@@ -363,6 +359,9 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 

+    // Redo sizing after thawing
+    virtual void DoThaw();
+

     // these can be overridden
 
     // update the height, return true if it was done or false if the new height
     // these can be overridden
 
     // update the height, return true if it was done or false if the new height