Script updates

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

diff --git a/wxPython/src/_splitter.i b/wxPython/src/_splitter.i
index 67a26491608c4b9fc12f05f97fe7952142fdd0b5..5f839f6287dc38a6d7e90b1ea90bec8554b279b1 100644 (file)
--- 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
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -57,18 +53,20 @@ enum
 class wxSplitterWindow: public wxWindow
 {
 public:
 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,
 
     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 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);
                 const wxSize& size = wxDefaultSize,
                 long style=wxSP_3D,
                 const wxString& name = wxPySplitterNameStr);


@@ -90,7 +88,7 @@ public:
 
     // Associates the given window with window 2, drawing the appropriate sash
     // and changing the split mode.
 
     // 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.
     // 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 +124,7 @@ public:
     int GetBorderSize() const;
 
     // Set the sash position
     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;
 
     // Gets the sash position
     int GetSashPosition() const;