Docview and IDE patch from Morag Hua with fix for bug #1217890

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

diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i
index eb2d828ac9b13805b00183e0b9ff94685cf7d054..2ae31351a8ce82d049791755e94832b5db844461 100644 (file)
--- a/wxPython/src/_sashwin.i
+++ b/wxPython/src/_sashwin.i
@@ -48,20 +48,22 @@ enum wxSashEdgePosition {
 // wxSashWindow allows any of its edges to have a sash which can be dragged
 // to resize the window. The actual content window will be created as a child
 // of wxSashWindow.
 // wxSashWindow allows any of its edges to have a sash which can be dragged
 // to resize the window. The actual content window will be created as a child
 // of wxSashWindow.

+MustHaveApp(wxSashWindow);
+

 class wxSashWindow: public wxWindow
 {
 public:
     %pythonAppend wxSashWindow         "self._setOORInfo(self)"
     %pythonAppend wxSashWindow()       ""
 
 class wxSashWindow: public wxWindow
 {
 public:
     %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);
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxCLIP_CHILDREN | wxSW_3D,
                  const wxString& name = wxPySashNameStr);

-    %name(PreSashWindow)wxSashWindow();
+    %RenameCtor(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,


@@ -234,20 +236,22 @@ public:
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.

+MustHaveApp(wxSashLayoutWindow);
+

 class wxSashLayoutWindow: public wxSashWindow
 {
 public:
     %pythonAppend wxSashLayoutWindow         "self._setOORInfo(self)"
     %pythonAppend wxSashLayoutWindow()       ""
     
 class wxSashLayoutWindow: public wxSashWindow
 {
 public:
     %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);
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxSW_3D,
                        const wxString& name = wxPySashLayoutNameStr);

-    %name(PreSashLayoutWindow)wxSashLayoutWindow();
+    %RenameCtor(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,