1. MSW message handling simplifications

[wxWidgets.git] / include / wx / generic / splitter.h

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 50781e442488c5c0cad6e5cabc56908f4ec354e1..6cbb3453ecc833eebfe655e19a05ea759dcf5d7d 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -83,17 +83,21 @@ public:
     // 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.
-    bool SplitVertically(wxWindow *window1,
-                         wxWindow *window2,
-                         int sashPosition = 0);
-    bool SplitHorizontally(wxWindow *window1,
-                           wxWindow *window2,
-                           int sashPosition = 0);
+    virtual bool SplitVertically(wxWindow *window1,
+                                 wxWindow *window2,
+                                 int sashPosition = 0);
+    virtual bool SplitHorizontally(wxWindow *window1,
+                                   wxWindow *window2,
+                                   int sashPosition = 0);
 
     // Removes the specified (or second) window from the view
     // Doesn't actually delete the window.
     bool Unsplit(wxWindow *toRemove = (wxWindow *) NULL);
 
+    // Replaces one of the windows with another one (neither old nor new
+    // parameter should be NULL)
+    bool ReplaceWindow(wxWindow *winOld, wxWindow *winNew);
+
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 
@@ -121,8 +125,9 @@ public:
 
     // Called when the sash position is about to be changed, return
     // FALSE from here to prevent the change from taking place.
+    // Repositions sash to minimum position if pane would be too small.
     // newSashPosition here is always positive or zero.
-    virtual bool OnSashPositionChange(int newSashPosition);
+    virtual bool OnSashPositionChange(int& newSashPosition);
 
     // If the sash is moved to an extreme position, a subwindow
     // is removed from the splitter window, and the app is