ComputeScaleAndOrigin not protected anymore

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

diff --git a/wxPython/src/_scrolbar.i b/wxPython/src/_scrolbar.i
index 787eae1bc1fda213b07bc968a17efc85fd5b4487..2bcc4eddb53ea5286f68197f7758207660ef30f1 100644 (file)
--- a/wxPython/src/_scrolbar.i
+++ b/wxPython/src/_scrolbar.i
@@ -15,17 +15,17 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(ScrollBarNameStr);
-%}
+MAKE_CONST_WXSTRING(ScrollBarNameStr);

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

+MustHaveApp(wxScrollBar);
+

 class wxScrollBar : public wxControl {
 public:
 class wxScrollBar : public wxControl {
 public:

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

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


@@ -33,7 +33,7 @@ public:
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxPyScrollBarNameStr);
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxPyScrollBarNameStr);

-    %name(PreScrollBar)wxScrollBar();
+    %RenameCtor(PreScrollBar, wxScrollBar());

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


@@ -51,9 +51,16 @@ public:
     bool IsVertical() const { return (m_windowStyle & wxVERTICAL) != 0; }
 
     virtual void SetThumbPosition(int viewStart);
     bool IsVertical() const { return (m_windowStyle & wxVERTICAL) != 0; }
 
     virtual void SetThumbPosition(int viewStart);

-    virtual void SetScrollbar(int position, int thumbSize,
-                              int range, int pageSize,
-                              bool refresh = TRUE);
+    
+    DocDeclStr(
+        virtual void , SetScrollbar(int position, int thumbSize,
+                                    int range, int pageSize,
+                                    bool refresh = true),
+        "", "");
+    
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------