Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 50f987813cad211cf3c0ed5dec98916fc5c430d1..30c0e798b9136dbfbb9b3fbb6678d36f82dec070 100644 (file)
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -12,13 +12,14 @@
 #ifndef _WX_UNIV_SCROLBAR_H_
 #define _WX_UNIV_SCROLBAR_H_
 
 #ifndef _WX_UNIV_SCROLBAR_H_
 #define _WX_UNIV_SCROLBAR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univscrolbar.h"
 #endif
 
 class WXDLLEXPORT wxScrollTimer;
 
 #include "wx/univ/scrarrow.h"
     #pragma interface "univscrolbar.h"
 #endif
 
 class WXDLLEXPORT wxScrollTimer;
 
 #include "wx/univ/scrarrow.h"

+#include "wx/renderer.h"

 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control


@@ -87,7 +88,7 @@ public:
     virtual void SetThumbPosition(int thumbPos);
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,
     virtual void SetThumbPosition(int thumbPos);
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,

-                              bool refresh = TRUE);
+                              bool refresh = true);

 
     // wxScrollBar actions
     void ScrollToStart();
 
     // wxScrollBar actions
     void ScrollToStart();


@@ -119,15 +120,15 @@ public:
     // for wxControlRenderer::DrawScrollbar() only
     const wxScrollArrows& GetArrows() const { return m_arrows; }
 
     // for wxControlRenderer::DrawScrollbar() only
     const wxScrollArrows& GetArrows() const { return m_arrows; }
 

+    // idle processing
+    virtual void OnInternalIdle();
+

 protected:
     virtual wxSize DoGetBestClientSize() const;
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
 protected:
     virtual wxSize DoGetBestClientSize() const;
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 

-    // event handlers
-    void OnIdle(wxIdleEvent& event);
-
-    // forces update of thumb's visual appearence (does nothing if m_dirty=FALSE)
+    // forces update of thumb's visual appearence (does nothing if m_dirty=false)

     void UpdateThumb();
 
     // SetThumbPosition() helper
     void UpdateThumb();
 
     // SetThumbPosition() helper


@@ -191,14 +192,14 @@ public:
 
     // this method is called by wxScrollBarTimer only and may be overridden
     //
 
     // this method is called by wxScrollBarTimer only and may be overridden
     //

-    // return TRUE to continue scrolling, FALSE to stop the timer
+    // return true to continue scrolling, false to stop the timer

     virtual bool OnScrollTimer(wxScrollBar *scrollbar,
                                const wxControlAction& action);
 
 protected:
     // the methods which must be overridden in the derived class
 
     virtual bool OnScrollTimer(wxScrollBar *scrollbar,
                                const wxControlAction& action);
 
 protected:
     // the methods which must be overridden in the derived class
 

-    // return TRUE if the mouse button can be used to activate scrollbar, FALSE
+    // return true if the mouse button can be used to activate scrollbar, false

     // if not (only left mouse button can do it under Windows, any button under
     // GTK+)
     virtual bool IsAllowedButton(int button) = 0;
     // if not (only left mouse button can do it under Windows, any button under
     // GTK+)
     virtual bool IsAllowedButton(int button) = 0;