Works a little better when you remember to say "virtual"

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

diff --git a/include/wx/mac/scrolbar.h b/include/wx/mac/scrolbar.h
index 10e80637dbff11d2ae4332310bef2eda8c36ad42..633b615cedf9cd55268a53d1c1cfd376aa2f1116 100644 (file)
--- a/include/wx/mac/scrolbar.h
+++ b/include/wx/mac/scrolbar.h
@@ -1,24 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrollbar.h
 // Purpose:     wxScrollBar class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "scrolbar.h"
 #endif
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
@@ -46,16 +46,18 @@ public:
            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;
-  inline int GetThumbSize() const { return m_pageSize; }
-  inline int GetPageSize() const { return m_viewSize; }
+  inline int GetThumbSize() const { return m_viewSize; }
+  inline int GetPageSize() const { return m_pageSize; }
   inline int GetRange() const { return m_objectSize; }
 
+  bool IsVertical() const { return (m_windowStyle & wxVERTICAL) != 0; }
+
   virtual void SetThumbPosition(int viewStart);
   virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
-               virtual void                                            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
 protected:
     int m_pageSize;