compilation fix for recent commit

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

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 53fab3546221f466f0dcb490b43563a4ad267d2e..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;
 


@@ -69,19 +70,19 @@ public:
     wxSplitterWindow(wxWindow *parent, wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
     wxSplitterWindow(wxWindow *parent, wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,

-                     long style = wxSP_3D|wxCLIP_CHILDREN,
+                     long style = wxSP_3D,

                      const wxString& name = "splitter")
     {
         Init();
         Create(parent, id, pos, size, style, name);
     }
 
                      const wxString& name = "splitter")
     {
         Init();
         Create(parent, id, pos, size, style, name);
     }
 

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

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

-                     long style = wxSP_3D|wxCLIP_CHILDREN,
+                     long style = wxSP_3D,

                      const wxString& name = "splitter");
 
     // Gets the only or left/top pane
                      const wxString& name = "splitter");
 
     // Gets the only or left/top pane


@@ -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()
 };


@@ -323,7 +326,7 @@ private:
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 
 #define EVT_SPLITTER_SASH_POS_CHANGED(id, fn)                               \
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 
 #define EVT_SPLITTER_SASH_POS_CHANGED(id, fn)                               \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,                                \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,                                \
     id,                                                                     \
     -1,                                                                     \


@@ -332,7 +335,7 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
   ),
 
 #define EVT_SPLITTER_SASH_POS_CHANGING(id, fn)                              \
   ),
 
 #define EVT_SPLITTER_SASH_POS_CHANGING(id, fn)                              \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,                               \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,                               \
     id,                                                                     \
     -1,                                                                     \


@@ -341,7 +344,7 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
   ),
 
 #define EVT_SPLITTER_DCLICK(id, fn)                                         \
   ),
 
 #define EVT_SPLITTER_DCLICK(id, fn)                                         \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,                                   \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,                                   \
     id,                                                                     \
     -1,                                                                     \


@@ -350,7 +353,7 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
   ),
 
 #define EVT_SPLITTER_UNSPLIT(id, fn)                                        \
   ),
 
 #define EVT_SPLITTER_UNSPLIT(id, fn)                                        \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_SPLITTER_UNSPLIT,                                         \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_SPLITTER_UNSPLIT,                                         \
     id,                                                                     \
     -1,                                                                     \