Patches from KevinO that work around issues where the widget isn't

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

diff --git a/wxPython/src/_slider.i b/wxPython/src/_slider.i
index f1eb5a9d4c037fddabb13d8a2e5e1c764c1ec64f..5d4e64329c933e96f6dd09335dcfeac2971a6606 100644 (file)
--- a/wxPython/src/_slider.i
+++ b/wxPython/src/_slider.i
@@ -18,20 +18,23 @@
 %{
 #include <wx/slider.h>
 
-    DECLARE_DEF_STRING(SliderNameStr);
 %}
 
+MAKE_CONST_WXSTRING(SliderNameStr);
+
 //---------------------------------------------------------------------------
 %newgroup
 
 class wxSlider : public wxControl {
 public:
-    %addtofunc wxSlider         "self._setOORInfo(self)"
-    %addtofunc wxSlider()       ""
+    %pythonPrepend wxSlider         "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'];del kwargs['point']"
+    %pythonPrepend wxSlider()       ""
+    %pythonAppend  wxSlider         "self._setOORInfo(self)"
+    %pythonAppend  wxSlider()       ""
 
     wxSlider(wxWindow* parent, wxWindowID id,
              int value, int minValue, int maxValue,
-             const wxPoint& point = wxDefaultPosition,
+             const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
@@ -40,7 +43,7 @@ public:
 
     bool Create(wxWindow* parent, wxWindowID id,
              int value, int minValue, int maxValue,
-             const wxPoint& point = wxDefaultPosition,
+             const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
@@ -70,7 +73,7 @@ public:
     virtual void SetThumbLength(int lenPixels);
     virtual int GetThumbLength() const;
 
-    virtual void SetTickFreq(int n, int pos);
+    virtual void SetTickFreq(int n, int pos=1);
     virtual int GetTickFreq() const;
     virtual void ClearTicks();
     virtual void SetTick(int tickPos);