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

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index 5a3c76f86a1364eac5d9e8b2db6b5249d514f453..7c49d1ff0ce83c410ee189525317ffec13ba9084 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        slider.h
 // Purpose:     wxSlider class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        slider.h
 // Purpose:     wxSlider 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_SLIDER_H_
 #define _WX_SLIDER_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 

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

 #pragma interface "slider.h"
 #endif
 
 #pragma interface "slider.h"
 #endif
 


@@ -20,7 +20,7 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
 #include "wx/slider.h"
 #include "wx/stattext.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;

 
 // Slider
 class WXDLLEXPORT wxSlider: public wxControl
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxControl


@@ -87,12 +87,12 @@ public:
      virtual void   DoMoveWindow(int x, int y, int w, int h);
  
   void Command(wxCommandEvent& event);
      virtual void   DoMoveWindow(int x, int y, int w, int h);
  
   void Command(wxCommandEvent& event);

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

 
 

-       wxStaticText*   m_macMinimumStatic ;
-       wxStaticText*   m_macMaximumStatic ;
-       wxStaticText*   m_macValueStatic ;
+     wxStaticText*    m_macMinimumStatic ;
+     wxStaticText*    m_macMaximumStatic ;
+     wxStaticText*    m_macValueStatic ;

 
   int           m_rangeMin;
   int           m_rangeMax;
 
   int           m_rangeMin;
   int           m_rangeMax;