fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 09fa572b011ccf7245ed24b24a6f57859d05c2ca..8528e2265bcb0ed052509e5aea944551125bbab3 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/window.h"                      // base class declaration
 #endif
 
 #include "wx/window.h"                      // base class declaration

+#include "wx/containr.h"                    // wxControlContainer

 
 class WXDLLEXPORT wxSplitterEvent;
 
 
 class WXDLLEXPORT wxSplitterEvent;
 


@@ -76,7 +77,7 @@ public:
         Create(parent, id, pos, size, style, name);
     }
 
         Create(parent, id, pos, size, style, name);
     }
 

-    ~wxSplitterWindow();
+    virtual ~wxSplitterWindow();

 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,


@@ -209,9 +210,9 @@ protected:
     void SendUnsplitEvent(wxWindow *winRemoved);
 
 protected:
     void SendUnsplitEvent(wxWindow *winRemoved);
 
 protected:

+    // common part of all ctors

     void Init();
 
     void Init();
 

-

     int         m_splitMode;
     bool        m_permitUnsplitAlways;
     bool        m_needUpdating; // when in live mode, set this to TRUE to resize children in idle
     int         m_splitMode;
     bool        m_permitUnsplitAlways;
     bool        m_needUpdating; // when in live mode, set this to TRUE to resize children in idle


@@ -237,6 +238,8 @@ protected:
     wxPen*      m_facePen;
 
 private:
     wxPen*      m_facePen;
 
 private:

+    WX_DECLARE_CONTROL_CONTAINER();
+

     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
 };