Compilation fix (CreateTimerImpl is taken from timerunx.cpp, so not inline).

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

diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index 226f27a50fbe6ecd78f151a1bd6d00e3ef000d33..263b8ecf2ea98984305c7fd3de146d272da953a4 100644 (file)
--- a/include/wx/univ/scrarrow.h
+++ b/include/wx/univ/scrarrow.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 

-#ifdef __GNUG__
-    #pragma interface "univscrarrow.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxScrollArrows is not a control but just a class containing the common
 // functionality of scroll arrows, whether part of scrollbars, spin ctrls or
 // ----------------------------------------------------------------------------
 // wxScrollArrows is not a control but just a class containing the common
 // functionality of scroll arrows, whether part of scrollbars, spin ctrls or


@@ -27,11 +23,11 @@
 // to derive from the wxControlWithArrows interface and implement its methods.
 // ----------------------------------------------------------------------------
 
 // to derive from the wxControlWithArrows interface and implement its methods.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxControlWithArrows;
-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxMouseEvent;
-class WXDLLEXPORT wxRect;
-class WXDLLEXPORT wxRenderer;
+class WXDLLIMPEXP_FWD_CORE wxControlWithArrows;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
+class WXDLLIMPEXP_FWD_CORE wxRect;
+class WXDLLIMPEXP_FWD_CORE wxRenderer;

 
 // ----------------------------------------------------------------------------
 // wxScrollArrows: an abstraction of scrollbar arrow
 
 // ----------------------------------------------------------------------------
 // wxScrollArrows: an abstraction of scrollbar arrow


@@ -54,11 +50,12 @@ public:
     // draws the arrow on the given DC in the given rectangle, uses
     // wxControlWithArrows::GetArrowState() to get its current state
     void DrawArrow(Arrow arrow, wxDC& dc, const wxRect& rect,
     // draws the arrow on the given DC in the given rectangle, uses
     // wxControlWithArrows::GetArrowState() to get its current state
     void DrawArrow(Arrow arrow, wxDC& dc, const wxRect& rect,

-                   bool scrollbarLike = FALSE) const;
+                   bool scrollbarLike = false) const;

 
     // process a mouse move, enter or leave event, possibly calling
 
     // process a mouse move, enter or leave event, possibly calling

-    // wxControlWithArrows::SetArrowState() if wxControlWithArrows::HitTest()
-    // says that the mosue has left/entered an arrow
+    // wxControlWithArrows::SetArrowState() if
+    // wxControlWithArrows::HitTestArrow() says that the mouse has left/entered
+    // an arrow

     bool HandleMouseMove(const wxMouseEvent& event) const;
 
     // process a mouse click event
     bool HandleMouseMove(const wxMouseEvent& event) const;
 
     // process a mouse click event


@@ -85,6 +82,8 @@ private:
 class WXDLLEXPORT wxControlWithArrows
 {
 public:
 class WXDLLEXPORT wxControlWithArrows
 {
 public:

+    virtual ~wxControlWithArrows() {}
+

     // get the renderer to use for drawing the arrows
     virtual wxRenderer *GetRenderer() const = 0;
 
     // get the renderer to use for drawing the arrows
     virtual wxRenderer *GetRenderer() const = 0;
 


@@ -100,13 +99,13 @@ public:
     // set or clear the specified flag in the arrow state: this function is
     // responsible for refreshing the control
     virtual void SetArrowFlag(wxScrollArrows::Arrow arrow,
     // set or clear the specified flag in the arrow state: this function is
     // responsible for refreshing the control
     virtual void SetArrowFlag(wxScrollArrows::Arrow arrow,

-                              int flag, bool set = TRUE) = 0;
+                              int flag, bool set = true) = 0;

 
     // hit testing: return on which arrow the point is (or Arrow_None)
 
     // hit testing: return on which arrow the point is (or Arrow_None)

-    virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const = 0;
+    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const = 0;

 
 

-    // called when the arrow is pressed, return TRUE to continue scrolling and
-    // FALSE to stop it
+    // called when the arrow is pressed, return true to continue scrolling and
+    // false to stop it

     virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
 };
 
     virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
 };