1. wxProgressDialog uses wxWindowDisabler, not (dumb) wxEnableTopLevelWindows
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:
@@ -393,29 +393,14 @@ void wxFrame::PositionStatusBar()
|
||||
if ( !m_frameStatusBar )
|
||||
return;
|
||||
|
||||
// native status bar positions itself, but we must forward the WM_SIZE
|
||||
// messages to it
|
||||
#if wxUSE_NATIVE_STATUSBAR
|
||||
wxStatusBar95 *sb = wxDynamicCast(m_frameStatusBar, wxStatusBar95);
|
||||
if ( sb )
|
||||
{
|
||||
wxSizeEvent event(GetSize(), sb->GetId());
|
||||
event.SetEventObject(sb);
|
||||
int w, h;
|
||||
GetClientSize(&w, &h);
|
||||
int sw, sh;
|
||||
m_frameStatusBar->GetSize(&sw, &sh);
|
||||
|
||||
sb->GetEventHandler()->ProcessEvent(event);
|
||||
}
|
||||
else
|
||||
#endif // wxUSE_NATIVE_STATUSBAR
|
||||
{
|
||||
int w, h;
|
||||
GetClientSize(&w, &h);
|
||||
int sw, sh;
|
||||
m_frameStatusBar->GetSize(&sw, &sh);
|
||||
|
||||
// Since we wish the status bar to be directly under the client area,
|
||||
// we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
|
||||
m_frameStatusBar->SetSize(0, h, w, sh);
|
||||
}
|
||||
// Since we wish the status bar to be directly under the client area,
|
||||
// we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
|
||||
m_frameStatusBar->SetSize(0, h, w, sh);
|
||||
}
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
|
Reference in New Issue
Block a user