match CFTypeRef declaration to the one in defs.h

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index caf89d18426f247c5d6605ef41e9d23c48c709ee..679c7db5de0a79b710606b879da91179674eb52a 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -1,107 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        slider.h
-// Purpose:     wxSlider class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SLIDER_H_
-#define _WX_SLIDER_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "slider.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/slider.h"
+#else
+#include "wx/mac/carbon/slider.h"
 #endif
-
-#include "wx/control.h"
-#include "wx/slider.h"
-#include "wx/stattext.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-
-// Slider
-class WXDLLEXPORT wxSlider: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxSlider)
-
-public:
-  wxSlider();
-
-  inline wxSlider(wxWindow *parent, wxWindowID id,
-           int value, int minValue, int maxValue,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSL_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxSliderNameStr)
-  {
-      Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
-  }
-
-  ~wxSlider();
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           int value, int minValue, int maxValue,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSL_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxSliderNameStr);
-
-  virtual int GetValue() const ;
-  virtual void SetValue(int);
-
-  void SetRange(int minValue, int maxValue);
-
-  inline int GetMin() const { return m_rangeMin; }
-  inline int GetMax() const { return m_rangeMax; }
-
-  // For trackbars only
-  void SetTickFreq(int n, int pos);
-  inline int GetTickFreq() const { return m_tickFreq; }
-  void SetPageSize(int pageSize);
-  int GetPageSize() const ;
-  void ClearSel() ;
-  void ClearTicks() ;
-  void SetLineSize(int lineSize);
-  int GetLineSize() const ;
-  int GetSelEnd() const ;
-  int GetSelStart() const ;
-  void SetSelection(int minPos, int maxPos);
-  void SetThumbLength(int len) ;
-  int GetThumbLength() const ;
-  void SetTick(int tickPos) ;
-
- 
-     // set min/max size of the slider
-     virtual void SetSizeHints( int minW, int minH,
-                                int maxW = -1, int maxH = -1,
-                                int incW = -1, int incH = -1 );
- 
-   protected:
-     virtual wxSize DoGetBestSize() const;
-     virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags);
-     virtual void   DoMoveWindow(int x, int y, int w, int h);
- 
-  void Command(wxCommandEvent& event);
-    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-    virtual void            MacUpdateDimensions() ;
-
-     wxStaticText*    m_macMinimumStatic ;
-     wxStaticText*    m_macMaximumStatic ;
-     wxStaticText*    m_macValueStatic ;
-
-  int           m_rangeMin;
-  int           m_rangeMax;
-  int           m_pageSize;
-  int           m_lineSize;
-  int           m_tickFreq;
-private :
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_SLIDER_H_