Use wxAlphaPixelData if the source bitmap depth is 32 or if on wxGTK and there is...

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

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 24dbb5aebf002035250863508f8a8e4e7783dda2..05fc54887e8450019e2a2c4c36556bd8bf6e8fc6 100644 (file)
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider.h
+// Name:        wx/os2/slider.h

 // Purpose:     wxSlider class
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxSlider class
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_


@@ -15,7 +15,7 @@
 #include "wx/control.h"
 
 // Slider
 #include "wx/control.h"
 
 // Slider

-class WXDLLEXPORT wxSlider: public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase

 {
 public:
   wxSlider();
 {
 public:
   wxSlider();


@@ -43,7 +43,7 @@ public:
                ,rsName
               );
     }
                ,rsName
               );
     }

-    ~wxSlider();
+    virtual ~wxSlider();

 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId


@@ -94,9 +94,6 @@ public:
                                   );
                  void SetThumbLength(int nLen) ;
                  void SetTick(int ntickPos) ;
                                   );
                  void SetThumbLength(int nLen) ;
                  void SetTick(int ntickPos) ;

-                 void SetTickFreq( int n
-                                  ,int nPos
-                                 );

 
     //
     // IMPLEMENTATION
 
     //
     // IMPLEMENTATION


@@ -148,6 +145,10 @@ protected:
                            ,int  nHeight
                            ,int  nSizeFlags = wxSIZE_AUTO
                           );
                            ,int  nHeight
                            ,int  nSizeFlags = wxSIZE_AUTO
                           );

+
+    // Platform-specific implementation of SetTickFreq
+    virtual void DoSetTickFreq(int freq);
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 }; // end of CLASS wxSlider
 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 }; // end of CLASS wxSlider