Add possibility to hide and show again wxRibbonBar pages.

[wxWidgets.git] / include / wx / univ / scrolbar.h

diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index a11cef70fee34b0de7a617edd495d228bf703cea..5963989dcff21a6601e14eb17b29f436f6e75225 100644 (file)
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -22,23 +22,23 @@ class WXDLLIMPEXP_FWD_CORE wxScrollTimer;
 // ----------------------------------------------------------------------------
 
 // scroll the bar
 // ----------------------------------------------------------------------------
 
 // scroll the bar

-#define wxACTION_SCROLL_START       _T("start")     // to the beginning
-#define wxACTION_SCROLL_END         _T("end")       // to the end
-#define wxACTION_SCROLL_LINE_UP     _T("lineup")    // one line up/left
-#define wxACTION_SCROLL_PAGE_UP     _T("pageup")    // one page up/left
-#define wxACTION_SCROLL_LINE_DOWN   _T("linedown")  // one line down/right
-#define wxACTION_SCROLL_PAGE_DOWN   _T("pagedown")  // one page down/right
+#define wxACTION_SCROLL_START       wxT("start")     // to the beginning
+#define wxACTION_SCROLL_END         wxT("end")       // to the end
+#define wxACTION_SCROLL_LINE_UP     wxT("lineup")    // one line up/left
+#define wxACTION_SCROLL_PAGE_UP     wxT("pageup")    // one page up/left
+#define wxACTION_SCROLL_LINE_DOWN   wxT("linedown")  // one line down/right
+#define wxACTION_SCROLL_PAGE_DOWN   wxT("pagedown")  // one page down/right

 
 // the scrollbar thumb may be dragged
 
 // the scrollbar thumb may be dragged

-#define wxACTION_SCROLL_THUMB_DRAG      _T("thumbdrag")
-#define wxACTION_SCROLL_THUMB_MOVE      _T("thumbmove")
-#define wxACTION_SCROLL_THUMB_RELEASE   _T("thumbrelease")
+#define wxACTION_SCROLL_THUMB_DRAG      wxT("thumbdrag")
+#define wxACTION_SCROLL_THUMB_MOVE      wxT("thumbmove")
+#define wxACTION_SCROLL_THUMB_RELEASE   wxT("thumbrelease")

 
 // ----------------------------------------------------------------------------
 // wxScrollBar
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxScrollBar
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxScrollBar : public wxScrollBarBase,
+class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase,

                                 public wxControlWithArrows
 {
 public:
                                 public wxControlWithArrows
 {
 public:


@@ -192,7 +192,7 @@ private:
     // the object handling the arrows
     wxScrollArrows m_arrows;
 
     // the object handling the arrows
     wxScrollArrows m_arrows;
 

-    friend WXDLLEXPORT class wxControlRenderer; // for geometry methods
+    friend WXDLLIMPEXP_CORE class wxControlRenderer; // for geometry methods

     friend class wxStdScrollBarInputHandler; // for geometry methods
 
     DECLARE_EVENT_TABLE()
     friend class wxStdScrollBarInputHandler; // for geometry methods
 
     DECLARE_EVENT_TABLE()


@@ -203,7 +203,7 @@ private:
 // Standard scrollbar input handler which can be used as a base class
 // ----------------------------------------------------------------------------
 
 // Standard scrollbar input handler which can be used as a base class
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStdScrollBarInputHandler : public wxStdInputHandler
+class WXDLLIMPEXP_CORE wxStdScrollBarInputHandler : public wxStdInputHandler

 {
 public:
     // constructor takes a renderer (used for scrollbar hit testing) and the
 {
 public:
     // constructor takes a renderer (used for scrollbar hit testing) and the