Added more default args as needed to allow most window types to be

constructed with only the parent window arg.  In some cases other args
may be required for normal operation, but they can usually be set
after construction.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index 7f5b9f5fd4e37652a365b3321fc97bdbc56545f3..5e7044221c55328f63b80dc9742796570920b4c2 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -146,13 +146,13 @@ public:
     %pythonAppend wxDynamicSashWindow         "self._setOORInfo(self)"
     %pythonAppend wxDynamicSashWindow()       ""
 
     %pythonAppend wxDynamicSashWindow         "self._setOORInfo(self)"
     %pythonAppend wxDynamicSashWindow()       ""
 

-    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
+    wxDynamicSashWindow(wxWindow *parent, wxWindowID id=-1,

                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                         long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                         const wxString& name = wxPyDynamicSashNameStr);
     %name(PreDynamicSashWindow)wxDynamicSashWindow();
 
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                         long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                         const wxString& name = wxPyDynamicSashNameStr);
     %name(PreDynamicSashWindow)wxDynamicSashWindow();
 

-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                 const wxString& name = wxPyDynamicSashNameStr);
                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                 const wxString& name = wxPyDynamicSashNameStr);


@@ -186,8 +186,8 @@ public:
     %pythonAppend wxEditableListBox         "self._setOORInfo(self)"
     %pythonAppend wxEditableListBox()       ""
 
     %pythonAppend wxEditableListBox         "self._setOORInfo(self)"
     %pythonAppend wxEditableListBox()       ""
 

-    wxEditableListBox(wxWindow *parent, wxWindowID id,
-                      const wxString& label,
+    wxEditableListBox(wxWindow *parent, wxWindowID id=-1,
+                      const wxString& label = wxPyEmptyString,

                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 92636c139b5f2e231379d2b992d46865baa1b24b..66b74c75ef75b951236ab4c077d06fe4b630e8a9 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -100,6 +100,11 @@ many toplevel functions and static methods will now check that a
 wx.App object has already been created and will raise a
 wx.PyNoAppError exception if not.
 
 wx.App object has already been created and will raise a
 wx.PyNoAppError exception if not.
 

+Added more default args as needed to allow most window types to be
+constructed with only the parent window arg.  In some cases other args
+may be required for normal operation, but they can usually be set
+after construction.
+

 
 
 
 
 
 

diff --git a/wxPython/src/_button.i b/wxPython/src/_button.i
index cbba457512acc3bc4f38f860618e10b2137b7f5e..de03872ce9eb0cf0a3c10b843db7792c45f2cc1b 100644 (file)
--- a/wxPython/src/_button.i
+++ b/wxPython/src/_button.i
@@ -68,7 +68,8 @@ public:
 
 
     DocCtorStr(
 
 
     DocCtorStr(

-        wxButton(wxWindow* parent, wxWindowID id, const wxString& label,
+        wxButton(wxWindow* parent, wxWindowID id=-1,
+                 const wxString& label=wxPyEmptyString,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,


@@ -82,7 +83,8 @@ public:
         PreButton);
 
     DocDeclStr(
         PreButton);
 
     DocDeclStr(

-        bool , Create(wxWindow* parent, wxWindowID id, const wxString& label,
+        bool , Create(wxWindow* parent, wxWindowID id=-1,
+                      const wxString& label=wxPyEmptyString,

                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = 0,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = 0,


@@ -154,7 +156,8 @@ public:
     %pythonAppend wxBitmapButton()       ""
 
     DocCtorStr(
     %pythonAppend wxBitmapButton()       ""
 
     DocCtorStr(

-        wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
+        wxBitmapButton(wxWindow* parent, wxWindowID id=-1,
+                       const wxBitmap& bitmap = wxNullBitmap,

                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxBU_AUTODRAW,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxBU_AUTODRAW,


@@ -168,11 +171,12 @@ public:
         PreBitmapButton);
 
     DocDeclStr(
         PreBitmapButton);
 
     DocDeclStr(

-        bool , Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
-                const wxValidator& validator = wxDefaultValidator,
+        bool , Create(wxWindow* parent, wxWindowID id=-1,
+                      const wxBitmap& bitmap = wxNullBitmap,
+                      const wxPoint& pos = wxDefaultPosition,
+                      const wxSize& size = wxDefaultSize,
+                      long style = wxBU_AUTODRAW,
+                      const wxValidator& validator = wxDefaultValidator,

                       const wxString& name = wxPyButtonNameStr),
         "Acutally create the GUI BitmapButton for 2-phase creation.", "");
     
                       const wxString& name = wxPyButtonNameStr),
         "Acutally create the GUI BitmapButton for 2-phase creation.", "");
     

diff --git a/wxPython/src/_checkbox.i b/wxPython/src/_checkbox.i
index 0d7800accb56ccfa80dec218ef755ce2ac2dea35..1b553a151b6e288dc1eeba9f93a50262da260ad6 100644 (file)
--- a/wxPython/src/_checkbox.i
+++ b/wxPython/src/_checkbox.i
@@ -87,7 +87,8 @@ public:
     %pythonAppend wxCheckBox()       ""
 
     DocCtorStr(
     %pythonAppend wxCheckBox()       ""
 
     DocCtorStr(

-        wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label,
+        wxCheckBox(wxWindow* parent, wxWindowID id=-1,
+                   const wxString& label = wxPyEmptyString,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -102,7 +103,8 @@ public:
 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        bool, Create(wxWindow* parent, wxWindowID id, const wxString& label,
+        bool, Create(wxWindow* parent, wxWindowID id=-1,
+                     const wxString& label = wxPyEmptyString,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = 0,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = 0,

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index de1705f176e135175b65c598f4103760a7bfe015..7963a620e5f910a5901e9356c7c7a96ec9c19695 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -351,7 +351,7 @@ public:
         wxMultiChoiceDialog(wxWindow *parent,
                             const wxString& message,
                             const wxString& caption,
         wxMultiChoiceDialog(wxWindow *parent,
                             const wxString& message,
                             const wxString& caption,

-                            int choices=0, wxString* choices_array,
+                            int choices=0, wxString* choices_array=NULL,

                             long style = wxCHOICEDLG_STYLE,
                             const wxPoint& pos = wxDefaultPosition),
         "__init__(Window parent, String message, String caption,
                             long style = wxCHOICEDLG_STYLE,
                             const wxPoint& pos = wxDefaultPosition),
         "__init__(Window parent, String message, String caption,

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 555f535ad90a2055ad6428a1667d367ff3c724de..966b3950a677338d6c51921b31d99ca8a8c54f72 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -37,7 +37,7 @@ public:
 
     DocCtorStr(
         wxControl(wxWindow *parent,
 
     DocCtorStr(
         wxControl(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID id=-1,

               const wxPoint& pos=wxDefaultPosition,
               const wxSize& size=wxDefaultSize,
               long style=0,
               const wxPoint& pos=wxDefaultPosition,
               const wxSize& size=wxDefaultSize,
               long style=0,


@@ -53,7 +53,7 @@ __init__ as a plain old wx.Control is not very useful.", "");
 
     DocDeclStr(
         bool , Create(wxWindow *parent,
 
     DocDeclStr(
         bool , Create(wxWindow *parent,

-                      wxWindowID id,
+                      wxWindowID id=-1,

                       const wxPoint& pos=wxDefaultPosition,
                       const wxSize& size=wxDefaultSize,
                       long style=0,
                       const wxPoint& pos=wxDefaultPosition,
                       const wxSize& size=wxDefaultSize,
                       long style=0,

diff --git a/wxPython/src/_gauge.i b/wxPython/src/_gauge.i
index 0aad4c78f52e9147a8b004cb74fef2ff2d5e6b8a..21f1472d7abbfdce92292e1c0c96692029d86ab6 100644 (file)
--- a/wxPython/src/_gauge.i
+++ b/wxPython/src/_gauge.i
@@ -36,7 +36,7 @@ public:
     %pythonAppend wxGauge         "self._setOORInfo(self)"
     %pythonAppend wxGauge()       ""
 
     %pythonAppend wxGauge         "self._setOORInfo(self)"
     %pythonAppend wxGauge()       ""
 

-    wxGauge(wxWindow* parent, wxWindowID id, int range,
+    wxGauge(wxWindow* parent, wxWindowID id=-1, int range=100,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,


@@ -44,7 +44,7 @@ public:
             const wxString& name = wxPyGaugeNameStr);
     %name(PreGauge)wxGauge();
 
             const wxString& name = wxPyGaugeNameStr);
     %name(PreGauge)wxGauge();
 

-    bool Create(wxWindow* parent, wxWindowID id, int range,
+    bool Create(wxWindow* parent, wxWindowID id=-1, int range=100,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,

diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index f17f096ac1eaafbc2857f3814b89691dc1b7d53d..2b3da1dc439a7a1d973d50c1b7b681c2b49a9242 100644 (file)
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -34,7 +34,7 @@ public:
     %pythonAppend wxListBox         "self._setOORInfo(self)"
     %pythonAppend wxListBox()       ""
 
     %pythonAppend wxListBox         "self._setOORInfo(self)"
     %pythonAppend wxListBox()       ""
 

-    wxListBox(wxWindow* parent, wxWindowID id,
+    wxListBox(wxWindow* parent, wxWindowID id=-1,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               //int choices=0, wxString* choices_array = NULL,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               //int choices=0, wxString* choices_array = NULL,


@@ -44,7 +44,7 @@ public:
               const wxString& name = wxPyListBoxNameStr);
     %name(PreListBox)wxListBox();
 
               const wxString& name = wxPyListBoxNameStr);
     %name(PreListBox)wxListBox();
 

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 //int choices=0, wxString* choices_array = NULL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 //int choices=0, wxString* choices_array = NULL,


@@ -148,7 +148,7 @@ public:
     %pythonAppend wxCheckListBox         "self._setOORInfo(self)"
     %pythonAppend wxCheckListBox()       ""
 
     %pythonAppend wxCheckListBox         "self._setOORInfo(self)"
     %pythonAppend wxCheckListBox()       ""
 

-    wxCheckListBox(wxWindow *parent, wxWindowID id,
+    wxCheckListBox(wxWindow *parent, wxWindowID id=-1,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    //int choices = 0, wxString* choices_array = NULL,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    //int choices = 0, wxString* choices_array = NULL,


@@ -158,7 +158,7 @@ public:
                    const wxString& name = wxPyListBoxNameStr);
     %name(PreCheckListBox)wxCheckListBox();
 
                    const wxString& name = wxPyListBoxNameStr);
     %name(PreCheckListBox)wxCheckListBox();
 

-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 //int choices = 0, wxString* choices_array = NULL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 //int choices = 0, wxString* choices_array = NULL,

diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i
index 355c6cf1f86abe0bbbe44ffdcef7c91b8a764537..dab48d326d5b471328536239e24d080d9db101a0 100644 (file)
--- a/wxPython/src/_mdi.i
+++ b/wxPython/src/_mdi.i
@@ -41,8 +41,8 @@ public:
     %pythonAppend wxMDIParentFrame()       ""
 
     wxMDIParentFrame(wxWindow *parent,
     %pythonAppend wxMDIParentFrame()       ""
 
     wxMDIParentFrame(wxWindow *parent,

-                     const wxWindowID id,
-                     const wxString& title,
+                     const wxWindowID id=-1,
+                     const wxString& title = wxPyEmptyString,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,


@@ -50,8 +50,8 @@ public:
     %name(PreMDIParentFrame)wxMDIParentFrame();
 
     bool Create(wxWindow *parent,
     %name(PreMDIParentFrame)wxMDIParentFrame();
 
     bool Create(wxWindow *parent,

-                     const wxWindowID id,
-                     const wxString& title,
+                     const wxWindowID id=-1,
+                     const wxString& title = wxPyEmptyString,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,


@@ -88,8 +88,8 @@ public:
     %pythonAppend wxMDIChildFrame()       ""
 
     wxMDIChildFrame(wxMDIParentFrame* parent,
     %pythonAppend wxMDIChildFrame()       ""
 
     wxMDIChildFrame(wxMDIParentFrame* parent,

-                    const wxWindowID id,
-                    const wxString& title,
+                    const wxWindowID id=-1,
+                    const wxString& title = wxPyEmptyString,

                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,


@@ -97,8 +97,8 @@ public:
     %name(PreMDIChildFrame)wxMDIChildFrame();
 
     bool Create(wxMDIParentFrame* parent,
     %name(PreMDIChildFrame)wxMDIChildFrame();
 
     bool Create(wxMDIParentFrame* parent,

-                    const wxWindowID id,
-                    const wxString& title,
+                    const wxWindowID id=-1,
+                    const wxString& title = wxPyEmptyString,

                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,

diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index 853ffe03b39148d9212c33e8d7a70eb27ae5afcd..ab17747cd7436fe87b5b74c5b07b9f664b0469da 100644 (file)
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -178,7 +178,7 @@ public:
     %name(PreNotebook)wxNotebook();
 
     bool Create(wxWindow *parent,
     %name(PreNotebook)wxNotebook();
 
     bool Create(wxWindow *parent,

-               wxWindowID id,
+               wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,


@@ -308,7 +308,7 @@ public:
     %name(PreListbook)wxListbook();
 
     bool Create(wxWindow *parent,
     %name(PreListbook)wxListbook();
 
     bool Create(wxWindow *parent,

-                wxWindowID id,
+                wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

diff --git a/wxPython/src/_pycontrol.i b/wxPython/src/_pycontrol.i
index eb2a01b87fb38a0e84c1595e4f010d6c5d236f6a..dc1e8047b9ec5c2753d270774f79aba88af19125 100644 (file)
--- a/wxPython/src/_pycontrol.i
+++ b/wxPython/src/_pycontrol.i
@@ -106,7 +106,7 @@ public:
     %pythonAppend wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
     %pythonAppend wxPyControl()       ""
 
     %pythonAppend wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
     %pythonAppend wxPyControl()       ""
 

-    wxPyControl(wxWindow* parent, const wxWindowID id,
+    wxPyControl(wxWindow* parent, const wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

diff --git a/wxPython/src/_pywindows.i b/wxPython/src/_pywindows.i
index 4cc0976bd3606ad22739f1c71582d2333d6f55b6..8edd2a3f37fb869e70cc49f07ad0aed354977929 100644 (file)
--- a/wxPython/src/_pywindows.i
+++ b/wxPython/src/_pywindows.i
@@ -136,7 +136,7 @@ public:
     %pythonAppend wxPyWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
     %pythonAppend wxPyWindow()       ""
 
     %pythonAppend wxPyWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
     %pythonAppend wxPyWindow()       ""
 

-    wxPyWindow(wxWindow* parent, const wxWindowID id,
+    wxPyWindow(wxWindow* parent, const wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,


@@ -281,7 +281,7 @@ public:
     %pythonAppend wxPyPanel         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyPanel()       ""
 
     %pythonAppend wxPyPanel         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyPanel()       ""
 

-    wxPyPanel(wxWindow* parent, const wxWindowID id,
+    wxPyPanel(wxWindow* parent, const wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,


@@ -418,7 +418,7 @@ public:
     %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyScrolledWindow()       ""
 
     %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyScrolledWindow()       ""
 

-    wxPyScrolledWindow(wxWindow* parent, const wxWindowID id,
+    wxPyScrolledWindow(wxWindow* parent, const wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i
index 9a2551def1c88e04af1b403022317219ba06b8fc..275dce10c61eefa39f305ab102d35f8ad46afb77 100644 (file)
--- a/wxPython/src/_radio.i
+++ b/wxPython/src/_radio.i
@@ -31,8 +31,8 @@ public:
     %pythonAppend  wxRadioBox         "self._setOORInfo(self)"
     %pythonAppend  wxRadioBox()       ""
 
     %pythonAppend  wxRadioBox         "self._setOORInfo(self)"
     %pythonAppend  wxRadioBox()       ""
 

-    wxRadioBox(wxWindow* parent, wxWindowID id,
-               const wxString& label,
+    wxRadioBox(wxWindow* parent, wxWindowID id=-1,
+               const wxString& label = wxPyEmptyString,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                //int choices = 0, wxString* choices_array = NULL,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                //int choices = 0, wxString* choices_array = NULL,


@@ -43,8 +43,8 @@ public:
                const wxString& name = wxPyRadioBoxNameStr);
     %name(PreRadioBox)wxRadioBox();
 
                const wxString& name = wxPyRadioBoxNameStr);
     %name(PreRadioBox)wxRadioBox();
 

-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 //int choices = 0, wxString* choices_array = NULL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 //int choices = 0, wxString* choices_array = NULL,


@@ -104,8 +104,8 @@ public:
     %pythonAppend wxRadioButton         "self._setOORInfo(self)"
     %pythonAppend wxRadioButton()       ""
 
     %pythonAppend wxRadioButton         "self._setOORInfo(self)"
     %pythonAppend wxRadioButton()       ""
 

-    wxRadioButton(wxWindow* parent, wxWindowID id,
-                  const wxString& label,
+    wxRadioButton(wxWindow* parent, wxWindowID id=-1,
+                  const wxString& label = wxPyEmptyString,

                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,


@@ -113,8 +113,8 @@ public:
                   const wxString& name = wxPyRadioButtonNameStr);
     %name(PreRadioButton)wxRadioButton();
 
                   const wxString& name = wxPyRadioButtonNameStr);
     %name(PreRadioButton)wxRadioButton();
 

-    bool Create(wxWindow* parent, wxWindowID id,
-                  const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                  const wxString& label = wxPyEmptyString,

                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,

diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i
index df6c53ebbfe6ed05be8c3d5a3724195b7d191d17..63ab46c33b62b91c2c9f8e5acf8b34fab23d1a16 100644 (file)
--- a/wxPython/src/_sashwin.i
+++ b/wxPython/src/_sashwin.i
@@ -56,14 +56,14 @@ public:
     %pythonAppend wxSashWindow         "self._setOORInfo(self)"
     %pythonAppend wxSashWindow()       ""
 
     %pythonAppend wxSashWindow         "self._setOORInfo(self)"
     %pythonAppend wxSashWindow()       ""
 

-    wxSashWindow(wxWindow* parent, wxWindowID id,
+    wxSashWindow(wxWindow* parent, wxWindowID id=-1,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxCLIP_CHILDREN | wxSW_3D,
                  const wxString& name = wxPySashNameStr);
     %name(PreSashWindow)wxSashWindow();
 
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxCLIP_CHILDREN | wxSW_3D,
                  const wxString& name = wxPySashNameStr);
     %name(PreSashWindow)wxSashWindow();
 

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id=-1,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxCLIP_CHILDREN | wxSW_3D,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxCLIP_CHILDREN | wxSW_3D,


@@ -244,14 +244,14 @@ public:
     %pythonAppend wxSashLayoutWindow         "self._setOORInfo(self)"
     %pythonAppend wxSashLayoutWindow()       ""
     
     %pythonAppend wxSashLayoutWindow         "self._setOORInfo(self)"
     %pythonAppend wxSashLayoutWindow()       ""
     

-    wxSashLayoutWindow(wxWindow* parent, wxWindowID id,
+    wxSashLayoutWindow(wxWindow* parent, wxWindowID id=-1,

                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxSW_3D,
                        const wxString& name = wxPySashLayoutNameStr);
     %name(PreSashLayoutWindow)wxSashLayoutWindow();
 
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxSW_3D,
                        const wxString& name = wxPySashLayoutNameStr);
     %name(PreSashLayoutWindow)wxSashLayoutWindow();
 

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxSW_3D,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxSW_3D,

diff --git a/wxPython/src/_slider.i b/wxPython/src/_slider.i
index 17d51db2e68aace230d4b320df5083eea6fe0992..6ecb209afe0bbc020f1f6f0c4aa41b9076b6b281 100644 (file)
--- a/wxPython/src/_slider.i
+++ b/wxPython/src/_slider.i
@@ -34,8 +34,8 @@ public:
     %pythonAppend  wxSlider         "self._setOORInfo(self)"
     %pythonAppend  wxSlider()       ""
 
     %pythonAppend  wxSlider         "self._setOORInfo(self)"
     %pythonAppend  wxSlider()       ""
 

-    wxSlider(wxWindow* parent, wxWindowID id,
-             int value, int minValue, int maxValue,
+    wxSlider(wxWindow* parent, wxWindowID id=-1,
+             int value=0, int minValue=0, int maxValue=100,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,


@@ -43,8 +43,8 @@ public:
              const wxString& name = wxPySliderNameStr);
     %name(PreSlider)wxSlider();
 
              const wxString& name = wxPySliderNameStr);
     %name(PreSlider)wxSlider();
 

-    bool Create(wxWindow* parent, wxWindowID id,
-             int value, int minValue, int maxValue,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+             int value=0, int minValue=0, int maxValue=100,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index f2f726e60b24d3cf9770db752df40e6d74bcb15d..3c15670aaf0a69274a839657d3b10ec08a0ba42b 100644 (file)
--- a/wxPython/src/_statctrls.i
+++ b/wxPython/src/_statctrls.i
@@ -30,14 +30,16 @@ public:
     %pythonAppend wxStaticBox         "self._setOORInfo(self)"
     %pythonAppend wxStaticBox()       ""
 
     %pythonAppend wxStaticBox         "self._setOORInfo(self)"
     %pythonAppend wxStaticBox()       ""
 

-    wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
+    wxStaticBox(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);
     %name(PreStaticBox)wxStaticBox();
 
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);
     %name(PreStaticBox)wxStaticBox();
 

-    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -59,14 +61,14 @@ public:
     %pythonAppend wxStaticLine         "self._setOORInfo(self)"
     %pythonAppend wxStaticLine()       ""
 
     %pythonAppend wxStaticLine         "self._setOORInfo(self)"
     %pythonAppend wxStaticLine()       ""
 

-    wxStaticLine( wxWindow *parent, wxWindowID id,
+    wxStaticLine( wxWindow *parent, wxWindowID id=-1,

                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticLine)wxStaticLine();
 
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticLine)wxStaticLine();
 

-    bool Create( wxWindow *parent, wxWindowID id,
+    bool Create( wxWindow *parent, wxWindowID id=-1,

                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,


@@ -93,14 +95,16 @@ public:
     %pythonAppend wxStaticText         "self._setOORInfo(self)"
     %pythonAppend wxStaticText()       ""
 
     %pythonAppend wxStaticText         "self._setOORInfo(self)"
     %pythonAppend wxStaticText()       ""
 

-    wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
+    wxStaticText(wxWindow* parent, wxWindowID id=-1,
+                 const wxString& label = wxPyEmptyString,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticText)wxStaticText();
 
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticText)wxStaticText();
 

-    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,


@@ -120,16 +124,16 @@ public:
     %pythonAppend wxStaticBitmap         "self._setOORInfo(self)"
     %pythonAppend wxStaticBitmap()       ""
 
     %pythonAppend wxStaticBitmap         "self._setOORInfo(self)"
     %pythonAppend wxStaticBitmap()       ""
 

-    wxStaticBitmap(wxWindow* parent, wxWindowID id,
-                   const wxBitmap& bitmap,
+    wxStaticBitmap(wxWindow* parent, wxWindowID id=-1,
+                   const wxBitmap& bitmap = wxNullBitmap,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxPyStaticBitmapNameStr);
     %name(PreStaticBitmap)wxStaticBitmap();
 
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxPyStaticBitmapNameStr);
     %name(PreStaticBitmap)wxStaticBitmap();
 

-    bool Create(wxWindow* parent, wxWindowID id,
-                   const wxBitmap& bitmap,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                   const wxBitmap& bitmap = wxNullBitmap,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,

diff --git a/wxPython/src/_statusbar.i b/wxPython/src/_statusbar.i
index 4eb81820a0555abff0ab5657a604a7b536ace016..0fc21a1f03b88855b950690f45ccacaaf8add9dc 100644 (file)
--- a/wxPython/src/_statusbar.i
+++ b/wxPython/src/_statusbar.i
@@ -36,7 +36,7 @@ public:
                 const wxString& name = wxPyStatusLineNameStr);
     %name(PreStatusBar)wxStatusBar();
 
                 const wxString& name = wxPyStatusLineNameStr);
     %name(PreStatusBar)wxStatusBar();
 

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id=-1,

                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxPyStatusLineNameStr);
 
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxPyStatusLineNameStr);
 

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index 7924ad77caf5e543ce14f75ff8c7114039328108..9dc6789495ddfa3fdfe455d9173e4827f9346bb1 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -168,7 +168,7 @@ public:
     %pythonAppend wxTextCtrl         "self._setOORInfo(self)"
     %pythonAppend wxTextCtrl()       ""
 
     %pythonAppend wxTextCtrl         "self._setOORInfo(self)"
     %pythonAppend wxTextCtrl()       ""
 

-    wxTextCtrl(wxWindow* parent, wxWindowID id,
+    wxTextCtrl(wxWindow* parent, wxWindowID id=-1,

                const wxString& value = wxPyEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxPyEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,


@@ -177,7 +177,7 @@ public:
                const wxString& name = wxPyTextCtrlNameStr);
     %name(PreTextCtrl)wxTextCtrl();
 
                const wxString& name = wxPyTextCtrlNameStr);
     %name(PreTextCtrl)wxTextCtrl();
 

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id=-1,

                const wxString& value = wxPyEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxPyEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i
index d3947cc5e373cb652e3baf191a48a7610fe78a8a..3241807ee64b4a508b4089c412561df4606fdb7e 100644 (file)
--- a/wxPython/src/_tglbtn.i
+++ b/wxPython/src/_tglbtn.i
@@ -59,8 +59,8 @@ public:
     %pythonAppend wxToggleButton()       ""
 
     wxToggleButton(wxWindow *parent,
     %pythonAppend wxToggleButton()       ""
 
     wxToggleButton(wxWindow *parent,

-                   wxWindowID id,
-                   const wxString& label,
+                   wxWindowID id=-1,
+                   const wxString& label = wxPyEmptyString,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -69,8 +69,8 @@ public:
     %name(PreToggleButton)wxToggleButton();
 
     bool Create(wxWindow *parent,
     %name(PreToggleButton)wxToggleButton();
 
     bool Create(wxWindow *parent,

-                   wxWindowID id,
-                   const wxString& label,
+                   wxWindowID id=-1,
+                   const wxString& label = wxPyEmptyString,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index 0c9ad075ce2391cbed2bb4fac2ea3113dc150d14..c7d22e0b2c94942534ad9debc65091d5378c536f 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -282,6 +282,7 @@ public:
 
     %# For consistency with the backwards compatible methods above, here are
     %# some non-'Label' versions of the Check and Radio methods
 
     %# For consistency with the backwards compatible methods above, here are
     %# some non-'Label' versions of the Check and Radio methods

+

     def AddCheckTool(self, id, bitmap,
                      bmpDisabled = wx.NullBitmap,
                      shortHelp = '', longHelp = '',
     def AddCheckTool(self, id, bitmap,
                      bmpDisabled = wx.NullBitmap,
                      shortHelp = '', longHelp = '',


@@ -392,7 +393,7 @@ public:
     %pythonAppend wxToolBar()       ""
     
     wxToolBar(wxWindow *parent,
     %pythonAppend wxToolBar()       ""
     
     wxToolBar(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID id=-1,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,


@@ -400,7 +401,7 @@ public:
     %name(PreToolBar)wxToolBar();
 
     bool Create(wxWindow *parent,
     %name(PreToolBar)wxToolBar();
 
     bool Create(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID id=-1,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 597b5c8399a17262b91d6438cbb2fc0ec1549026..d615218244540ad6d5c6b37781ad5b1571da1d66 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -152,14 +152,16 @@ public:
     %pythonAppend wxFrame         "self._setOORInfo(self)"
     %pythonAppend wxFrame()       ""
 
     %pythonAppend wxFrame         "self._setOORInfo(self)"
     %pythonAppend wxFrame()       ""
 

-    wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
+    wxFrame(wxWindow* parent, const wxWindowID id=-1,
+            const wxString& title = wxPyEmptyString,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
             const wxString& name = wxPyFrameNameStr);
     %name(PreFrame)wxFrame();
 
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
             const wxString& name = wxPyFrameNameStr);
     %name(PreFrame)wxFrame();
 

-    bool Create(wxWindow* parent, const wxWindowID id, const wxString& title,
+    bool Create(wxWindow* parent, const wxWindowID id=-1,
+                const wxString& title = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,


@@ -265,8 +267,8 @@ public:
     %pythonAppend wxDialog() ""
 
     wxDialog(wxWindow* parent,
     %pythonAppend wxDialog() ""
 
     wxDialog(wxWindow* parent,

-             const wxWindowID id,
-             const wxString& title,
+             const wxWindowID id=-1,
+             const wxString& title = wxPyEmptyString,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,


@@ -274,8 +276,8 @@ public:
     %name(PreDialog)wxDialog();
 
     bool Create(wxWindow* parent,
     %name(PreDialog)wxDialog();
 
     bool Create(wxWindow* parent,

-                const wxWindowID id,
-                const wxString& title,
+                const wxWindowID id=-1,
+                const wxString& title = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,


@@ -322,14 +324,16 @@ public:
     %pythonAppend wxMiniFrame         "self._setOORInfo(self)"
     %pythonAppend wxMiniFrame()       ""
 
     %pythonAppend wxMiniFrame         "self._setOORInfo(self)"
     %pythonAppend wxMiniFrame()       ""
 

-    wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
+    wxMiniFrame(wxWindow* parent, const wxWindowID id=-1,
+                const wxString& title = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxPyFrameNameStr);
     %name(PreMiniFrame)wxMiniFrame();
 
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxPyFrameNameStr);
     %name(PreMiniFrame)wxMiniFrame();
 

-    bool Create(wxWindow* parent, const wxWindowID id, const wxString& title,
+    bool Create(wxWindow* parent, const wxWindowID id=-1,
+                const wxString& title = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,


@@ -376,7 +380,7 @@ public:
     %pythonAppend wxSplashScreen         "self._setOORInfo(self)"
 
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
     %pythonAppend wxSplashScreen         "self._setOORInfo(self)"
 
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,

-                   wxWindow* parent, wxWindowID id,
+                   wxWindow* parent, wxWindowID id=-1,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 63a951f25a41ebb0f9f4345d288ebab6446d3440..1248073fb7478d37270c3c766bee68832f73319f 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -491,7 +491,7 @@ the borders, scrollbars, other decorations...)", "");
 
     
     DocStr(GetBestSize,
 
     
     DocStr(GetBestSize,

-           "This functions returns the best acceptable minimal size for the
+           "This function returns the best acceptable minimal size for the

 window, if applicable. For example, for a static text control, it will
 be the minimal size such that the control label is not truncated. For
 windows containing subwindows (suzh aswx.Panel), the size returned by
 window, if applicable. For example, for a static text control, it will
 be the minimal size such that the control label is not truncated. For
 windows containing subwindows (suzh aswx.Panel), the size returned by

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 5d28b1197149480cf38b76952c51ff445cd0bd78..d63ccda64ffe034186893b69f2b8c8e360bc38b4 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -1555,7 +1555,7 @@ public:
     %pythonAppend wxGrid "self._setOORInfo(self)"
 
     wxGrid( wxWindow *parent,
     %pythonAppend wxGrid "self._setOORInfo(self)"
 
     wxGrid( wxWindow *parent,

-            wxWindowID id,
+            wxWindowID id=-1,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,


@@ -1565,7 +1565,7 @@ public:
     
     
     bool Create( wxWindow *parent,
     
     
     bool Create( wxWindow *parent,

-                 wxWindowID id,
+                 wxWindowID id=-1,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxWANTS_CHARS,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxWANTS_CHARS,