another fix for HP-UX 11.11 vsscanf, should have been in r51260

[wxWidgets.git] / src / generic / sashwin.cpp

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 945582381a1df054bf5c540ce89116056c0241c3..e4f50b756ed3d39bcc7d37f93c174f49f28407d2 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sashwin.cpp
+// Name:        src/generic/sashwin.cpp

 // Purpose:     wxSashWindow implementation. A sash window has an optional
 //              sash on each edge, allowing it to be dragged. An event
 //              is generated when the sash is released.
 // Purpose:     wxSashWindow implementation. A sash window has an optional
 //              sash on each edge, allowing it to be dragged. An event
 //              is generated when the sash is released.


@@ -15,23 +15,24 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SASH
 
 #endif
 
 #if wxUSE_SASH
 

+#include "wx/sashwin.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/settings.h"

+    #include "wx/dcclient.h"
+    #include "wx/dcscreen.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/math.h"
-

 #include <stdlib.h>
 
 #include <stdlib.h>
 

-#include "wx/dcscreen.h"
-#include "wx/sashwin.h"

 #include "wx/laywin.h"
 
 DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED)
 #include "wx/laywin.h"
 
 DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED)


@@ -45,7 +46,7 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
     EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
     EVT_SET_CURSOR(wxSashWindow::OnSetCursor)

-#endif // wxMSW
+#endif // __WXMSW__ || __WXMAC__

 
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 


@@ -94,7 +95,7 @@ void wxSashWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 {
 
 void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 {

-    wxCoord x, y;
+    wxCoord x = 0, y = 0;

     event.GetPosition(&x, &y);
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);
     event.GetPosition(&x, &y);
 
     wxSashEdgePosition sashHit = SashHitTest(x, y);


@@ -288,7 +289,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
            ReleaseMouse();
         m_mouseCaptured = false;
     }
            ReleaseMouse();
         m_mouseCaptured = false;
     }

-    else if (event.Moving() && !event.Dragging())
+    else if ((event.Moving() || event.Leaving()) && !event.Dragging())

     {
         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )
     {
         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )


@@ -702,6 +703,6 @@ void wxSashWindow::OnSetCursor(wxSetCursorEvent& event)
     //else: do nothing, in particular, don't call Skip()
 }
 
     //else: do nothing, in particular, don't call Skip()
 }
 

-#endif // wxMSW
+#endif // __WXMSW__ || __WXMAC__

 
 #endif // wxUSE_SASH
 
 #endif // wxUSE_SASH