added missing button state

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

diff --git a/wxPython/src/_gbsizer.i b/wxPython/src/_gbsizer.i
index 483c92f4412676111ec8102d7831f3d9f1d2c94a..19a31686ea851f30315fb851647e53dcde22e0ad 100644 (file)
--- a/wxPython/src/_gbsizer.i
+++ b/wxPython/src/_gbsizer.i
@@ -73,20 +73,42 @@ class wxGBPosition
 {
 public:
     wxGBPosition(int row=0, int col=0);
 {
 public:
     wxGBPosition(int row=0, int col=0);

-
+    ~wxGBPosition();
+    

     int GetRow() const;
     int GetCol() const;
     void SetRow(int row);
     void SetCol(int col);
 
     int GetRow() const;
     int GetCol() const;
     void SetRow(int row);
     void SetCol(int col);
 

-//     %extend {
-//         bool __eq__(const wxGBPosition* other) { return other ? (*self == *other) : false; }
-//         bool __ne__(const wxGBPosition* other) { return other ? (*self != *other) : true;  }
-//     }

 
 

-    bool operator==(const wxGBPosition& other);
-    bool operator!=(const wxGBPosition& other);
-    
+    %extend {
+        KeepGIL(__eq__);
+        DocStr(__eq__, "Compare GBPosition for equality.", "");
+        bool __eq__(PyObject* other) {
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBPosition_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+
+        
+        KeepGIL(__ne__);
+        DocStr(__ne__, "Compare GBPosition for inequality.", "");
+        bool __ne__(PyObject* other) {
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBPosition_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }
+    }
+
+   

     %extend {
         void Set(int row=0, int col=0) {
             self->SetRow(row);
     %extend {
         void Set(int row=0, int col=0) {
             self->SetRow(row);


@@ -94,7 +116,7 @@ public:
         }
         
         PyObject* Get() {
         }
         
         PyObject* Get() {

-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));


@@ -143,18 +165,41 @@ public:
 colspan. The default is (1,1). (Meaning that the item occupies one
 cell in each direction.", "");
 
 colspan. The default is (1,1). (Meaning that the item occupies one
 cell in each direction.", "");
 

+    ~wxGBSpan();
+

     int GetRowspan() const;
     int GetColspan() const;
     void SetRowspan(int rowspan);
     void SetColspan(int colspan);
     int GetRowspan() const;
     int GetColspan() const;
     void SetRowspan(int rowspan);
     void SetColspan(int colspan);

+

     
     

-//     %extend {
-//         bool __eq__(const wxGBSpan* other) { return other ? (*self == *other) : false; }
-//         bool __ne__(const wxGBSpan* other) { return other ? (*self != *other) : true;  }
-//     }
-    bool operator==(const wxGBSpan& other);
-    bool operator!=(const wxGBSpan& other);
-    
+    %extend {
+        KeepGIL(__eq__);
+        DocStr(__eq__, "Compare wxGBSpan for equality.", "");
+        bool __eq__(PyObject* other) {
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBSpan_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+
+        
+        KeepGIL(__ne__);
+        DocStr(__ne__, "Compare GBSpan for inequality.", "");
+        bool __ne__(PyObject* other) {
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBSpan_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }
+    }
+

 
     %extend {
         void Set(int rowspan=1, int colspan=1) {
 
     %extend {
         void Set(int rowspan=1, int colspan=1) {


@@ -163,7 +208,7 @@ cell in each direction.", "");
         }
         
         PyObject* Get() {
         }
         
         PyObject* Get() {

-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan()));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan()));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan()));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan()));


@@ -218,6 +263,9 @@ item can be used in a Sizer.
 You will probably never need to create a wx.GBSizerItem directly as they
 are created automatically when the sizer's Add method is called.", "");
 
 You will probably never need to create a wx.GBSizerItem directly as they
 are created automatically when the sizer's Add method is called.", "");
 

+    ~wxGBSizerItem();
+
+    

     %extend {
         DocStr(wxGBSizerItem( wxWindow *window, const wxGBPosition& pos,const wxGBSpan& span,int flag,int border,PyObject* userData=NULL ),
                "Construct a `wx.GBSizerItem` for a window.", "");
     %extend {
         DocStr(wxGBSizerItem( wxWindow *window, const wxGBPosition& pos,const wxGBSpan& span,int flag,int border,PyObject* userData=NULL ),
                "Construct a `wx.GBSizerItem` for a window.", "");


@@ -231,7 +279,7 @@ are created automatically when the sizer's Add method is called.", "");
             {
                 wxPyUserData* data = NULL;
                 if ( userData ) {
             {
                 wxPyUserData* data = NULL;
                 if ( userData ) {

-                    bool blocked = wxPyBeginBlockThreads();
+                    wxPyBlock_t blocked = wxPyBeginBlockThreads();

                     data = new wxPyUserData(userData);
                     wxPyEndBlockThreads(blocked);
                 }
                     data = new wxPyUserData(userData);
                     wxPyEndBlockThreads(blocked);
                 }


@@ -241,6 +289,7 @@ are created automatically when the sizer's Add method is called.", "");
 
         DocStr(wxGBSizerItem( wxSizer *sizer,const wxGBPosition& pos,const wxGBSpan& span,int flag,int border,PyObject* userData=NULL ),
                "Construct a `wx.GBSizerItem` for a sizer", "");
 
         DocStr(wxGBSizerItem( wxSizer *sizer,const wxGBPosition& pos,const wxGBSpan& span,int flag,int border,PyObject* userData=NULL ),
                "Construct a `wx.GBSizerItem` for a sizer", "");

+        %disownarg( wxSizer *sizer );

         %RenameCtor(GBSizerItemSizer, wxGBSizerItem( wxSizer *sizer,
                                                      const wxGBPosition& pos,
                                                      const wxGBSpan& span,
         %RenameCtor(GBSizerItemSizer, wxGBSizerItem( wxSizer *sizer,
                                                      const wxGBPosition& pos,
                                                      const wxGBSpan& span,


@@ -250,12 +299,13 @@ are created automatically when the sizer's Add method is called.", "");
             {
                 wxPyUserData* data = NULL;
                 if ( userData ) {
             {
                 wxPyUserData* data = NULL;
                 if ( userData ) {

-                    bool blocked = wxPyBeginBlockThreads();
+                    wxPyBlock_t blocked = wxPyBeginBlockThreads();

                     data = new wxPyUserData(userData);
                     wxPyEndBlockThreads(blocked);
                 }
                 return new wxGBSizerItem(sizer, pos, span, flag, border, data);
             }
                     data = new wxPyUserData(userData);
                     wxPyEndBlockThreads(blocked);
                 }
                 return new wxGBSizerItem(sizer, pos, span, flag, border, data);
             }

+        %cleardisown( wxSizer *sizer );

 
              
         DocStr(wxGBSizerItem( int width,int height,const wxGBPosition& pos,const wxGBSpan& span,int flag,int border,PyObject* userData=NULL),
 
              
         DocStr(wxGBSizerItem( int width,int height,const wxGBPosition& pos,const wxGBSpan& span,int flag,int border,PyObject* userData=NULL),


@@ -270,7 +320,7 @@ are created automatically when the sizer's Add method is called.", "");
             {
                 wxPyUserData* data = NULL;
                 if ( userData ) {
             {
                 wxPyUserData* data = NULL;
                 if ( userData ) {

-                    bool blocked = wxPyBeginBlockThreads();
+                    wxPyBlock_t blocked = wxPyBeginBlockThreads();

                     data = new wxPyUserData(userData);
                     wxPyEndBlockThreads(blocked);
                 }
                     data = new wxPyUserData(userData);
                     wxPyEndBlockThreads(blocked);
                 }


@@ -343,6 +393,10 @@ is successful and after the next Layout() the item will be resized.
         void , SetGBSizer(wxGridBagSizer* sizer),
         "Set the sizer this item is a member of.", "");   
     
         void , SetGBSizer(wxGridBagSizer* sizer),
         "Set the sizer this item is a member of.", "");   
     

+    %property(EndPos, GetEndPos, doc="See `GetEndPos`");
+    %property(GBSizer, GetGBSizer, SetGBSizer, doc="See `GetGBSizer` and `SetGBSizer`");
+    %property(Pos, GetPos, SetPos, doc="See `GetPos` and `SetPos`");
+    %property(Span, GetSpan, SetSpan, doc="See `GetSpan` and `SetSpan`");

 };
 
 
 };
 
 


@@ -388,10 +442,12 @@ position, False if something was already there.
                             PyObject* userData = NULL ) {
 
             wxPyUserData* data = NULL;
                             PyObject* userData = NULL ) {
 
             wxPyUserData* data = NULL;

-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);

+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);

             wxPyEndBlockThreads(blocked);
             
             // Now call the real Add method if a valid item type was found
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Add method if a valid item type was found


@@ -405,7 +461,8 @@ position, False if something was already there.
             return NULL;
         }
     }
             return NULL;
         }
     }

-    
+
+    %disownarg( wxGBSizerItem *item );

     DocDeclAStrName(
         wxGBSizerItem* , Add( wxGBSizerItem *item ),
         "Add(self, GBSizerItem item) -> wx.GBSizerItem",
     DocDeclAStrName(
         wxGBSizerItem* , Add( wxGBSizerItem *item ),
         "Add(self, GBSizerItem item) -> wx.GBSizerItem",


@@ -413,6 +470,7 @@ position, False if something was already there.
 the item was successfully placed at its given cell position, False if
 something was already there.", "",
         AddItem);
 the item was successfully placed at its given cell position, False if
 something was already there.", "",
         AddItem);

+    %cleardisown( wxGBSizerItem *item );

 
     DocDeclStr(
         wxSize , GetCellSize(int row, int col) const,
 
     DocDeclStr(
         wxSize , GetCellSize(int row, int col) const,


@@ -545,7 +603,6 @@ for intersection, for example it may be the item we are checking the
 position of.", "",
         CheckForIntersectionPos);
     
 position of.", "",
         CheckForIntersectionPos);
     

-

 };
 
 
 };