Moved some enums around to better match the C++ headers

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

diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i
index c2de865acee031e7c12775c13ea9f963c59b86ce..eb2d828ac9b13805b00183e0b9ff94685cf7d054 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;
@@ -55,8 +51,8 @@ enum wxSashEdgePosition {
 class wxSashWindow: public wxWindow
 {
 public:
-    %addtofunc wxSashWindow         "self._setOORInfo(self)"
-    %addtofunc wxSashWindow()       ""
+    %pythonAppend wxSashWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSashWindow()       ""
 
     wxSashWindow(wxWindow* parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
@@ -241,8 +237,8 @@ public:
 class wxSashLayoutWindow: public wxSashWindow
 {
 public:
-    %addtofunc wxSashLayoutWindow         "self._setOORInfo(self)"
-    %addtofunc wxSashLayoutWindow()       ""
+    %pythonAppend wxSashLayoutWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSashLayoutWindow()       ""
     
     wxSashLayoutWindow(wxWindow* parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition,