Don't interpret '&' specially in wxTextWrapper.

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

diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index 395b540c4d1e91b6e45913235ffc8ef0e77bedfd..69dd3af37585c20227b0e8d9e997f81c54c20c69 100644 (file)
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -1,5 +1,77 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/spinbutt.h"
-#else
-#include "wx/osx/carbon/spinbutt.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/spinbutt.h
+// Purpose:     wxSpinButton class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SPINBUTT_H_
+#define _WX_SPINBUTT_H_
+
+#include "wx/control.h"
+#include "wx/event.h"
+
+/*
+    The wxSpinButton is like a small scrollbar than is often placed next
+    to a text control.
+
+    wxSP_HORIZONTAL:   horizontal spin button
+    wxSP_VERTICAL:     vertical spin button (the default)
+    wxSP_ARROW_KEYS:   arrow keys increment/decrement value
+    wxSP_WRAP:         value wraps at either end
+ */
+
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
+{
+public:
+    // construction
+    wxSpinButton();
+
+    wxSpinButton(wxWindow *parent,
+                 wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
+                 const wxString& name = wxT("wxSpinButton"))
+    {
+        Create(parent, id, pos, size, style, name);
+    }
+
+    virtual ~wxSpinButton();
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
+                const wxString& name = wxT("wxSpinButton"));
+
+
+    // accessors
+    virtual void SetRange(int minVal, int maxVal);
+    virtual int GetValue() const ;
+    virtual void SetValue(int val);
+
+    // implementation
+
+    virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
+
+    // osx specific event handling common for all osx-ports
+
+    virtual bool OSXHandleClicked( double timestampsec );
+
+protected:
+    void         SendThumbTrackEvent() ;
+
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+};
+
 #endif
+    // _WX_SPINBUTT_H_