wxAnimationCtrl fix to display inactive bitmap at start (patch 1590192)

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

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 6123463fb820a88766076bfe24f0ac9e80d72adf..2bdd0200710de27f5b021090e3e47402390ee265 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -37,16 +37,16 @@ enum wxAuiNotebookOption
     wxAUI_NB_TAB_SPLIT           = 1 << 4,
     wxAUI_NB_TAB_MOVE            = 1 << 5,
     wxAUI_NB_SCROLL_BUTTONS      = 1 << 6,
     wxAUI_NB_TAB_SPLIT           = 1 << 4,
     wxAUI_NB_TAB_MOVE            = 1 << 5,
     wxAUI_NB_SCROLL_BUTTONS      = 1 << 6,

-    wxAUI_NB_CLOSE_BUTTON        = 1 << 7,
-    wxAUI_NB_PAGELIST_BUTTON     = 1 << 8,
+    wxAUI_NB_WINDOWLIST_BUTTON   = 1 << 7,
+    wxAUI_NB_CLOSE_BUTTON        = 1 << 8,

     wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 9,
     wxAUI_NB_CLOSE_ON_ALL_TABS   = 1 << 10,
     
     wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP |
                              wxAUI_NB_TAB_SPLIT |
                              wxAUI_NB_TAB_MOVE |
     wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 9,
     wxAUI_NB_CLOSE_ON_ALL_TABS   = 1 << 10,
     
     wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP |
                              wxAUI_NB_TAB_SPLIT |
                              wxAUI_NB_TAB_MOVE |

-                             wxAUI_NB_SCROLL_BUTTONS// |
-                             //wxAUI_NB_CLOSE_ON_ALL_TABS
+                             wxAUI_NB_SCROLL_BUTTONS |
+                             wxAUI_NB_CLOSE_ON_ACTIVE_TAB

 };
 
 
 };
 
 


@@ -55,12 +55,12 @@ enum wxAuiNotebookOption
 
 // tab art class
 
 
 // tab art class
 

-class WXDLLIMPEXP_AUI wxTabArt
+class WXDLLIMPEXP_AUI wxAuiTabArt

 {
 public:
 
 {
 public:
 

-    wxTabArt() { }
-    virtual ~wxTabArt() { }
+    wxAuiTabArt() { }
+    virtual ~wxAuiTabArt() { }

     
     virtual void SetNormalFont(const wxFont& font) = 0;
     virtual void SetSelectedFont(const wxFont& font) = 0;
     
     virtual void SetNormalFont(const wxFont& font) = 0;
     virtual void SetSelectedFont(const wxFont& font) = 0;


@@ -68,62 +68,77 @@ public:
 
     virtual void DrawBackground(
                          wxDC* dc,
 
     virtual void DrawBackground(
                          wxDC* dc,

+                         wxWindow* wnd,

                          const wxRect& rect) = 0;
 
     virtual void DrawTab(wxDC* dc,
                          const wxRect& rect) = 0;
 
     virtual void DrawTab(wxDC* dc,

+                         wxWindow* wnd,

                          const wxRect& in_rect,
                          const wxString& caption,
                          bool active,
                          const wxRect& in_rect,
                          const wxString& caption,
                          bool active,

-                         bool with_close_button,
-                         wxRect* out_rect,
+                         int close_button_state,
+                         wxRect* out_tab_rect,
+                         wxRect* out_button_rect,

                          int* x_extent) = 0;     
     
     virtual void DrawButton(
                          wxDC* dc,
                          int* x_extent) = 0;     
     
     virtual void DrawButton(
                          wxDC* dc,

+                         wxWindow* wnd,

                          const wxRect& in_rect,
                          int bitmap_id,
                          int button_state,
                          int orientation,
                          const wxBitmap& bitmap_override,
                          wxRect* out_rect) = 0;
                          const wxRect& in_rect,
                          int bitmap_id,
                          int button_state,
                          int orientation,
                          const wxBitmap& bitmap_override,
                          wxRect* out_rect) = 0;

+    
+    virtual int ShowWindowList(
+                         wxWindow* wnd,
+                         const wxArrayString& items,
+                         int active_idx) = 0;

                  
     virtual wxSize GetTabSize(
                          wxDC* dc,
                  
     virtual wxSize GetTabSize(
                          wxDC* dc,

+                         wxWindow* wnd,

                          const wxString& caption,
                          bool active,
                          const wxString& caption,
                          bool active,

-                         bool with_close_button,
+                         int close_button_state,

                          int* x_extent) = 0;
                          int* x_extent) = 0;

-                         
-    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;      
+    
+    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;    

 };
 
 
 };
 
 

-class WXDLLIMPEXP_AUI wxDefaultTabArt : public wxTabArt
+class WXDLLIMPEXP_AUI wxAuiDefaultTabArt : public wxAuiTabArt

 {
 
 public:
 
 {
 
 public:
 

-    wxDefaultTabArt();
-    virtual ~wxDefaultTabArt();
+    wxAuiDefaultTabArt();
+    virtual ~wxAuiDefaultTabArt();

     
     

+    void SetWindow(wxWindow* wnd);

     void SetNormalFont(const wxFont& font);
     void SetSelectedFont(const wxFont& font);
     void SetMeasuringFont(const wxFont& font);
     
     void DrawBackground(
                  wxDC* dc,
     void SetNormalFont(const wxFont& font);
     void SetSelectedFont(const wxFont& font);
     void SetMeasuringFont(const wxFont& font);
     
     void DrawBackground(
                  wxDC* dc,

+                 wxWindow* wnd,

                  const wxRect& rect);
 
     void DrawTab(wxDC* dc,
                  const wxRect& rect);
 
     void DrawTab(wxDC* dc,

+                 wxWindow* wnd,

                  const wxRect& in_rect,
                  const wxString& caption,
                  bool active,
                  const wxRect& in_rect,
                  const wxString& caption,
                  bool active,

-                 bool with_close_button,
-                 wxRect* out_rect,
+                 int close_button_state,
+                 wxRect* out_tab_rect,
+                 wxRect* out_button_rect,

                  int* x_extent);
     
     void DrawButton(
                  wxDC* dc,
                  int* x_extent);
     
     void DrawButton(
                  wxDC* dc,

+                 wxWindow* wnd,

                  const wxRect& in_rect,
                  int bitmap_id,
                  int button_state,
                  const wxRect& in_rect,
                  int bitmap_id,
                  int button_state,


@@ -131,14 +146,20 @@ public:
                  const wxBitmap& bitmap_override,
                  wxRect* out_rect);
     
                  const wxBitmap& bitmap_override,
                  wxRect* out_rect);
     

+    int ShowWindowList(
+                 wxWindow* wnd,
+                 const wxArrayString& items,
+                 int active_idx);
+

     wxSize GetTabSize(
                  wxDC* dc,
     wxSize GetTabSize(
                  wxDC* dc,

+                 wxWindow* wnd,

                  const wxString& caption,
                  bool active,
                  const wxString& caption,
                  bool active,

-                 bool with_close_button,
+                 int close_button_state,

                  int* x_extent);
     
                  int* x_extent);
     

-    int GetBestTabCtrlSize(wxWindow* wnd);
+    int GetBestTabCtrlSize(wxWindow* wnd);    

 
 private:
 
 
 private:
 


@@ -156,6 +177,8 @@ private:
     wxBitmap m_disabled_left_bmp;
     wxBitmap m_active_right_bmp;
     wxBitmap m_disabled_right_bmp;
     wxBitmap m_disabled_left_bmp;
     wxBitmap m_active_right_bmp;
     wxBitmap m_disabled_right_bmp;

+    wxBitmap m_active_windowlist_bmp;
+    wxBitmap m_disabled_windowlist_bmp;

 };
 
 
 };
 
 


@@ -211,9 +234,10 @@ public:
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:

+

     int id;               // button's id
     int cur_state;        // current state (normal, hover, pressed, etc.)
     int id;               // button's id
     int cur_state;        // current state (normal, hover, pressed, etc.)

-    int location;         // buttons location (wxLEFT or wxRIGHT)
+    int location;         // buttons location (wxLEFT, wxRIGHT, or wxCENTER)

     wxBitmap bitmap;      // button's hover bitmap
     wxBitmap dis_bitmap;  // button's disabled bitmap
     wxRect rect;          // button's hit rectangle
     wxBitmap bitmap;      // button's hover bitmap
     wxBitmap dis_bitmap;  // button's disabled bitmap
     wxRect rect;          // button's hit rectangle


@@ -233,8 +257,8 @@ public:
     wxAuiTabContainer();
     virtual ~wxAuiTabContainer();
 
     wxAuiTabContainer();
     virtual ~wxAuiTabContainer();
 

-    void SetArtProvider(wxTabArt* art);
-    wxTabArt* GetArtProvider();
+    void SetArtProvider(wxAuiTabArt* art);
+    wxAuiTabArt* GetArtProvider();

 
     void SetFlags(unsigned int flags);
     unsigned int GetFlags() const;
 
     void SetFlags(unsigned int flags);
     unsigned int GetFlags() const;


@@ -259,6 +283,8 @@ public:
     void SetMeasuringFont(const wxFont& measuring_font);
     void DoShowHide();
     void SetRect(const wxRect& rect);
     void SetMeasuringFont(const wxFont& measuring_font);
     void DoShowHide();
     void SetRect(const wxRect& rect);

+    
+    void RemoveButton(int id);

     void AddButton(int id,
                    int location,
                    const wxBitmap& normal_bitmap = wxNullBitmap,
     void AddButton(int id,
                    int location,
                    const wxBitmap& normal_bitmap = wxNullBitmap,


@@ -269,13 +295,14 @@ public:
     
 protected:
 
     
 protected:
 

-    virtual void Render(wxDC* dc);
+    virtual void Render(wxDC* dc, wxWindow* wnd);

 
 

-private:
+protected:

 
 

-    wxTabArt* m_art;
+    wxAuiTabArt* m_art;

     wxAuiNotebookPageArray m_pages;
     wxAuiTabContainerButtonArray m_buttons;
     wxAuiNotebookPageArray m_pages;
     wxAuiTabContainerButtonArray m_buttons;

+    wxAuiTabContainerButtonArray m_tab_close_buttons;

     wxRect m_rect;
     size_t m_tab_offset;
     unsigned int m_flags;
     wxRect m_rect;
     size_t m_tab_offset;
     unsigned int m_flags;


@@ -323,20 +350,20 @@ protected:
 
 
 
 
 
 

-class WXDLLIMPEXP_AUI wxAuiMultiNotebook : public wxControl
+class WXDLLIMPEXP_AUI wxAuiNotebook : public wxControl

 {
 
 public:
 
 {
 
 public:
 

-    wxAuiMultiNotebook();
+    wxAuiNotebook();

 
 

-    wxAuiMultiNotebook(wxWindow* parent,
-                       wxWindowID id = wxID_ANY,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = wxAUI_NB_DEFAULT_STYLE);
+    wxAuiNotebook(wxWindow* parent,
+                  wxWindowID id = wxID_ANY,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
+                  long style = wxAUI_NB_DEFAULT_STYLE);

 
 

-    virtual ~wxAuiMultiNotebook();
+    virtual ~wxAuiNotebook();

 
     bool Create(wxWindow* parent,
                 wxWindowID id = wxID_ANY,
 
     bool Create(wxWindow* parent,
                 wxWindowID id = wxID_ANY,


@@ -357,6 +384,8 @@ public:
 
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
 
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);

+    
+    void SetWindowStyleFlag(long style);

 
     bool SetPageText(size_t page, const wxString& text);
     size_t SetSelection(size_t new_page);
 
     bool SetPageText(size_t page, const wxString& text);
     size_t SetSelection(size_t new_page);


@@ -364,8 +393,9 @@ public:
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;
 
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;
 

-    void SetArtProvider(wxTabArt* art);
-    wxTabArt* GetArtProvider();
+
+    void SetArtProvider(wxAuiTabArt* art);
+    wxAuiTabArt* GetArtProvider();

 
 protected:
 
 
 protected:
 


@@ -381,7 +411,7 @@ protected:
     void InitNotebook(long style);
 
     void OnChildFocus(wxChildFocusEvent& evt);
     void InitNotebook(long style);
 
     void OnChildFocus(wxChildFocusEvent& evt);

-    void OnRender(wxFrameManagerEvent& evt);
+    void OnRender(wxAuiManagerEvent& evt);

     void OnEraseBackground(wxEraseEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnTabClicked(wxCommandEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnTabClicked(wxCommandEvent& evt);


@@ -392,7 +422,7 @@ protected:
     
 protected:
 
     
 protected:
 

-    wxFrameManager m_mgr;
+    wxAuiManager m_mgr;

     wxAuiTabContainer m_tabs;
     int m_curpage;
     int m_tab_id_counter;
     wxAuiTabContainer m_tabs;
     int m_curpage;
     int m_tab_id_counter;


@@ -406,6 +436,7 @@ protected:
     unsigned int m_flags;
 
 #ifndef SWIG
     unsigned int m_flags;
 
 #ifndef SWIG

+    DECLARE_CLASS(wxAuiNotebook)

     DECLARE_EVENT_TABLE()
 #endif
 };
     DECLARE_EVENT_TABLE()
 #endif
 };