X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/deb325e3b21d956705214520b172ae8bf898a1ae..63482fd5e8b546fef76694a4e642d7b219ac4d86:/include/wx/toolbook.h diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index f829b796b4..c6b60383d5 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -18,21 +18,29 @@ #include "wx/bookctrl.h" -class WXDLLEXPORT wxToolBarBase; -class WXDLLEXPORT wxCommandEvent; +class WXDLLIMPEXP_FWD_CORE wxToolBarBase; +class WXDLLIMPEXP_FWD_CORE wxCommandEvent; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING; // Use wxButtonToolBar -#define wxBK_BUTTONBAR 0x0100 +#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 wxBookCtrlBase { public: wxToolbook() @@ -127,7 +135,7 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolbookEvent : public wxBookCtrlBaseEvent +class WXDLLIMPEXP_CORE wxToolbookEvent : public wxBookCtrlBaseEvent { public: wxToolbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,