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 1ae57c18d1b8a3bd86c4fa4a00faefdb3e334627..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
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrollbar.h
 // Purpose:     wxScrollBar class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 #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;