Corrected typo in wxStringHashTable::Delete

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

diff --git a/wxPython/src/sizers.i b/wxPython/src/sizers.i
index 0a6f3f15cce669629cda640e3df015ef6cfafbba..11b6ca412b211f434e69dda92d0f5ad28a1b2e72 100644 (file)
--- a/wxPython/src/sizers.i
+++ b/wxPython/src/sizers.i
@@ -43,6 +43,8 @@ public:
     //wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
     //wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
 
     //wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
     //wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
 

+    void DeleteWindows();
+

     wxPoint GetPosition();
     wxSize GetSize();
     wxSize CalcMin();
     wxPoint GetPosition();
     wxSize GetSize();
     wxSize CalcMin();


@@ -95,7 +97,7 @@ public:
 
     %addmethods {
         void _setOORInfo(PyObject* _self) {
 
     %addmethods {
         void _setOORInfo(PyObject* _self) {

-            self->SetClientObject(new wxPyClientData(_self));
+            self->SetClientObject(new wxPyOORClientData(_self));

         }
     }
 
         }
     }
 


@@ -229,13 +231,29 @@ public:
     wxPoint GetPosition();
     wxSize GetMinSize();
 
     wxPoint GetPosition();
     wxSize GetMinSize();
 

+    %pragma(python) addtoclass = "
+    def GetSizeTuple(self):
+        return self.GetSize().asTuple()
+    def GetPositionTuple(self):
+        return self.GetPosition().asTuple()
+    def GetMinSizeTuple(self):
+        return self.GetMinSize().asTuple()
+    "
+

     // void RecalcSizes() = 0;
     // wxSize CalcMin() = 0;
 
     void Layout();
 
     void Fit( wxWindow *window );
     // void RecalcSizes() = 0;
     // wxSize CalcMin() = 0;
 
     void Layout();
 
     void Fit( wxWindow *window );

+    void FitInside( wxWindow *window );
+

     void SetSizeHints( wxWindow *window );
     void SetSizeHints( wxWindow *window );

+    void SetVirtualSizeHints( wxWindow *window );
+
+    void Clear( bool delete_windows=FALSE );
+    void DeleteWindows();
+

 
     // wxList& GetChildren();
     %addmethods {
 
     // wxList& GetChildren();
     %addmethods {