1. cursor fixes: frame does have hand cursor in the controls sample now,
modal dialogs don't have busy cursor even if wxIsBusy() 2. wxTextCtrl sets client data field in the generated events 3. added wxEnhMetaFile::SetClipboard() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -530,13 +530,28 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
|
||||
case WM_SETCURSOR:
|
||||
// we want to override the busy cursor for modal dialogs:
|
||||
// typically, wxBeginBusyCursor() is called and then a modal dialog
|
||||
// is shown, but the modal dialog shouldn't have this cursor
|
||||
// is shown, but the modal dialog shouldn't have hourglass cursor
|
||||
if ( wxIsBusy() )
|
||||
{
|
||||
rc = TRUE;
|
||||
// set our cursor for all windows (but see below)
|
||||
wxCursor cursor = m_cursor;
|
||||
if ( !cursor.Ok() )
|
||||
cursor = wxCURSOR_ARROW;
|
||||
|
||||
::SetCursor(GetHcursorOf(cursor));
|
||||
|
||||
// in any case, stop here and don't let wxWindow process this
|
||||
// message (it would set the busy cursor)
|
||||
processed = TRUE;
|
||||
|
||||
// but return FALSE to tell the child window (if the event
|
||||
// comes from one of them and not from ourselves) that it can
|
||||
// set its own cursor if it has one: thus, standard controls
|
||||
// (e.g. text ctrl) still have correct cursors in a dialog
|
||||
// invoked while wxIsBusy()
|
||||
rc = FALSE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if ( !processed )
|
||||
|
||||
Reference in New Issue
Block a user