wxUSE_STL fixes.

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

diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index 5476b405c2dc596f766b75fbd11e1eb59e1253f9..f015df3233e733110575f021a1959ac50b9091b2 100644 (file)
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -127,6 +127,11 @@ account.", "");
         wxSize , GetMinSize(),
         "Get the minimum size needed for the item.", "");
     
+    DocDeclStr(
+        wxSize , GetMinSizeWithBorder() const,
+        "Get the minimum size needed for the item with space for the borders
+added, if needed.", "");
+
     DocDeclStr(
         void , SetInitSize( int x, int y ),
         "", "");
@@ -367,7 +372,8 @@ public:
 
     %extend {
         void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
         }
 
         DocAStr(Add,