Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/aui/auibook.h b/interface/wx/aui/auibook.h
index ab151ff49b802c4ed32878faefef6adb21acad40..b96cf4eb5be0026b9e5cce8b708a0d46584336b1 100644 (file)
--- a/interface/wx/aui/auibook.h
+++ b/interface/wx/aui/auibook.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxAuiNotebook
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxAuiNotebook
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -55,7 +55,7 @@
     @endStyleTable
 
 
     @endStyleTable
 
 

-    @beginEventTable{wxAuiNotebookEvent}
+    @beginEventEmissionTable{wxAuiNotebookEvent}

     @event{EVT_AUINOTEBOOK_PAGE_CLOSE(id, func)}
         Provide description.
     @event{EVT_AUINOTEBOOK_PAGE_CHANGED(id, func)}
     @event{EVT_AUINOTEBOOK_PAGE_CLOSE(id, func)}
         Provide description.
     @event{EVT_AUINOTEBOOK_PAGE_CHANGED(id, func)}


@@ -248,8 +248,8 @@ public:
         The @a direction argument specifies where the pane should go, it should be one
         of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
     */
         The @a direction argument specifies where the pane should go, it should be one
         of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
     */

-    void SetUniformBitmapSize(const wxSize& size);
-    void Split(size_t page, int direction);
+    virtual void SetUniformBitmapSize(const wxSize& size);
+    virtual void Split(size_t page, int direction);

     //@}
 
     /**
     //@}
 
     /**


@@ -340,6 +340,20 @@ public:
     */
     virtual void SetSelectedFont(const wxFont& font) = 0;
 
     */
     virtual void SetSelectedFont(const wxFont& font) = 0;
 

+    /**
+        Sets the colour of the inactive tabs.
+
+        @since 2.9.2
+    */
+    virtual void SetColour(const wxColour& colour) = 0;
+
+    /**
+        Sets the colour of the selected tab.
+
+        @since 2.9.2
+    */
+    virtual void SetActiveColour(const wxColour& colour) = 0;
+

     /**
         Sets sizing information.
     */
     /**
         Sets sizing information.
     */