disable VC++ warning 4355 in wx/defs.h once and for all instead of doing it in 4...

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

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index dc767d5b716c6524ad5edff5669ccbaf7056b6d1..4d1f25d8a9ee75a4742bf9d4f1730c25c99f35ba 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -12,10 +12,6 @@
 #ifndef __SPLITTERH_G__
 #define __SPLITTERH_G__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "splitter.h"
-#endif
-
 #include "wx/window.h"                      // base class declaration
 #include "wx/containr.h"                    // wxControlContainer
 
@@ -138,7 +134,7 @@ public:
     bool IsSplit() const { return (m_windowTwo != NULL); }
 
     // Sets the sash size
-    void SetSashSize(int WXUNUSED(width)) { }
+    void SetSashSize(int width) { m_sashSize = width; }
 
     // Sets the border size
     void SetBorderSize(int WXUNUSED(width)) { }
@@ -283,6 +279,7 @@ protected:
     int         m_oldY;
     int         m_sashPosition; // Number of pixels from left or top
     double      m_sashGravity;
+    int         m_sashSize;
     wxSize      m_lastSize;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging
@@ -389,7 +386,7 @@ private:
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 
 #define wxSplitterEventHandler(func) \
-    (wxObjectEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func)
 
 #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))