X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fa03f04345b620d1a14529b05961116b20a1297..8feec28c876b20dd98f1c73c694493ab2973226f:/include/wx/generic/splitter.h diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index dc767d5b71..4d1f25d8a9 100644 --- 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))