Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed a couple more samples/controls files; fixed wxSplitterWindow cursors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-19 20:09:44 +00:00
parent 26cf69fe72
commit a93ca20183
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/controls/minimal.def → samples/controls/controls.def
View File

@@ -1,5 +1,5 @@
NAME Minimal NAME Controls
DESCRIPTION 'Minimal wxWindows application' DESCRIPTION 'wxWindows controls sample'
EXETYPE WINDOWS EXETYPE WINDOWS
STUB 'WINSTUB.EXE' STUB 'WINSTUB.EXE'
CODE PRELOAD MOVEABLE DISCARDABLE CODE PRELOAD MOVEABLE DISCARDABLE

0
samples/controls/minimal.rc → samples/controls/controls.rc
View File

9
src/generic/splitter.cpp
View File

@@ -173,7 +173,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
m_dragMode = wxSPLIT_DRAG_NONE; m_dragMode = wxSPLIT_DRAG_NONE;
SetCursor(*wxSTANDARD_CURSOR); SetCursor(*wxSTANDARD_CURSOR);
wxSetCursor(*wxSTANDARD_CURSOR);
} }
else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING) else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
{ {
@@ -259,19 +258,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
if ( m_splitMode == wxSPLIT_VERTICAL ) if ( m_splitMode == wxSPLIT_VERTICAL )
{ {
SetCursor(*m_sashCursorWE); SetCursor(*m_sashCursorWE);
// Windows needs the following
wxSetCursor(*m_sashCursorWE);
} }
else else
{ {
SetCursor(*m_sashCursorNS); SetCursor(*m_sashCursorNS);
wxSetCursor(*m_sashCursorNS);
} }
} }
else else
{ {
SetCursor(*wxSTANDARD_CURSOR); SetCursor(*wxSTANDARD_CURSOR);
wxSetCursor(*wxSTANDARD_CURSOR);
} }
} }
else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) || else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) ||
@@ -280,12 +275,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
if ( m_splitMode == wxSPLIT_VERTICAL ) if ( m_splitMode == wxSPLIT_VERTICAL )
{ {
SetCursor(*m_sashCursorWE); SetCursor(*m_sashCursorWE);
wxSetCursor(*m_sashCursorWE);
} }
else else
{ {
SetCursor(*m_sashCursorNS); SetCursor(*m_sashCursorNS);
wxSetCursor(*m_sashCursorNS);
} }
// Detect that this is really a drag: we've moved more than 1 pixel either way // 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 else
{ {
SetCursor(*wxSTANDARD_CURSOR);
wxSetCursor(*wxSTANDARD_CURSOR);
} }
} }

2
utils/ogl/distrib/ogl.rsp
View File

@@ -24,8 +24,6 @@ samples/ogledit/bitmaps/*.bmp
samples/ogledit/bitmaps/*.gif samples/ogledit/bitmaps/*.gif
samples/ogledit/bitmaps/*.xbm samples/ogledit/bitmaps/*.xbm
lib/dummy
distrib/*.rsp distrib/*.rsp
distrib/*.bat distrib/*.bat