a wxCHECK added

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index d43a1244d3762b2b09fb014b97e6443a5501af08..853774c7858f4c02d80a2dbc04029ddee03bee98 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -6,23 +6,22 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "splitter.h"
-// #pragma interface
+    #pragma implementation "splitter.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+    #include "wx/wx.h"
 #endif
 
 #include <math.h>
@@ -146,6 +145,14 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     long x, y;
     event.Position(&x, &y);
 
+    // reset the cursor
+#ifdef __WXMOTIF__
+    SetCursor(* wxSTANDARD_CURSOR);
+#endif
+#ifdef __WXMSW__
+    SetCursor(wxCursor());
+#endif
+
     if (event.LeftDown())
     {
         if ( SashHitTest(x, y) )
@@ -153,11 +160,11 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             CaptureMouse();
 
             m_dragMode = wxSPLIT_DRAG_DRAGGING;
-           
+
             DrawSashTracker(x, y);
             m_oldX = x;
             m_oldY = y;
-           return;
+            return;
         }
     }
     else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
@@ -243,10 +250,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                     SetCursor(*m_sashCursorNS);
                 }
         }
-        else
-        {
-            SetCursor(*wxSTANDARD_CURSOR);
-        }
     }
     else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) 
     {
@@ -601,7 +604,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     }
     else
     {
-        wxFAIL_MSG("splitter: attempt to remove a non-existent window");
+        wxFAIL_MSG(_T("splitter: attempt to remove a non-existent window"));
 
         return FALSE;
     }
@@ -616,8 +619,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
 // Replace a window with another one
 bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
 {
-    wxCHECK_MSG( winOld, FALSE, "use one of Split() functions instead" );
-    wxCHECK_MSG( winNew, FALSE, "use Unsplit() functions instead" );
+    wxCHECK_MSG( winOld, FALSE, _T("use one of Split() functions instead") );
+    wxCHECK_MSG( winNew, FALSE, _T("use Unsplit() functions instead") );
 
     if ( winOld == m_windowTwo )
     {
@@ -629,7 +632,7 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
     }
     else
     {
-        wxFAIL_MSG("splitter: attempt to replace a non-existent window");
+        wxFAIL_MSG(_T("splitter: attempt to replace a non-existent window"));
 
         return FALSE;
     }