X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/028003016290b62becb31873c38a202d6e61eec4..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/generic/tabg.h?ds=sidebyside diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index e937b156b1..c26b524d08 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -6,21 +6,23 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __TABGH_G__ #define __TABGH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "tabg.h" #endif #define WXTAB_VERSION 1.1 -#include "wx/hash.h" +#include "wx/hashmap.h" #include "wx/string.h" #include "wx/dialog.h" +#include "wx/panel.h" +#include "wx/list.h" class WXDLLEXPORT wxTabView; @@ -28,40 +30,40 @@ class WXDLLEXPORT wxTabView; * A wxTabControl is the internal and visual representation * of the tab. */ - + class WXDLLEXPORT wxTabControl: public wxObject { DECLARE_DYNAMIC_CLASS(wxTabControl) public: wxTabControl(wxTabView *v = (wxTabView *) NULL); ~wxTabControl(void); - + virtual void OnDraw(wxDC& dc, bool lastInRow); - inline void SetLabel(const wxString& str) { m_controlLabel = str; } - inline wxString GetLabel(void) const { return m_controlLabel; } - - inline void SetFont(const wxFont& f) { m_labelFont = f; } - inline wxFont *GetFont(void) const { return (wxFont*) & m_labelFont; } - - inline void SetSelected(bool sel) { m_isSelected = sel; } - inline bool IsSelected(void) const { return m_isSelected; } - - inline void SetPosition(int x, int y) { m_offsetX = x; m_offsetY = y; } - inline void SetSize(int x, int y) { m_width = x; m_height = y; } - - inline void SetRowPosition(int r) { m_rowPosition = r; } - inline int GetRowPosition() const { return m_rowPosition; } - inline void SetColPosition(int c) { m_colPosition = c; } - inline int GetColPosition() const { return m_colPosition; } - - inline int GetX(void) const { return m_offsetX; } - inline int GetY(void) const { return m_offsetY; } - inline int GetWidth(void) const { return m_width; } - inline int GetHeight(void) const { return m_height; } - - inline int GetId(void) const { return m_id; } - inline void SetId(int i) { m_id = i; } - + void SetLabel(const wxString& str) { m_controlLabel = str; } + wxString GetLabel(void) const { return m_controlLabel; } + + void SetFont(const wxFont& f) { m_labelFont = f; } + wxFont *GetFont(void) const { return (wxFont*) & m_labelFont; } + + void SetSelected(bool sel) { m_isSelected = sel; } + bool IsSelected(void) const { return m_isSelected; } + + void SetPosition(int x, int y) { m_offsetX = x; m_offsetY = y; } + void SetSize(int x, int y) { m_width = x; m_height = y; } + + void SetRowPosition(int r) { m_rowPosition = r; } + int GetRowPosition() const { return m_rowPosition; } + void SetColPosition(int c) { m_colPosition = c; } + int GetColPosition() const { return m_colPosition; } + + int GetX(void) const { return m_offsetX; } + int GetY(void) const { return m_offsetY; } + int GetWidth(void) const { return m_width; } + int GetHeight(void) const { return m_height; } + + int GetId(void) const { return m_id; } + void SetId(int i) { m_id = i; } + virtual bool HitTest(int x, int y) const ; protected: @@ -77,25 +79,22 @@ protected: int m_rowPosition; // Position in row from 0 int m_colPosition; // Position in col from 0 }; - + /* * Each wxTabLayer is a list of tabs. E.g. there * are 3 layers in the MS Word Options dialog. */ - + class WXDLLEXPORT wxTabLayer: public wxList { - DECLARE_DYNAMIC_CLASS(wxTabLayer) - public: - wxTabLayer(void) - { - } }; /* * The wxTabView controls and draws the tabbed object */ +WX_DECLARE_LIST(wxTabLayer, wxTabLayerList); + #define wxTAB_STYLE_DRAW_BOX 1 // Draws 3D boxes round tab layers #define wxTAB_STYLE_COLOUR_INTERIOR 2 // Colours interior of tabs, otherwise draws outline @@ -106,19 +105,25 @@ public: wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); ~wxTabView(); - inline int GetNumberOfLayers() const { return m_layers.Number(); } - inline wxList& GetLayers() { return m_layers; } + inline int GetNumberOfLayers() const { return m_layers.GetCount(); } + inline wxList& GetLayers() { return (wxList&)m_layers; } inline void SetWindow(wxWindow* wnd) { m_window = wnd; } inline wxWindow* GetWindow(void) const { return m_window; } // Automatically positions tabs wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = (wxTabControl *) NULL); + + // Remove the tab without deleting the window + bool RemoveTab(int id); void ClearTabs(bool deleteTabs = TRUE); + bool SetTabText(int id, const wxString& label); + wxString GetTabText(int id) const; + // Layout tabs (optional, e.g. if resizing window) - void Layout(void); + void LayoutTabs(); // Draw all tabs virtual void Draw(wxDC& dc); @@ -148,7 +153,7 @@ public: inline wxPen *GetBackgroundPen(void) const { return m_backgroundPen; } inline wxBrush *GetBackgroundBrush(void) const { return m_backgroundBrush; } - inline void SetViewRect(const wxRectangle& rect) { m_tabViewRect = rect; } + inline void SetViewRect(const wxRect& rect) { m_tabViewRect = rect; } inline wxRect GetViewRect(void) const { return m_tabViewRect; } // Calculate tab width to fit to view, and optionally adjust the view @@ -194,7 +199,7 @@ public: inline wxFont *GetSelectedTabFont() const { return (wxFont*) & m_tabSelectedFont; } inline void SetSelectedTabFont(const wxFont& f) { m_tabSelectedFont = f; } // Find the node and the column at which this control is positioned. - wxNode *FindTabNodeAndColumn(wxTabControl *control, int *col) const ; + wxList::compatibility_iterator FindTabNodeAndColumn(wxTabControl *control, int *col) const ; // Do the necessary to change to this tab virtual bool ChangeTab(wxTabControl *control); @@ -207,7 +212,7 @@ public: protected: // List of layers, from front to back. - wxList m_layers; + wxTabLayerList m_layers; // Selected tab int m_tabSelection; @@ -318,6 +323,9 @@ protected: DECLARE_EVENT_TABLE() }; +WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual, + wxIntToWindowHashMap); + class WXDLLEXPORT wxPanelTabView: public wxTabView { DECLARE_DYNAMIC_CLASS(wxPanelTabView) @@ -335,14 +343,14 @@ public: inline wxWindow *GetCurrentWindow() const { return m_currentWindow; } void ShowWindowForTab(int id); - inline wxList& GetWindows() const { return (wxList&) m_tabWindows; } + // inline wxList& GetWindows() const { return (wxList&) m_tabWindows; } protected: // List of panels, one for each tab. Indexed // by tab ID. - wxList m_tabWindows; - wxWindow* m_currentWindow; - wxPanel* m_panel; + wxIntToWindowHashMap m_tabWindows; + wxWindow* m_currentWindow; + wxPanel* m_panel; }; #endif