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 90e46d698c2daee24ef971c8d9dc39aac6521369..633b615cedf9cd55268a53d1c1cfd376aa2f1116 100644 (file)
--- a/include/wx/mac/scrolbar.h
+++ b/include/wx/mac/scrolbar.h
@@ -6,19 +6,19 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

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

 #pragma interface "scrolbar.h"
 #endif
 
 #include "wx/control.h"
 
 #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
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl


@@ -57,7 +57,7 @@ public:
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);

-               virtual void                                            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;

 
 protected:
     int m_pageSize;
 
 protected:
     int m_pageSize;