REWRITE wxStringBase::append and wxString::Replace.

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

diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i
index c2de865acee031e7c12775c13ea9f963c59b86ce..2ae31351a8ce82d049791755e94832b5db844461 100644 (file)
--- a/wxPython/src/_sashwin.i
+++ b/wxPython/src/_sashwin.i
@@ -15,12 +15,8 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    static const wxChar* wxSashNameStr = wxT("sashWindow");
-    DECLARE_DEF_STRING(SashNameStr);
-    static const wxChar* wxSashLayoutNameStr = wxT("layoutWindow");
-    DECLARE_DEF_STRING(SashLayoutNameStr);
-%}
+MAKE_CONST_WXSTRING2(SashNameStr, wxT("sashWindow"));
+MAKE_CONST_WXSTRING2(SashLayoutNameStr, wxT("layoutWindow"));
 
 //---------------------------------------------------------------------------
 %newgroup;
@@ -52,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.
+MustHaveApp(wxSashWindow);
+
 class wxSashWindow: public wxWindow
 {
 public:
-    %addtofunc wxSashWindow         "self._setOORInfo(self)"
-    %addtofunc 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();
+    %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,
@@ -238,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.
+MustHaveApp(wxSashLayoutWindow);
+
 class wxSashLayoutWindow: public wxSashWindow
 {
 public:
-    %addtofunc wxSashLayoutWindow         "self._setOORInfo(self)"
-    %addtofunc 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();
+    %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,