bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/wxPython/src/_slider.i b/wxPython/src/_slider.i
index f1eb5a9d4c037fddabb13d8a2e5e1c764c1ec64f..1698e2a374c619b29c1c8c91707687062e5edd4b 100644 (file)
--- a/wxPython/src/_slider.i
+++ b/wxPython/src/_slider.i
@@ -18,29 +18,49 @@
 %{
 #include <wx/slider.h>
 
-    DECLARE_DEF_STRING(SliderNameStr);
 %}
 
+MAKE_CONST_WXSTRING(SliderNameStr);
+
 //---------------------------------------------------------------------------
 %newgroup
 
+enum {
+    wxSL_HORIZONTAL,
+    wxSL_VERTICAL,
+    wxSL_AUTOTICKS,
+    wxSL_LABELS,
+    wxSL_LEFT,
+    wxSL_TOP,
+    wxSL_RIGHT,
+    wxSL_BOTTOM,
+    wxSL_BOTH,
+    wxSL_SELRANGE,
+    wxSL_INVERSE
+};
+
+
+MustHaveApp(wxSlider);
+
 class wxSlider : public wxControl {
 public:
-    %addtofunc wxSlider         "self._setOORInfo(self)"
-    %addtofunc wxSlider()       ""
-
-    wxSlider(wxWindow* parent, wxWindowID id,
-             int value, int minValue, int maxValue,
-             const wxPoint& point = wxDefaultPosition,
+    %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=-1,
+             int value=0, int minValue=0, int maxValue=100,
+             const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxPySliderNameStr);
-    %name(PreSlider)wxSlider();
+    %RenameCtor(PreSlider, wxSlider());
 
-    bool Create(wxWindow* parent, wxWindowID id,
-             int value, int minValue, int maxValue,
-             const wxPoint& point = wxDefaultPosition,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+             int value=0, int minValue=0, int maxValue=100,
+             const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
@@ -70,7 +90,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);
@@ -80,6 +100,9 @@ public:
     virtual int GetSelStart() const;
     virtual void SetSelection(int min, int max);
 
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
 
 //---------------------------------------------------------------------------