X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d3aeb0f571b83a713edbd53fa4fca457b0b1053..9f41bf0eb04f4cdffd98a9ff38653c403b150d29:/include/wx/aui/auibook.h?ds=sidebyside diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h index cbb43cfcd5..1859a296da 100644 --- a/include/wx/aui/auibook.h +++ b/include/wx/aui/auibook.h @@ -39,11 +39,12 @@ enum wxAuiNotebookOption wxAUI_NB_TAB_SPLIT = 1 << 4, wxAUI_NB_TAB_MOVE = 1 << 5, wxAUI_NB_TAB_EXTERNAL_MOVE = 1 << 6, - wxAUI_NB_SCROLL_BUTTONS = 1 << 7, - wxAUI_NB_WINDOWLIST_BUTTON = 1 << 8, - wxAUI_NB_CLOSE_BUTTON = 1 << 9, - wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 10, - wxAUI_NB_CLOSE_ON_ALL_TABS = 1 << 11, + wxAUI_NB_TAB_FIXED_WIDTH = 1 << 7, + wxAUI_NB_SCROLL_BUTTONS = 1 << 8, + wxAUI_NB_WINDOWLIST_BUTTON = 1 << 9, + wxAUI_NB_CLOSE_BUTTON = 1 << 10, + wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 11, + wxAUI_NB_CLOSE_ON_ALL_TABS = 1 << 12, wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP | @@ -56,6 +57,78 @@ enum wxAuiNotebookOption +// aui notebook event class + +class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxNotifyEvent +{ +public: + wxAuiNotebookEvent(wxEventType command_type = wxEVT_NULL, + int win_id = 0) + : wxNotifyEvent(command_type, win_id) + { + old_selection = -1; + selection = -1; + drag_source = NULL; + } +#ifndef SWIG + wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxNotifyEvent(c) + { + old_selection = c.old_selection; + selection = c.selection; + drag_source = c.drag_source; + } +#endif + wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); } + + void SetSelection(int s) { selection = s; m_commandInt = s; } + int GetSelection() const { return selection; } + + void SetOldSelection(int s) { old_selection = s; } + int GetOldSelection() const { return old_selection; } + + void SetDragSource(wxAuiNotebook* s) { drag_source = s; } + wxAuiNotebook* GetDragSource() const { return drag_source; } + +public: + int old_selection; + int selection; + wxAuiNotebook* drag_source; + +#ifndef SWIG +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent) +#endif +}; + + +class WXDLLIMPEXP_AUI wxAuiNotebookPage +{ +public: + wxWindow* window; // page's associated window + wxString caption; // caption displayed on the tab + wxBitmap bitmap; // tab's bitmap + wxRect rect; // tab's hit rectangle + bool active; // true if the page is currently active +}; + +class WXDLLIMPEXP_AUI wxAuiTabContainerButton +{ +public: + + int id; // button's id + 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 +}; + + +#ifndef SWIG +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiNotebookPage, wxAuiNotebookPageArray, WXDLLIMPEXP_AUI); +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI); +#endif + // tab art class @@ -66,6 +139,12 @@ public: wxAuiTabArt() { } virtual ~wxAuiTabArt() { } + virtual wxAuiTabArt* Clone() = 0; + virtual void SetFlags(unsigned int flags) = 0; + + virtual void SetSizingInfo(const wxSize& tab_ctrl_size, + size_t tab_count) = 0; + virtual void SetNormalFont(const wxFont& font) = 0; virtual void SetSelectedFont(const wxFont& font) = 0; virtual void SetMeasuringFont(const wxFont& font) = 0; @@ -79,6 +158,7 @@ public: wxWindow* wnd, const wxRect& in_rect, const wxString& caption, + const wxBitmap& bitmap, bool active, int close_button_state, wxRect* out_tab_rect, @@ -94,11 +174,14 @@ public: int orientation, const wxBitmap& bitmap_override, wxRect* out_rect) = 0; - + + virtual int GetIndentSize() = 0; + virtual wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, + const wxBitmap& bitmap, bool active, int close_button_state, int* x_extent) = 0; @@ -108,7 +191,9 @@ public: const wxArrayString& items, int active_idx) = 0; - virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0; + virtual int GetBestTabCtrlSize(wxWindow* wnd, + wxAuiNotebookPageArray& pages, + const wxSize& required_bmp_size) = 0; }; @@ -120,20 +205,25 @@ public: wxAuiDefaultTabArt(); virtual ~wxAuiDefaultTabArt(); - void SetWindow(wxWindow* wnd); + wxAuiTabArt* Clone(); + void SetFlags(unsigned int flags); + void SetSizingInfo(const wxSize& tab_ctrl_size, + size_t tab_count); + 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, wxWindow* wnd, const wxRect& in_rect, const wxString& caption, + const wxBitmap& bitmap, bool active, int close_button_state, wxRect* out_tab_rect, @@ -149,11 +239,14 @@ public: int orientation, const wxBitmap& bitmap_override, wxRect* out_rect); + + int GetIndentSize(); wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, + const wxBitmap& bitmap, bool active, int close_button_state, int* x_extent); @@ -163,18 +256,19 @@ public: const wxArrayString& items, int active_idx); - int GetBestTabCtrlSize(wxWindow* wnd); + int GetBestTabCtrlSize(wxWindow* wnd, + wxAuiNotebookPageArray& pages, + const wxSize& required_bmp_size); -private: +protected: wxFont m_normal_font; wxFont m_selected_font; wxFont m_measuring_font; - wxPen m_normal_bkpen; - wxPen m_selected_bkpen; - wxBrush m_normal_bkbrush; - wxBrush m_selected_bkbrush; - wxBrush m_bkbrush; + 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; wxBitmap m_active_left_bmp; @@ -183,84 +277,106 @@ private: wxBitmap m_disabled_right_bmp; wxBitmap m_active_windowlist_bmp; wxBitmap m_disabled_windowlist_bmp; + + int m_fixed_tab_width; + int m_tab_ctrl_height; + unsigned int m_flags; }; - -// event declarations/classes - -class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxNotifyEvent +class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt { + public: - wxAuiNotebookEvent(wxEventType command_type = wxEVT_NULL, - int win_id = 0) - : wxNotifyEvent(command_type, win_id) - { - old_selection = -1; - selection = -1; - drag_source = NULL; - } -#ifndef SWIG - wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxNotifyEvent(c) - { - old_selection = c.old_selection; - selection = c.selection; - drag_source = c.drag_source; - } -#endif - wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); } - void SetSelection(int s) { selection = s; m_commandInt = s; } - int GetSelection() const { return selection; } + wxAuiSimpleTabArt(); + virtual ~wxAuiSimpleTabArt(); - void SetOldSelection(int s) { old_selection = s; } - int GetOldSelection() const { return old_selection; } - - void SetDragSource(wxAuiNotebook* s) { drag_source = s; } - wxAuiNotebook* GetDragSource() const { return drag_source; } - -public: - int old_selection; - int selection; - wxAuiNotebook* drag_source; + wxAuiTabArt* Clone(); + void SetFlags(unsigned int flags); -#ifndef SWIG -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent) -#endif -}; + void SetSizingInfo(const wxSize& tab_ctrl_size, + size_t tab_count); + 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, + wxWindow* wnd, + const wxRect& in_rect, + const wxString& caption, + const wxBitmap& bitmap, + bool active, + int close_button_state, + wxRect* out_tab_rect, + wxRect* out_button_rect, + int* x_extent); + + 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 GetIndentSize(); + + wxSize GetTabSize( + wxDC& dc, + wxWindow* wnd, + const wxString& caption, + const wxBitmap& bitmap, + bool active, + int close_button_state, + int* x_extent); + + int ShowWindowList( + wxWindow* wnd, + const wxArrayString& items, + int active_idx); + int GetBestTabCtrlSize(wxWindow* wnd, + wxAuiNotebookPageArray& pages, + const wxSize& required_bmp_size); +protected: -class WXDLLIMPEXP_AUI wxAuiNotebookPage -{ -public: - wxWindow* window; // page's associated window - wxString caption; // caption displayed on the tab - wxBitmap bitmap; // tab's bitmap - wxRect rect; // tab's hit rectangle - bool active; // true if the page is currently active + wxFont m_normal_font; + wxFont m_selected_font; + wxFont m_measuring_font; + wxPen m_normal_bkpen; + wxPen m_selected_bkpen; + 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; + + int m_fixed_tab_width; + unsigned int m_flags; }; -class WXDLLIMPEXP_AUI wxAuiTabContainerButton -{ -public: - int id; // button's id - 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 -}; -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiNotebookPage, wxAuiNotebookPageArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI); -#endif + + + class WXDLLIMPEXP_AUI wxAuiTabContainer @@ -271,7 +387,7 @@ public: virtual ~wxAuiTabContainer(); void SetArtProvider(wxAuiTabArt* art); - wxAuiTabArt* GetArtProvider(); + wxAuiTabArt* GetArtProvider() const; void SetFlags(unsigned int flags); unsigned int GetFlags() const; @@ -354,6 +470,7 @@ protected: wxWindow* m_click_tab; bool m_is_dragging; wxAuiTabContainerButton* m_hover_button; + wxAuiTabContainerButton* m_pressed_button; #ifndef SWIG DECLARE_CLASS(wxAuiTabCtrl) @@ -402,28 +519,40 @@ public: void SetWindowStyleFlag(long style); bool SetPageText(size_t page, const wxString& text); + bool SetPageBitmap(size_t page, const wxBitmap& bitmap); size_t SetSelection(size_t new_page); int GetSelection() const; size_t GetPageCount() const; wxWindow* GetPage(size_t page_idx) const; + int GetPageIndex(wxWindow* page_wnd) const; void SetArtProvider(wxAuiTabArt* art); - wxAuiTabArt* GetArtProvider(); + wxAuiTabArt* GetArtProvider() const; + + virtual void SetUniformBitmapSize(const wxSize& size); + virtual void SetTabCtrlHeight(int height); + +protected: + // these can be overridden + virtual void UpdateTabCtrlHeight(); + virtual int CalculateTabCtrlHeight(); + virtual wxSize CalculateNewSplitSize(); + protected: + void DoSizing(); + void InitNotebook(long style); wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt); wxWindow* GetTabFrameFromTabCtrl(wxWindow* tab_ctrl); wxAuiTabCtrl* GetActiveTabCtrl(); bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx); void RemoveEmptyTabFrames(); - + void UpdateHintWindowSize(); + protected: - void DoSizing(); - void InitNotebook(long style); - void OnChildFocus(wxChildFocusEvent& evt); void OnRender(wxAuiManagerEvent& evt); void OnEraseBackground(wxEraseEvent& evt); @@ -442,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; @@ -463,6 +594,7 @@ protected: #ifndef SWIG BEGIN_DECLARE_EVENT_TYPES() + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 0) @@ -476,7 +608,9 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&); #define wxAuiNotebookEventHandler(func) \ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiNotebookEventFunction, &func) - + +#define EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn)) #define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn)) #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \ @@ -495,6 +629,7 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&); #else // wxpython/swig event work +%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE; %constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED; %constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING; %constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_BUTTON; @@ -504,6 +639,7 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&); %constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND; %pythoncode { + EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 ) EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 )