install activex too

[wxWidgets.git] / wxPython / src / _spin.i

diff --git a/wxPython/src/_spin.i b/wxPython/src/_spin.i
index 8802d40d7d4f2aea44fbb5203ad69c59e9bfb6ba..1b100a21e5b521844d4380c66cc5b750b6346ece 100644 (file)
--- a/wxPython/src/_spin.i
+++ b/wxPython/src/_spin.i
@@ -15,11 +15,8 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(SPIN_BUTTON_NAME);
-    wxChar* wxSpinCtrlNameStr = _T("wxSpinCtrl");
-    DECLARE_DEF_STRING(SpinCtrlNameStr);
-%}
+MAKE_CONST_WXSTRING(SPIN_BUTTON_NAME);
+MAKE_CONST_WXSTRING2(SpinCtrlNameStr, _T("wxSpinCtrl"));

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -44,8 +41,8 @@ enum {
 class wxSpinButton : public wxControl
 {
 public:
 class wxSpinButton : public wxControl
 {
 public:

-    %addtofunc wxSpinButton         "self._setOORInfo(self)"
-    %addtofunc wxSpinButton()       ""
+    %pythonAppend wxSpinButton         "self._setOORInfo(self)"
+    %pythonAppend wxSpinButton()       ""

 
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
 
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,


@@ -83,8 +80,8 @@ public:
 class wxSpinCtrl : public wxControl
 {
 public:
 class wxSpinCtrl : public wxControl
 {
 public:

-    %addtofunc wxSpinCtrl         "self._setOORInfo(self)"
-    %addtofunc wxSpinCtrl()       ""
+    %pythonAppend wxSpinCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxSpinCtrl()       ""

 
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
 
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,


@@ -112,14 +109,20 @@ public:
     virtual void SetRange( int minVal, int maxVal );
     virtual int GetMin() const;
     virtual int GetMax() const;
     virtual void SetRange( int minVal, int maxVal );
     virtual int GetMin() const;
     virtual int GetMax() const;

-#ifdef __WXGTK__
-    %extend {
-        void SetSelection(long from, long to) {
-        }
-    }
-#else

     void SetSelection(long from, long to);
     void SetSelection(long from, long to);

-#endif
+};
+
+
+//---------------------------------------------------------------------------
+
+class wxSpinEvent : public wxNotifyEvent
+{
+public:
+    wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0);
+
+    // get the current value of the control
+    int GetPosition() const;
+    void SetPosition(int pos);

 };
 
 
 };
 
 


@@ -127,7 +130,10 @@ public:
 
 
 %pythoncode {
 
 
 %pythoncode {

-EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
+EVT_SPIN_UP   = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)
+EVT_SPIN_DOWN = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEDOWN, 1)
+EVT_SPIN      = wx.PyEventBinder( wx.wxEVT_SCROLL_THUMBTRACK, 1)
+EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)

 }
 
 
 }