wxUniversal fixes:

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

diff --git a/wxPython/src/sizers.i b/wxPython/src/sizers.i
index 572136805152a0afe91fe36d03692be9a3dd777d..75c9b24d901dac984ff9b43ee2615e9bb3605e14 100644 (file)
--- a/wxPython/src/sizers.i
+++ b/wxPython/src/sizers.i
@@ -43,6 +43,9 @@ 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();
     void SetDimension( wxPoint pos, wxSize size );
     wxSize GetSize();
     wxSize CalcMin();
     void SetDimension( wxPoint pos, wxSize size );


@@ -92,6 +95,12 @@ public:
     // wxSizer();      ****  abstract, can't instantiate
     // ~wxSizer();
 
     // wxSizer();      ****  abstract, can't instantiate
     // ~wxSizer();
 

+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+

     %addmethods {
         void Destroy() { delete self; }
 
     %addmethods {
         void Destroy() { delete self; }
 


@@ -222,6 +231,15 @@ 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 RecalcSizes() = 0;
     // wxSize CalcMin() = 0;
 


@@ -230,6 +248,10 @@ public:
     void Fit( wxWindow *window );
     void SetSizeHints( wxWindow *window );
 
     void Fit( wxWindow *window );
     void SetSizeHints( wxWindow *window );
 

+    void Clear( bool delete_windows=FALSE );
+    void DeleteWindows();
+
+

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


@@ -265,8 +287,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer);
 class wxPySizer : public wxSizer {
 public:
     wxPySizer();
 class wxPySizer : public wxSizer {
 public:
     wxPySizer();

-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPySizer)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPySizer)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 };
 
 


@@ -275,6 +298,7 @@ public:
 class  wxBoxSizer : public wxSizer {
 public:
     wxBoxSizer(int orient = wxHORIZONTAL);
 class  wxBoxSizer : public wxSizer {
 public:
     wxBoxSizer(int orient = wxHORIZONTAL);

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

     int GetOrientation();
     void RecalcSizes();
     wxSize CalcMin();
     int GetOrientation();
     void RecalcSizes();
     wxSize CalcMin();


@@ -285,6 +309,7 @@ public:
 class  wxStaticBoxSizer : public wxBoxSizer {
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient = wxHORIZONTAL);
 class  wxStaticBoxSizer : public wxBoxSizer {
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient = wxHORIZONTAL);

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

     wxStaticBox *GetStaticBox();
     void RecalcSizes();
     wxSize CalcMin();
     wxStaticBox *GetStaticBox();
     void RecalcSizes();
     wxSize CalcMin();


@@ -295,10 +320,9 @@ public:
 class wxNotebookSizer: public wxSizer {
 public:
     wxNotebookSizer( wxNotebook *nb );
 class wxNotebookSizer: public wxSizer {
 public:
     wxNotebookSizer( wxNotebook *nb );

-
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

     void RecalcSizes();
     wxSize CalcMin();
     void RecalcSizes();
     wxSize CalcMin();

-

     wxNotebook *GetNotebook();
 };
 
     wxNotebook *GetNotebook();
 };
 


@@ -308,6 +332,7 @@ class wxGridSizer: public wxSizer
 {
 public:
     wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
 {
 public:
     wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     void RecalcSizes();
     wxSize CalcMin();
 
     void RecalcSizes();
     wxSize CalcMin();


@@ -328,6 +353,7 @@ class wxFlexGridSizer: public wxGridSizer
 {
 public:
     wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
 {
 public:
     wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     void RecalcSizes();
     wxSize CalcMin();
 
     void RecalcSizes();
     wxSize CalcMin();