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 f10d6801a56c9a3e6cecf198fe583069081ee9e1..2bdd0200710de27f5b021090e3e47402390ee265 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -27,52 +27,140 @@
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 
 

-// tab art class
+
+enum wxAuiNotebookOption
+{
+    wxAUI_NB_TOP                 = 1 << 0,
+    wxAUI_NB_LEFT                = 1 << 1,  // not implemented yet
+    wxAUI_NB_RIGHT               = 1 << 2,  // not implemented yet
+    wxAUI_NB_BOTTOM              = 1 << 3,  // not implemented yet
+    wxAUI_NB_TAB_SPLIT           = 1 << 4,
+    wxAUI_NB_TAB_MOVE            = 1 << 5,
+    wxAUI_NB_SCROLL_BUTTONS      = 1 << 6,
+    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_SCROLL_BUTTONS |
+                             wxAUI_NB_CLOSE_ON_ACTIVE_TAB
+};
+
+
+

 
 
 
 

-class wxTabArt
+// tab art class
+
+class WXDLLIMPEXP_AUI wxAuiTabArt

 {
 public:
 
 {
 public:
 

+    wxAuiTabArt() { }
+    virtual ~wxAuiTabArt() { }
+    
+    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,
     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,

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

                          int* x_extent) = 0;     
                          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 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;
+    
+    virtual int ShowWindowList(
+                         wxWindow* wnd,
+                         const wxArrayString& items,
+                         int active_idx) = 0;
+                 
+    virtual wxSize GetTabSize(
+                         wxDC* dc,
+                         wxWindow* wnd,
+                         const wxString& caption,
+                         bool active,
+                         int close_button_state,
+                         int* x_extent) = 0;
+    
+    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;    

 };
 
 
 };
 
 

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

 {
 
 public:
 
 {
 
 public:
 

-    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 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,

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

                  int* x_extent);
                  int* x_extent);

-              
-    void SetNormalFont(const wxFont& font);
-    void SetSelectedFont(const wxFont& font);
-    void SetMeasuringFont(const wxFont& font);
-   
+    
+    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);
+    
+    int ShowWindowList(
+                 wxWindow* wnd,
+                 const wxArrayString& items,
+                 int active_idx);
+
+    wxSize GetTabSize(
+                 wxDC* dc,
+                 wxWindow* wnd,
+                 const wxString& caption,
+                 bool active,
+                 int close_button_state,
+                 int* x_extent);
+    
+    int GetBestTabCtrlSize(wxWindow* wnd);    
+

 private:
 
     wxFont m_normal_font;
 private:
 
     wxFont m_normal_font;


@@ -83,6 +171,14 @@ private:
     wxBrush m_normal_bkbrush;
     wxBrush m_selected_bkbrush;
     wxBrush m_bkbrush;
     wxBrush m_normal_bkbrush;
     wxBrush m_selected_bkbrush;
     wxBrush m_bkbrush;

+    wxBitmap m_active_close_bmp;
+    wxBitmap m_disabled_close_bmp;
+    wxBitmap m_active_left_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;

 };
 
 
 };
 
 


@@ -106,7 +202,7 @@ public:
 #endif
     wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); }
 
 #endif
     wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); }
 

-    void SetSelection(int s) { selection = s; }
+    void SetSelection(int s) { selection = s; m_commandInt = s; }

     void SetOldSelection(int s) { old_selection = s; }
     int GetSelection() const { return selection; }
     int GetOldSelection() const { return old_selection; }
     void SetOldSelection(int s) { old_selection = s; }
     int GetSelection() const { return selection; }
     int GetOldSelection() const { return old_selection; }


@@ -138,10 +234,12 @@ public:
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:

+

     int id;               // button's id
     int id;               // button's id

-    int cur_state;        // current state (normal, hover, pressed)
-    int location;         // buttons location (wxLEFT or wxRIGHT)
-    wxBitmap bitmap;      // button's bitmap
+    int cur_state;        // current state (normal, hover, pressed, etc.)
+    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
 };
 
     wxRect rect;          // button's hit rectangle
 };
 


@@ -159,11 +257,15 @@ 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;

 
     bool AddPage(wxWindow* page, const wxAuiNotebookPage& info);
     bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx);
 
     bool AddPage(wxWindow* page, const wxAuiNotebookPage& info);
     bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx);

+    bool MovePage(wxWindow* page, size_t new_idx);

     bool RemovePage(wxWindow* page);
     bool SetActivePage(wxWindow* page);
     bool SetActivePage(size_t page);
     bool RemovePage(wxWindow* page);
     bool SetActivePage(wxWindow* page);
     bool SetActivePage(size_t page);


@@ -181,18 +283,29 @@ 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 AddButton(int id, int location, const wxBitmap& bmp);
-
+    
+    void RemoveButton(int id);
+    void AddButton(int id,
+                   int location,
+                   const wxBitmap& normal_bitmap = wxNullBitmap,
+                   const wxBitmap& disabled_bitmap = wxNullBitmap);
+
+    size_t GetTabOffset() const;
+    void SetTabOffset(size_t offset);
+    

 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;
     wxRect m_rect;

+    size_t m_tab_offset;
+    unsigned int m_flags;

 };
 
 
 };
 
 


@@ -208,6 +321,8 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0);
 
                  const wxSize& size = wxDefaultSize,
                  long style = 0);
 

+    ~wxAuiTabCtrl();
+    

 protected:
 
     void OnPaint(wxPaintEvent& evt);
 protected:
 
     void OnPaint(wxPaintEvent& evt);


@@ -217,11 +332,13 @@ protected:
     void OnLeftUp(wxMouseEvent& evt);
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);
     void OnLeftUp(wxMouseEvent& evt);
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);

+    void OnButton(wxAuiNotebookEvent& evt);

 
 

+    

 protected:
 
     wxPoint m_click_pt;
 protected:
 
     wxPoint m_click_pt;

-    int m_click_tab;
+    wxWindow* m_click_tab;

     bool m_is_dragging;
     wxAuiTabContainerButton* m_hover_button;
 
     bool m_is_dragging;
     wxAuiTabContainerButton* m_hover_button;
 


@@ -233,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 = 0);
+    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,


@@ -267,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);


@@ -274,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:
 


@@ -288,10 +408,10 @@ protected:
 protected:
 
     void DoSizing();
 protected:
 
     void DoSizing();

-    void InitNotebook();
+    void InitNotebook(long style);

 
     void OnChildFocus(wxChildFocusEvent& evt);
 
     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);


@@ -299,10 +419,10 @@ protected:
     void OnTabDragMotion(wxCommandEvent& evt);
     void OnTabEndDrag(wxCommandEvent& evt);
     void OnTabButton(wxCommandEvent& evt);
     void OnTabDragMotion(wxCommandEvent& evt);
     void OnTabEndDrag(wxCommandEvent& evt);
     void OnTabButton(wxCommandEvent& evt);

-
+    

 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;


@@ -311,8 +431,12 @@ protected:
     wxFont m_selected_font;
     wxFont m_normal_font;
     int m_tab_ctrl_height;
     wxFont m_selected_font;
     wxFont m_normal_font;
     int m_tab_ctrl_height;

+    
+    int m_last_drag_x;
+    unsigned int m_flags;

 
 #ifndef SWIG
 
 #ifndef SWIG

+    DECLARE_CLASS(wxAuiNotebook)

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


@@ -342,7 +466,7 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn))
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn))

-#define EVT_AUINOTEBOOK_PAGE_BUTTON(winid, fn) \
+#define EVT_AUINOTEBOOK_BUTTON(winid, fn) \

     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn))
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn))