no real change; just add the standard separator where it's missing

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

diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h
index 90bf27701e459507a6be4ef77b77190f8825e3dc..70850d166e3aad9f870cfc12118a066e04bb7e19 100644 (file)
--- a/include/wx/osx/scrolbar.h
+++ b/include/wx/osx/scrolbar.h
@@ -1,5 +1,64 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/scrolbar.h"
-#else
-#include "wx/mac/carbon/scrolbar.h"
-#endif
+/////////////////////////////////////////////////////////////////////////////
+// Name:        scrollbar.h
+// Purpose:     wxScrollBar class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SCROLBAR_H_
+#define _WX_SCROLBAR_H_
+
+// Scrollbar item
+class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase
+{
+public:
+    wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
+    virtual ~wxScrollBar();
+
+    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);
+
+    virtual int GetThumbPosition() const ;
+    virtual int GetThumbSize() const { return m_viewSize; }
+    virtual int GetPageSize() const { return m_pageSize; }
+    virtual int GetRange() const { return m_objectSize; }
+
+    virtual void SetThumbPosition(int viewStart);
+    virtual void SetScrollbar(int position, int thumbSize, int range,
+            int pageSize, bool refresh = true);
+
+    // implementation only from now on
+    void Command(wxCommandEvent& event);
+    virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
+    virtual bool OSXHandleClicked( double timestampsec );
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    int m_pageSize;
+    int m_viewSize;
+    int m_objectSize;
+
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // _WX_SCROLBAR_H_