there is no std::wostream under Palm (part of ticket 4700)

[wxWidgets.git] / include / wx / toolbook.h

diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h
index f829b796b4c579c8fa6ef8d418c9cc23d316c2c6..c6b60383d5a9df354f3af42f48db6567794420d3 100644 (file)
--- 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,