X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..83cbb9e995edca4f729aab005df43f23be8f3261:/wxPython/src/_splitter.i diff --git a/wxPython/src/_splitter.i b/wxPython/src/_splitter.i index 67a2649160..557e02eefb 100644 --- a/wxPython/src/_splitter.i +++ b/wxPython/src/_splitter.i @@ -15,11 +15,7 @@ //--------------------------------------------------------------------------- -%{ - static const wxChar* wxSplitterNameStr = wxT("splitter"); - DECLARE_DEF_STRING(SplitterNameStr); -%} - +MAKE_CONST_WXSTRING2(SplitterNameStr, wxT("splitter")); //--------------------------------------------------------------------------- %newgroup @@ -31,6 +27,7 @@ enum { wxSP_LIVE_UPDATE, wxSP_3DSASH, wxSP_3DBORDER, + wxSP_NO_XP_THEME, wxSP_BORDER, wxSP_3D, }; @@ -57,18 +54,20 @@ enum class wxSplitterWindow: public wxWindow { public: - %addtofunc wxSplitterWindow "self._setOORInfo(self)" - %addtofunc wxSplitterWindow() "" + %pythonPrepend wxSplitterWindow "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']" + %pythonPrepend wxSplitterWindow() "" + %pythonAppend wxSplitterWindow "self._setOORInfo(self)" + %pythonAppend wxSplitterWindow() "" wxSplitterWindow(wxWindow* parent, wxWindowID id, - const wxPoint& point = wxDefaultPosition, + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=wxSP_3D, const wxString& name = wxPySplitterNameStr); %name(PreSplitterWindow)wxSplitterWindow(); bool Create(wxWindow* parent, wxWindowID id, - const wxPoint& point = wxDefaultPosition, + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=wxSP_3D, const wxString& name = wxPySplitterNameStr); @@ -90,7 +89,7 @@ public: // Associates the given window with window 2, drawing the appropriate sash // and changing the split mode. - // Does nothing and returns FALSE if the window is already split. + // Does nothing and returns False if the window is already split. // A sashPosition of 0 means choose a default sash position, // negative sashPosition specifies the size of right/lower pane as it's // absolute value rather than the size of left/upper pane. @@ -126,7 +125,7 @@ public: int GetBorderSize() const; // Set the sash position - void SetSashPosition(int position, bool redraw = TRUE); + void SetSashPosition(int position, bool redraw = True); // Gets the sash position int GetSashPosition() const;