Finalize wxJoystick on mac. Note change. Pretty up joystick sample a bit. Don...

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

diff --git a/include/wx/mac/scrolbar.h b/include/wx/mac/scrolbar.h
index 9efad2dfd0ec0b649afb04e3dc720eb43c0238fd..90bf27701e459507a6be4ef77b77190f8825e3dc 100644 (file)
--- a/include/wx/mac/scrolbar.h
+++ b/include/wx/mac/scrolbar.h
@@ -1,71 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        scrollbar.h
-// Purpose:     wxScrollBar class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SCROLBAR_H_
-#define _WX_SCROLBAR_H_
-
-#ifdef __GNUG__
-#pragma interface "scrolbar.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/scrolbar.h"
+#else
+#include "wx/mac/carbon/scrolbar.h"
 #endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
-
-// Scrollbar item
-class WXDLLEXPORT wxScrollBar: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-public:
-  inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
-  ~wxScrollBar();
-
-  inline wxScrollBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSB_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr)
-  {
-      Create(parent, id, pos, size, style, validator, name);
-  }
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSB_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr);
-
-  int GetThumbPosition() const ;
-  inline int GetThumbSize() const { return m_pageSize; }
-  inline int GetPageSize() const { return m_viewSize; }
-  inline int GetRange() const { return m_objectSize; }
-
-  bool IsVertical() const { return (m_windowStyle & wxVERTICAL) != 0; }
-
-  virtual void SetThumbPosition(int viewStart);
-  virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
-    bool refresh = TRUE);
-
-  void Command(wxCommandEvent& event);
-               virtual void                                            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-protected:
-    int m_pageSize;
-    int m_viewSize;
-    int m_objectSize;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_SCROLBAR_H_