wxMemoryDC constructor now optionally accepts a wxBitmap parameter,

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

diff --git a/include/wx/mac/classic/slider.h b/include/wx/mac/classic/slider.h
index 13725cbd5ee164d515b20d85730efbb07dc8153a..c27075897307167f9764e5a8cc21cc974a03f690 100644 (file)
--- a/include/wx/mac/classic/slider.h
+++ b/include/wx/mac/classic/slider.h
@@ -6,21 +6,17 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxControl
@@ -41,7 +37,7 @@ public:
       Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
   }
 
-  ~wxSlider();
+  virtual ~wxSlider();
 
   bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
@@ -80,7 +76,7 @@ public:
 
  
      // set min/max size of the slider
-     virtual void SetSizeHints( int minW, int minH,
+     virtual void DoSetSizeHints( int minW, int minH,
                                 int maxW = -1, int maxH = -1,
                                 int incW = -1, int incH = -1 );