use wxALIGN_LEFT/CENTRE/RIGHT instead of wxTE_XXX to avoid problems with the latter...

[wxWidgets.git] / interface / wx / splitter.h

diff --git a/interface/wx/splitter.h b/interface/wx/splitter.h
index e1838691d63f4463f29b6a5eb0bb0d38f1accadd..7269d4a9b084e209f66654fed0cb14575affd0dc 100644 (file)
--- a/interface/wx/splitter.h
+++ b/interface/wx/splitter.h
@@ -37,7 +37,7 @@
     @endStyleTable
 
 
     @endStyleTable
 
 

-    @beginEventTable{wxSplitterEvent}
+    @beginEventEmissionTable{wxSplitterEvent}

     @event{EVT_SPLITTER_SASH_POS_CHANGING(id, func)}
         The sash position is in the process of being changed.
         May be used to modify the position of the tracking bar to properly
     @event{EVT_SPLITTER_SASH_POS_CHANGING(id, func)}
         The sash position is in the process of being changed.
         May be used to modify the position of the tracking bar to properly


@@ -95,7 +95,7 @@ public:
 
         @see Initialize(), SplitVertically(), SplitHorizontally(), Create()
     */
 
         @see Initialize(), SplitVertically(), SplitHorizontally(), Create()
     */

-    wxSplitterWindow(wxWindow* parent, wxWindowID id,
+    wxSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,


@@ -110,11 +110,10 @@ public:
         Creation function, for two-step construction.
         See wxSplitterWindow() for details.
     */
         Creation function, for two-step construction.
         See wxSplitterWindow() for details.
     */

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,

                 const wxPoint& point = wxDefaultPosition,
                 const wxPoint& point = wxDefaultPosition,

-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_3D,
-                const wxString& name = "splitterWindow");
+                const wxSize& size = wxDefaultSize, long style = wxSP_3D,
+                const wxString& name = "splitter");

 
     /**
         Returns the current minimum pane size (defaults to zero).
 
     /**
         Returns the current minimum pane size (defaults to zero).


@@ -142,7 +141,7 @@ public:
 
         @see SetSplitMode(), SplitVertically(), SplitHorizontally().
     */
 
         @see SetSplitMode(), SplitVertically(), SplitHorizontally().
     */

-    int GetSplitMode() const;
+    wxSplitMode GetSplitMode() const;

 
     /**
         Returns the left/top or only pane.
 
     /**
         Returns the left/top or only pane.


@@ -284,7 +283,7 @@ public:
 
         @see GetSashPosition()
     */
 
         @see GetSashPosition()
     */

-    void SetSashPosition(int position, const bool redraw = true);
+    void SetSashPosition(int position, bool redraw = true);

 
     /**
         Sets the sash size. Normally, the sash size is determined according to the
 
     /**
         Sets the sash size. Normally, the sash size is determined according to the


@@ -330,8 +329,8 @@ public:
 
         @see SplitVertically(), IsSplit(), Unsplit()
     */
 
         @see SplitVertically(), IsSplit(), Unsplit()
     */

-    bool SplitHorizontally(wxWindow* window1, wxWindow* window2,
-                           int sashPosition = 0);
+    virtual bool SplitHorizontally(wxWindow* window1, wxWindow* window2,
+                                   int sashPosition = 0);

 
     /**
         Initializes the left and right panes of the splitter window.
 
     /**
         Initializes the left and right panes of the splitter window.


@@ -357,8 +356,8 @@ public:
 
         @see SplitHorizontally(), IsSplit(), Unsplit().
     */
 
         @see SplitHorizontally(), IsSplit(), Unsplit().
     */

-    bool SplitVertically(wxWindow* window1, wxWindow* window2,
-                         int sashPosition = 0);
+    virtual bool SplitVertically(wxWindow* window1, wxWindow* window2,
+                                 int sashPosition = 0);

 
     /**
         Unsplits the window.
 
     /**
         Unsplits the window.


@@ -424,7 +423,7 @@ public:
     @library{wxcore}
     @category{events}
 
     @library{wxcore}
     @category{events}
 

-    @see wxSplitterWindow, @ref overview_eventhandling
+    @see wxSplitterWindow, @ref overview_events

 */
 class wxSplitterEvent : public wxNotifyEvent
 {
 */
 class wxSplitterEvent : public wxNotifyEvent
 {