]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/sashwin.cpp
EXTRA_LIBS vs. EXTRALIBS change.
[wxWidgets.git] / src / generic / sashwin.cpp
index 18b56afa7b7ae15dede1891a6e931a2246d94aad..5f4aac2abe4b18e25aaf50f11df2f1f0a04e5b6e 100644 (file)
@@ -26,9 +26,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 
-#if !wxUSE_SASH
-    #error "Thisfile requires wxUSE_SASH to be defined."
-#endif // wxUSE_SASH
+#if wxUSE_SASH
 
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>
@@ -38,7 +36,6 @@
 #include "wx/sashwin.h"
 #include "wx/laywin.h"
 
 #include "wx/sashwin.h"
 #include "wx/laywin.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent)
 
 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()
     EVT_SIZE(wxSashWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
 END_EVENT_TABLE()
-#endif
 
 wxSashWindow::wxSashWindow()
 {
 
 wxSashWindow::wxSashWindow()
 {
@@ -109,8 +105,8 @@ void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 void wxSashWindow::OnMouseEvent(wxMouseEvent& 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);
 
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 
@@ -671,3 +667,4 @@ void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)
         m_sashes[edge].m_margin = 0;
 }
 
         m_sashes[edge].m_margin = 0;
 }
 
+#endif // wxUSE_SASH