X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..8fde39dfea217d340c9151ae70b4d23d93e0eaf7:/include/wx/generic/tabg.h?ds=inline diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index 30cfeaf587..4ab53af0e7 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -20,7 +20,7 @@ #include "wx/panel.h" #include "wx/list.h" -class WXDLLEXPORT wxTabView; +class WXDLLIMPEXP_FWD_CORE wxTabView; /* * A wxTabControl is the internal and visual representation @@ -32,7 +32,7 @@ class WXDLLEXPORT wxTabControl: public wxObject DECLARE_DYNAMIC_CLASS(wxTabControl) public: wxTabControl(wxTabView *v = (wxTabView *) NULL); - ~wxTabControl(void); + virtual ~wxTabControl(void); virtual void OnDraw(wxDC& dc, bool lastInRow); void SetLabel(const wxString& str) { m_controlLabel = str; } @@ -99,14 +99,10 @@ class WXDLLEXPORT wxTabView: public wxObject DECLARE_DYNAMIC_CLASS(wxTabView) public: wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - ~wxTabView(); + virtual ~wxTabView(); inline int GetNumberOfLayers() const { return m_layers.GetCount(); } -#if WXWIN_COMPATIBILITY_2_4 - inline wxList& GetLayers() { return *(wxList *)&m_layers; } -#else inline wxTabLayerList& GetLayers() { return m_layers; } -#endif inline void SetWindow(wxWindow* wnd) { m_window = wnd; } inline wxWindow* GetWindow(void) const { return m_window; } @@ -270,87 +266,93 @@ protected: * A dialog box class that is tab-friendly */ -class WXDLLEXPORT wxTabbedDialog: public wxDialog +class WXDLLEXPORT wxTabbedDialog : public wxDialog { -DECLARE_DYNAMIC_CLASS(wxTabbedDialog) + DECLARE_DYNAMIC_CLASS(wxTabbedDialog) public: - - wxTabbedDialog(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxTabbedDialog(void); - - inline wxTabView *GetTabView() const { return m_tabView; } - inline void SetTabView(wxTabView *v) { m_tabView = v; } - - void OnCloseWindow(wxCloseEvent& event); - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); + wxTabbedDialog(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long windowStyle = wxDEFAULT_DIALOG_STYLE, + const wxString& name = wxDialogNameStr); + virtual ~wxTabbedDialog(); + + wxTabView *GetTabView() const { return m_tabView; } + void SetTabView(wxTabView *v) { m_tabView = v; } + + void OnCloseWindow(wxCloseEvent& event); + void OnMouseEvent(wxMouseEvent& event); + void OnPaint(wxPaintEvent& event); protected: - wxTabView* m_tabView; + wxTabView* m_tabView; -DECLARE_EVENT_TABLE() +private: + DECLARE_EVENT_TABLE() }; /* * A panel class that is tab-friendly */ -class WXDLLEXPORT wxTabbedPanel: public wxPanel +class WXDLLEXPORT wxTabbedPanel : public wxPanel { -DECLARE_DYNAMIC_CLASS(wxTabbedPanel) + DECLARE_DYNAMIC_CLASS(wxTabbedPanel) public: + wxTabbedPanel(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long windowStyle = 0, + const wxString& name = wxPanelNameStr); + virtual ~wxTabbedPanel(); - wxTabbedPanel(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long windowStyle = 0, const wxString& name = wxPanelNameStr); - ~wxTabbedPanel(void); + wxTabView *GetTabView() const { return m_tabView; } + void SetTabView(wxTabView *v) { m_tabView = v; } - inline wxTabView *GetTabView() const { return m_tabView; } - inline void SetTabView(wxTabView *v) { m_tabView = v; } - - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); + void OnMouseEvent(wxMouseEvent& event); + void OnPaint(wxPaintEvent& event); protected: - wxTabView* m_tabView; + wxTabView* m_tabView; -DECLARE_EVENT_TABLE() +private: + DECLARE_EVENT_TABLE() }; WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual, wxIntToWindowHashMap); -class WXDLLEXPORT wxPanelTabView: public wxTabView +class WXDLLEXPORT wxPanelTabView : public wxTabView { -DECLARE_DYNAMIC_CLASS(wxPanelTabView) + DECLARE_DYNAMIC_CLASS(wxPanelTabView) + public: - wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - ~wxPanelTabView(void); + wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); + virtual ~wxPanelTabView(void); - // Called when a tab is activated - virtual void OnTabActivate(int activateId, int deactivateId); + // Called when a tab is activated + virtual void OnTabActivate(int activateId, int deactivateId); - // Specific to this class - void AddTabWindow(int id, wxWindow *window); - wxWindow *GetTabWindow(int id) const ; - void ClearWindows(bool deleteWindows = true); - inline wxWindow *GetCurrentWindow() const { return m_currentWindow; } + // Specific to this class + void AddTabWindow(int id, wxWindow *window); + wxWindow *GetTabWindow(int id) const ; + void ClearWindows(bool deleteWindows = true); + wxWindow *GetCurrentWindow() const { return m_currentWindow; } - void ShowWindowForTab(int id); - // inline wxList& GetWindows() const { return (wxList&) m_tabWindows; } + void ShowWindowForTab(int id); + // wxList& GetWindows() const { return (wxList&) m_tabWindows; } protected: - // List of panels, one for each tab. Indexed - // by tab ID. - wxIntToWindowHashMap m_tabWindows; - wxWindow* m_currentWindow; - wxPanel* m_panel; + // List of panels, one for each tab. Indexed + // by tab ID. + wxIntToWindowHashMap m_tabWindows; + wxWindow* m_currentWindow; + wxPanel* m_panel; }; #endif