X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c55b3652b16f892e9064460bbeea94769f3d27c..e10972f6c1436a6dcd5427b4e3913bb0f398e045:/include/wx/toolbook.h diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index f5b6fc8f1e..86d50d57b6 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -17,15 +17,31 @@ #if wxUSE_TOOLBOOK #include "wx/bookctrl.h" +#include "wx/containr.h" -class WXDLLEXPORT wxToolBarBase; -class WXDLLEXPORT wxCommandEvent; +class WXDLLIMPEXP_FWD_CORE wxToolBarBase; +class WXDLLIMPEXP_FWD_CORE wxCommandEvent; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, wxBookCtrlEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent ); + + +// Use wxButtonToolBar +#define wxTBK_BUTTONBAR 0x0100 + +// Use wxTB_HORZ_LAYOUT style for the controlling toolbar +#define wxTBK_HORZ_LAYOUT 0x8000 + +// deprecated synonym, don't use +#if WXWIN_COMPATIBILITY_2_8 + #define wxBK_BUTTONBAR wxTBK_BUTTONBAR +#endif // ---------------------------------------------------------------------------- // wxToolbook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolbook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxToolbook : public wxNavigationEnabled { public: wxToolbook() @@ -54,47 +70,51 @@ public: const wxString& name = wxEmptyString); - virtual int GetSelection() const; + // implement base class virtuals virtual bool SetPageText(size_t n, const wxString& strText); virtual wxString GetPageText(size_t n) const; virtual int GetPageImage(size_t n) const; virtual bool SetPageImage(size_t n, int imageId); - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1); - virtual int SetSelection(size_t n); + int imageId = NO_IMAGE); + virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } virtual void SetImageList(wxImageList *imageList); virtual bool DeleteAllPages(); + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + + // methods which are not part of base wxBookctrl API + + // get the underlying toolbar wxToolBarBase* GetToolBar() const { return (wxToolBarBase*)m_bookctrl; } - // Not part of the wxBookctrl API, but must be called in OnIdle or - // by application to realize the toolbar and select the initial page. + // must be called in OnIdle or by application to realize the toolbar and + // select the initial page. void Realize(); protected: virtual wxWindow *DoRemovePage(size_t page); - // get the size which the list control should have - virtual wxSize GetControllerSize() const; - // event handlers void OnToolSelected(wxCommandEvent& event); void OnSize(wxSizeEvent& event); void OnIdle(wxIdleEvent& event); - // the currently selected page or wxNOT_FOUND if none - int m_selection; + void UpdateSelectedPage(size_t newsel); + + wxBookCtrlEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlEvent &event); // whether the toolbar needs to be realized bool m_needsRealizing; // maximum bitmap size - wxSize m_maxBitmapSize; + wxSize m_maxBitmapSize; private: // common part of all constructors @@ -108,39 +128,17 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolbookEvent : public wxBookCtrlBaseEvent -{ -public: - wxToolbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) - : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel) - { - } - - wxToolbookEvent(const wxToolbookEvent& event) - : wxBookCtrlBaseEvent(event) - { - } - - virtual wxEvent *Clone() const { return new wxToolbookEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxToolbookEvent) -}; - -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING; - -typedef void (wxEvtHandler::*wxToolbookEventFunction)(wxToolbookEvent&); +// wxToolbookEvent is obsolete and defined for compatibility only +#define wxToolbookEvent wxBookCtrlEvent +typedef wxBookCtrlEventFunction wxToolbookEventFunction; +#define wxToolbookEventHandler(func) wxBookCtrlEventHandler(func) -#define wxToolbookEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxToolbookEventFunction, &func) #define EVT_TOOLBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, winid, wxToolbookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) #define EVT_TOOLBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, winid, wxToolbookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) #endif // wxUSE_TOOLBOOK