added Rotate() test

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

diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index ef1ab445c2e6be1a207a0619f3c29884ae85fc09..24dab87eed82b4536c8779d797eafcc5a7579b90 100644 (file)
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -361,30 +361,54 @@ added, if needed.", "");
         wxWindow *, GetWindow(),
         "Get the window (if any) that is managed by this sizer item.", "");
 
         wxWindow *, GetWindow(),
         "Get the window (if any) that is managed by this sizer item.", "");
 

-    DocDeclStr(
-        void , SetWindow( wxWindow *window ),
-        "Set the window to be managed by this sizer item.", "");
-

 
     DocDeclStr(
         wxSizer *, GetSizer(),
         "Get the subsizer (if any) that is managed by this sizer item.", "");
 
 
     DocDeclStr(
         wxSizer *, GetSizer(),
         "Get the subsizer (if any) that is managed by this sizer item.", "");
 

+    DocDeclStr(
+        wxSize , GetSpacer(),
+        "Get the size of the spacer managed by this sizer item.", "");
+
+
+
+    
+    DocDeclStr(
+        void , SetWindow( wxWindow *window ),
+        "Set the window to be managed by this sizer item.", "");
+

     %disownarg( wxSizer *sizer );
     DocDeclStr(
         void , SetSizer( wxSizer *sizer ),
         "Set the subsizer to be managed by this sizer item.", "");
     %cleardisown( wxSizer *sizer );
 
     %disownarg( wxSizer *sizer );
     DocDeclStr(
         void , SetSizer( wxSizer *sizer ),
         "Set the subsizer to be managed by this sizer item.", "");
     %cleardisown( wxSizer *sizer );
 

-

     DocDeclStr(
     DocDeclStr(

-        wxSize , GetSpacer(),
-        "Get the size of the spacer managed by this sizer item.", "");
+        void , SetSpacer( const wxSize &size ),
+        "Set the size of the spacer to be managed by this sizer item.", "");
+
+    %pythoncode {
+        SetWindow = wx._deprecated(SetWindow, "Use `AssignWindow` instead.")
+        SetSizer = wx._deprecated(SetSizer,   "Use `AssignSizer` instead.")
+        SetSpacer = wx._deprecated(SetSpacer, "Use `AssignSpacer` instead.")
+    }

 
 

+
+    

     DocDeclStr(
     DocDeclStr(

-        void , SetSpacer( const wxSize &size ),
+        void , AssignWindow(wxWindow *window),
+        "Set the window to be managed by this sizer item.", "");
+    
+    DocDeclStr(
+        void , AssignSizer(wxSizer *sizer),
+        "Set the subsizer to be managed by this sizer item.", "");
+    
+    DocDeclStr(
+        void , AssignSpacer(const wxSize& size),

         "Set the size of the spacer to be managed by this sizer item.", "");
         "Set the size of the spacer to be managed by this sizer item.", "");

+    

 
 

+    

 
     DocDeclStr(
         void , Show( bool show ),
 
     DocDeclStr(
         void , Show( bool show ),


@@ -442,10 +466,10 @@ isn't any.", "");
     %property(Ratio, GetRatio, SetRatio, doc="See `GetRatio` and `SetRatio`");
     %property(Rect, GetRect, doc="See `GetRect`");
     %property(Size, GetSize, doc="See `GetSize`");
     %property(Ratio, GetRatio, SetRatio, doc="See `GetRatio` and `SetRatio`");
     %property(Rect, GetRect, doc="See `GetRect`");
     %property(Size, GetSize, doc="See `GetSize`");

-    %property(Sizer, GetSizer, SetSizer, doc="See `GetSizer` and `SetSizer`");
-    %property(Spacer, GetSpacer, SetSpacer, doc="See `GetSpacer` and `SetSpacer`");
+    %property(Sizer, GetSizer, AssignSizer, doc="See `GetSizer` and `AssignSizer`");
+    %property(Spacer, GetSpacer, AssignSpacer, doc="See `GetSpacer` and `AssignSpacer`");

     %property(UserData, GetUserData, SetUserData, doc="See `GetUserData` and `SetUserData`");
     %property(UserData, GetUserData, SetUserData, doc="See `GetUserData` and `SetUserData`");

-    %property(Window, GetWindow, SetWindow, doc="See `GetWindow` and `SetWindow`");
+    %property(Window, GetWindow, AssignWindow, doc="See `GetWindow` and `AssignWindow`");

 };
 
 
 };
 
 


@@ -1412,6 +1436,8 @@ sizer.", "");
         void , SetOrientation(int orient),
         "Resets the orientation of the sizer.", "");
 
         void , SetOrientation(int orient),
         "Resets the orientation of the sizer.", "");
 

+    bool IsVertical() const;
+    

     %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`");
 };
 
     %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`");
 };