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

1. wxProgressDialog uses wxWindowDisabler, not (dumb) wxEnableTopLevelWindows

Browse Source 
2. some more wxWindowDisabler bugs fixed (updated dialogs sample to test them)
3. Esc won't close the dialogs without cancel button under MSW
4. status bar can be child of windows of clases other than wxFrame
   (updated statbar sample to show it)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-12 00:26:21 +00:00
parent 5028104652
commit cbc66a2704
10 changed files with 128 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/dialog.cpp
View File

@@ -235,24 +235,26 @@ wxDialog::~wxDialog()
// By default, pressing escape cancels the dialog
void wxDialog::OnCharHook(wxKeyEvent& event)
{
if (GetHWND())
{
if (event.m_keyCode == WXK_ESCAPE)
if (GetHWND())
{
// Behaviour changed in 2.0: we'll send a Cancel message
// to the dialog instead of Close.
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(cancelEvent);
// "Esc" works as an accelerator for the "Cancel" button, but it
// shouldn't close the dialog which doesn't have any cancel button
if ( (event.m_keyCode == WXK_ESCAPE) && FindWindow(wxID_CANCEL) )
{
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(cancelEvent);
// ensure that there is another message for this window so the
// ShowModal loop will exit and won't get stuck in GetMessage().
::PostMessage(GetHwnd(), WM_NULL, 0, 0);
return;
// ensure that there is another message for this window so the
// ShowModal loop will exit and won't get stuck in GetMessage().
::PostMessage(GetHwnd(), WM_NULL, 0, 0);
return;
}
}
}
// We didn't process this event.
event.Skip();
// We didn't process this event.
event.Skip();
}
// ----------------------------------------------------------------------------