X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/448af9a46eb58ae17616a4d5e76884dc519f5523..64d78265d0256eb00ae59b717aa97e4c5786e003:/src/generic/sashwin.cpp?ds=sidebyside diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp index 18b56afa7b..5f4aac2abe 100644 --- a/src/generic/sashwin.cpp +++ b/src/generic/sashwin.cpp @@ -26,9 +26,7 @@ #include "wx/wx.h" #endif -#if !wxUSE_SASH - #error "Thisfile requires wxUSE_SASH to be defined." -#endif // wxUSE_SASH +#if wxUSE_SASH #include #include @@ -38,7 +36,6 @@ #include "wx/sashwin.h" #include "wx/laywin.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent) @@ -47,7 +44,6 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow) EVT_SIZE(wxSashWindow::OnSize) EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent) END_EVENT_TABLE() -#endif wxSashWindow::wxSashWindow() { @@ -109,8 +105,8 @@ void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) void wxSashWindow::OnMouseEvent(wxMouseEvent& event) { - long x, y; - event.Position(&x, &y); + wxCoord x, y; + event.GetPosition(&x, &y); wxSashEdgePosition sashHit = SashHitTest(x, y); @@ -671,3 +667,4 @@ void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash) m_sashes[edge].m_margin = 0; } +#endif // wxUSE_SASH