Add flags parameter to wx.Process.Kill and wx.Kill

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

diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index 6fe840b6ba096768be5f0274c3df8442d8b46dab..0a1f5101b9eb741e736af11070d3ab6aad5ccd51 100644 (file)
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -146,6 +146,10 @@ added, if needed.", "");
     DocDeclStr(
         float , GetRatio(),
         "Set the ratio item attribute.", "");
     DocDeclStr(
         float , GetRatio(),
         "Set the ratio item attribute.", "");

+
+    DocDeclStr(
+        wxRect , GetRect(),
+        "Returns the rectangle that the sizer item should occupy", "");

     
 
     DocDeclStr(
     
 
     DocDeclStr(


@@ -263,8 +267,8 @@ isn't any.", "");
 
 struct wxPySizerItemInfo {
     wxPySizerItemInfo()
 
 struct wxPySizerItemInfo {
     wxPySizerItemInfo()

-        : window(NULL), sizer(NULL), gotSize(False),
-          size(wxDefaultSize), gotPos(False), pos(-1)
+        : window(NULL), sizer(NULL), gotSize(false),
+          size(wxDefaultSize), gotPos(false), pos(-1)

     {}
     
     wxWindow* window;
     {}
     
     wxWindow* window;


@@ -295,13 +299,13 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize,
             // try wxSize or (w,h)
             if ( checkSize && wxSize_helper(item, &sizePtr)) {
                 info.size = *sizePtr;
             // try wxSize or (w,h)
             if ( checkSize && wxSize_helper(item, &sizePtr)) {
                 info.size = *sizePtr;

-                info.gotSize = True;
+                info.gotSize = true;

             }
 
             // or a single int
             if (checkIdx && PyInt_Check(item)) {
                 info.pos = PyInt_AsLong(item);
             }
 
             // or a single int
             if (checkIdx && PyInt_Check(item)) {
                 info.pos = PyInt_AsLong(item);

-                info.gotPos = True;
+                info.gotPos = true;

             }
         }
     }
             }
         }
     }


@@ -372,12 +376,13 @@ public:
 
     %extend {
         void _setOORInfo(PyObject* _self) {
 
     %extend {
         void _setOORInfo(PyObject* _self) {

-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));

         }
 
         DocAStr(Add,
                 "Add(self, item, int proportion=0, int flag=0, int border=0,
         }
 
         DocAStr(Add,
                 "Add(self, item, int proportion=0, int flag=0, int border=0,

-    PyObject userData=None)",
+    PyObject userData=None) -> wx.SizerItem",

 
                 "Appends a child item to the sizer.", "
 
 
                 "Appends a child item to the sizer.", "
 


@@ -476,81 +481,93 @@ public:
         is more complex than the *proportion* and *flag* will allow for.
 ");
 
         is more complex than the *proportion* and *flag* will allow for.
 ");
 

-        void Add(PyObject* item, int proportion=0, int flag=0, int border=0,
-                  PyObject* userData=NULL) {
+        wxSizerItem*  Add(PyObject* item, int proportion=0, int flag=0, int border=0,
+                          PyObject* userData=NULL) {

             
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
             
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);

             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Add method if a valid item type was found
             if ( info.window )
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Add method if a valid item type was found
             if ( info.window )

-                self->Add(info.window, proportion, flag, border, data);
+                return self->Add(info.window, proportion, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Add(info.sizer, proportion, flag, border, data);
+                return self->Add(info.sizer, proportion, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                self->Add(info.size.GetWidth(), info.size.GetHeight(),
-                          proportion, flag, border, data);
+                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                 proportion, flag, border, data);
+            else
+                return NULL;

         }
 
         }
 

+//    virtual wxSizerItem* AddSpacer(int size);
+//    virtual wxSizerItem* AddStretchSpacer(int prop = 1);

 
         DocAStr(Insert,
                 "Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
 
         DocAStr(Insert,
                 "Insert(self, int before, item, int proportion=0, int flag=0, int border=0,

-    PyObject userData=None)",
+    PyObject userData=None) -> wx.SizerItem",

 
                 "Inserts a new item into the list of items managed by this sizer before
 the item at index *before*.  See `Add` for a description of the parameters.", "");
 
                 "Inserts a new item into the list of items managed by this sizer before
 the item at index *before*.  See `Add` for a description of the parameters.", "");

-        void Insert(int before, PyObject* item, int proportion=0, int flag=0,
-                     int border=0, PyObject* userData=NULL) {
+        wxSizerItem* Insert(int before, PyObject* item, int proportion=0, int flag=0,
+                            int border=0, PyObject* userData=NULL) {

 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);

             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Insert method if a valid item type was found
             if ( info.window )
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Insert method if a valid item type was found
             if ( info.window )

-                self->Insert(before, info.window, proportion, flag, border, data);
+                return self->Insert(before, info.window, proportion, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Insert(before, info.sizer, proportion, flag, border, data);
+                return self->Insert(before, info.sizer, proportion, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
-                             proportion, flag, border, data);
+                return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
+                                    proportion, flag, border, data);
+            else
+                return NULL;

         }
 
 
         }
 
 

+//    virtual wxSizerItem* InsertSpacer(size_t index, int size);
+//    virtual wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);

         
         DocAStr(Prepend,
                 "Prepend(self, item, int proportion=0, int flag=0, int border=0,
         
         DocAStr(Prepend,
                 "Prepend(self, item, int proportion=0, int flag=0, int border=0,

-    PyObject userData=None)",
+    PyObject userData=None) -> wx.SizerItem",

 
                "Adds a new item to the begining of the list of sizer items managed by
 this sizer.  See `Add` for a description of the parameters.", "");
 
                "Adds a new item to the begining of the list of sizer items managed by
 this sizer.  See `Add` for a description of the parameters.", "");

-        void Prepend(PyObject* item, int proportion=0, int flag=0, int border=0,
-                     PyObject* userData=NULL) {
+        wxSizerItem* Prepend(PyObject* item, int proportion=0, int flag=0, int border=0,
+                             PyObject* userData=NULL) {

 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);

             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Prepend method if a valid item type was found
             if ( info.window )
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads(blocked);
             
             // Now call the real Prepend method if a valid item type was found
             if ( info.window )

-                self->Prepend(info.window, proportion, flag, border, data);
+                return self->Prepend(info.window, proportion, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Prepend(info.sizer, proportion, flag, border, data);
+                return self->Prepend(info.sizer, proportion, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
-                              proportion, flag, border, data);
+                return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
+                                     proportion, flag, border, data);
+            else
+                return NULL;

         }
 
         }
 

+//    virtual wxSizerItem* PrependSpacer(int size);
+//    virtual wxSizerItem* PrependStretchSpacer(int prop = 1);

 
         DocAStr(Remove,
                 "Remove(self, item) -> bool",
 
         DocAStr(Remove,
                 "Remove(self, item) -> bool",


@@ -568,7 +585,7 @@ and removed.", "
 ");
         bool Remove(PyObject* item) {
             bool blocked = wxPyBeginBlockThreads();
 ");
         bool Remove(PyObject* item) {
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);

             wxPyEndBlockThreads(blocked);
             if ( info.window )
                 return self->Remove(info.window);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
                 return self->Remove(info.window);


@@ -577,7 +594,7 @@ and removed.", "
             else if ( info.gotPos )
                 return self->Remove(info.pos);
             else 
             else if ( info.gotPos )
                 return self->Remove(info.pos);
             else 

-                return False;
+                return false;

         }
 
 
         }
 
 


@@ -590,7 +607,7 @@ zero-based index of the item to be detached.  Returns True if the child item
 was found and detached.", "");
         bool Detach(PyObject* item) {
             bool blocked = wxPyBeginBlockThreads();
 was found and detached.", "");
         bool Detach(PyObject* item) {
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);

             wxPyEndBlockThreads(blocked);
             if ( info.window )
                 return self->Detach(info.window);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
                 return self->Detach(info.window);


@@ -599,13 +616,33 @@ was found and detached.", "");
             else if ( info.gotPos )
                 return self->Detach(info.pos);
             else 
             else if ( info.gotPos )
                 return self->Detach(info.pos);
             else 

-                return False;
+                return false;
+        }
+
+        
+        DocAStr(GetItem,
+                "GetItem(self, item) -> wx.SizerItem",
+                "Returns the `wx.SizerItem` which holds the *item* given.  The *item*
+parameter can be either a window, a sizer, or the zero-based index of
+the item to be detached.", "");
+        wxSizerItem* GetItem(PyObject* item) {
+            bool blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
+            wxPyEndBlockThreads(blocked);
+            if ( info.window )
+                return self->GetItem(info.window);
+            else if ( info.sizer )
+                return self->GetItem(info.sizer);
+            else if ( info.gotPos )
+                return self->GetItem(info.pos);
+            else
+                return NULL;

         }
 
         
         void _SetItemMinSize(PyObject* item, const wxSize& size) {
             bool blocked = wxPyBeginBlockThreads();
         }
 
         
         void _SetItemMinSize(PyObject* item, const wxSize& size) {
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);

             wxPyEndBlockThreads(blocked);
             if ( info.window )
                 self->SetItemMinSize(info.window, size);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
                 self->SetItemMinSize(info.window, size);


@@ -634,19 +671,19 @@ was found and detached.", "");
     }
     
     DocDeclAStrName(
     }
     
     DocDeclAStrName(

-        void , Add( wxSizerItem *item ),
+        wxSizerItem* , Add( wxSizerItem *item ),

         "AddItem(self, SizerItem item)",
         "Adds a `wx.SizerItem` to the sizer.", "",
         AddItem);
     
     DocDeclAStrName(
         "AddItem(self, SizerItem item)",
         "Adds a `wx.SizerItem` to the sizer.", "",
         AddItem);
     
     DocDeclAStrName(

-        void , Insert( size_t index, wxSizerItem *item ),
+        wxSizerItem* , Insert( size_t index, wxSizerItem *item ),

         "InsertItem(self, int index, SizerItem item)",
         "Inserts a `wx.SizerItem` to the sizer at the position given by *index*.", "",
         InsertItem);
     
     DocDeclAStrName(
         "InsertItem(self, int index, SizerItem item)",
         "Inserts a `wx.SizerItem` to the sizer at the position given by *index*.", "",
         InsertItem);
     
     DocDeclAStrName(

-        void , Prepend( wxSizerItem *item ),
+        wxSizerItem* , Prepend( wxSizerItem *item ),

         "PrependItem(self, SizerItem item)",
         "Prepends a `wx.SizerItem` to the sizer.", "",
         PrependItem);
         "PrependItem(self, SizerItem item)",
         "Prepends a `wx.SizerItem` to the sizer.", "",
         PrependItem);


@@ -786,7 +823,7 @@ this will set them appropriately.
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        void , Clear( bool deleteWindows=False ),
+        void , Clear( bool deleteWindows=false ),

         "Clear all items from the sizer, optionally destroying the window items
 as well.", "");
     
         "Clear all items from the sizer, optionally destroying the window items
 as well.", "");
     


@@ -813,21 +850,24 @@ as well.", "");
 
     %extend {
         DocAStr(Show,
 
     %extend {
         DocAStr(Show,

-                "Show(self, item, bool show=True)",
+                "Show(self, item, bool show=True, bool recursive=false) -> bool",

                 "Shows or hides an item managed by the sizer.  To make a sizer item
 disappear or reappear, use Show followed by `Layout`.  The *item*
 parameter can be either a window, a sizer, or the zero-based index of
                 "Shows or hides an item managed by the sizer.  To make a sizer item
 disappear or reappear, use Show followed by `Layout`.  The *item*
 parameter can be either a window, a sizer, or the zero-based index of

-the item.", "");
-        void Show(PyObject* item, bool show = True) {
+the item.  Use the recursive parameter to show or hide an item in a
+subsizer.  Returns True if the item was found.", "");
+        bool Show(PyObject* item, bool show = true, bool recursive=false) {

             bool blocked = wxPyBeginBlockThreads();
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);

             wxPyEndBlockThreads(blocked);
             if ( info.window )
             wxPyEndBlockThreads(blocked);
             if ( info.window )

-                self->Show(info.window, show);
+                return self->Show(info.window, show, recursive);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Show(info.sizer, show);
+                return self->Show(info.sizer, show, recursive);

             else if ( info.gotPos )
             else if ( info.gotPos )

-                self->Show(info.pos, show);
+                return self->Show(info.pos, show);
+            else
+                return false;

         }
        
         DocAStr(IsShown,
         }
        
         DocAStr(IsShown,


@@ -838,7 +878,7 @@ parameter can be either a window, a sizer, or the zero-based index of
 the item.", "");
         bool IsShown(PyObject* item) {
             bool blocked = wxPyBeginBlockThreads();
 the item.", "");
         bool IsShown(PyObject* item) {
             bool blocked = wxPyBeginBlockThreads();

-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false);

             wxPyEndBlockThreads(blocked);
             if ( info.window ) 
                 return self->IsShown(info.window);
             wxPyEndBlockThreads(blocked);
             if ( info.window ) 
                 return self->IsShown(info.window);


@@ -847,22 +887,22 @@ the item.", "");
             else if ( info.gotPos )
                 return self->IsShown(info.pos);
             else
             else if ( info.gotPos )
                 return self->IsShown(info.pos);
             else

-                return False;
+                return false;

         }
     }
 
     %pythoncode {
         }
     }
 
     %pythoncode {

-    def Hide(self, item):
+    def Hide(self, item, recursive=False):

         """
         """

-        A convenience method for Show(item, False).
+        A convenience method for Show(item, False, recursive).

         """
         """

-        self.Show(item, False)
+        return self.Show(item, False, recursive)

     }
 
     
     DocDeclStr(
         void , ShowItems(bool show),
     }
 
     
     DocDeclStr(
         void , ShowItems(bool show),

-        "Recursively call `wx.Window.Show` on all sizer items.", "");
+        "Recursively call `wx.SizerItem.Show` on all sizer items.", "");

     
 };
 
     
 };