diff --git a/samples/controls/minimal.def b/samples/controls/controls.def similarity index 71% rename from samples/controls/minimal.def rename to samples/controls/controls.def index 060bfe3fce..a6c3f21cf7 100644 --- a/samples/controls/minimal.def +++ b/samples/controls/controls.def @@ -1,5 +1,5 @@ -NAME Minimal -DESCRIPTION 'Minimal wxWindows application' +NAME Controls +DESCRIPTION 'wxWindows controls sample' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/samples/controls/minimal.rc b/samples/controls/controls.rc similarity index 100% rename from samples/controls/minimal.rc rename to samples/controls/controls.rc diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 12b3dda1bc..7f0ec5df0f 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -173,7 +173,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) m_dragMode = wxSPLIT_DRAG_NONE; SetCursor(*wxSTANDARD_CURSOR); - wxSetCursor(*wxSTANDARD_CURSOR); } else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING) { @@ -259,19 +258,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) if ( m_splitMode == wxSPLIT_VERTICAL ) { SetCursor(*m_sashCursorWE); - // Windows needs the following - wxSetCursor(*m_sashCursorWE); } else { SetCursor(*m_sashCursorNS); - wxSetCursor(*m_sashCursorNS); } } else { SetCursor(*wxSTANDARD_CURSOR); - wxSetCursor(*wxSTANDARD_CURSOR); } } else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) || @@ -280,12 +275,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) if ( m_splitMode == wxSPLIT_VERTICAL ) { SetCursor(*m_sashCursorWE); - wxSetCursor(*m_sashCursorWE); } else { SetCursor(*m_sashCursorNS); - wxSetCursor(*m_sashCursorNS); } // Detect that this is really a drag: we've moved more than 1 pixel either way @@ -316,8 +309,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } else { - SetCursor(*wxSTANDARD_CURSOR); - wxSetCursor(*wxSTANDARD_CURSOR); } } diff --git a/utils/ogl/distrib/ogl.rsp b/utils/ogl/distrib/ogl.rsp index 9915234a8d..f7eaa1967c 100644 --- a/utils/ogl/distrib/ogl.rsp +++ b/utils/ogl/distrib/ogl.rsp @@ -24,8 +24,6 @@ samples/ogledit/bitmaps/*.bmp samples/ogledit/bitmaps/*.gif samples/ogledit/bitmaps/*.xbm -lib/dummy - distrib/*.rsp distrib/*.bat