// wxDialog construction
// ----------------------------------------------------------------------------
-wxDialog::wxDialog()
+void wxDialog::Init()
{
m_oldFocus = (wxWindow *)NULL;
+
m_isShown = FALSE;
+ m_windowDisabler = (wxWindowDisabler *)NULL;
+
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
}
-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
+bool wxDialog::Create(wxWindow *parent,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
{
+ Init();
+
m_oldFocus = FindFocus();
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetName(name);
wxTopLevelWindows.Append(this);
- // windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
-
- if (parent) parent->AddChild(this);
+ if ( parent )
+ parent->AddChild(this);
if ( id == -1 )
m_windowId = (int)NewControlId();
m_windowStyle = style;
- m_isShown = FALSE;
-
if (width < 0)
width = wxDIALOG_DEFAULT_WIDTH;
if (height < 0)
if (m_exStyle & wxDIALOG_EX_CONTEXTHELP)
extendedStyle |= WS_EX_CONTEXTHELP;
#endif
+
// Allows creation of dialogs with & without captions under MSWindows,
// resizeable or not (but a resizeable dialog always has caption -
// otherwise it would look too strange)
SubclassWin(GetHWND());
SetWindowText(hwnd, title);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
}
wxTopLevelWindows.DeleteObject(this);
- // this will call BringWindowToTop() if necessary to bring back our parent
- // window to top
+ // this will also reenable all the other windows for a modal dialog
Show(FALSE);
if ( !IsModal() )
if (oldFocus)
hwndOldFocus = (HWND) oldFocus->GetHWND();
- // inside this block, all app windows are disabled
+ // remember where the focus was
+ if ( !oldFocus )
{
- wxWindowDisabler wd(this);
+ oldFocus = parent;
+ if ( parent )
+ hwndOldFocus = GetHwndOf(parent);
+ }
- // remember where the focus was
- if ( !oldFocus )
- {
- oldFocus = parent;
- if (parent)
- hwndOldFocus = (HWND) parent->GetHWND();
- }
+ // disable all other app windows
+ wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
- // enter the modal loop
- while ( IsModalShowing() )
- {
+ m_windowDisabler = new wxWindowDisabler(this);
+
+ // enter the modal loop
+ while ( IsModalShowing() )
+ {
#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
+ wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- ;
+ while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+ ;
- // a message came or no more idle processing to do
- wxTheApp->DoMessage();
- }
+ // a message came or no more idle processing to do
+ wxTheApp->DoMessage();
}
-#ifdef __WIN32__
- if ( parent )
- ::SetActiveWindow(GetHwndOf(parent));
-#endif // __WIN32__
-
// and restore focus
// Note that this code MUST NOT access the dialog object's data
// in case the object has been deleted (which will be the case
bool wxDialog::Show(bool show)
{
- // The following is required when the parent has been disabled, (modal
- // dialogs, or modeless dialogs with disabling such as wxProgressDialog).
- // Otherwise the parent disappears behind other windows when the dialog is
- // hidden.
if ( !show )
{
- wxWindow *parent = GetParent();
- if ( parent )
+ // if we had disabled other app windows, reenable them back now because
+ // if they stay disabled Windows will activate another window (one
+ // which is enabled, anyhow) and we will lose activation
+ if ( m_windowDisabler )
{
- ::BringWindowToTop(GetHwndOf(parent));
+ delete m_windowDisabler;
+ m_windowDisabler = NULL;
}
}
{
// use it
m_parent = parent;
+
+ // VZ: to make dialog behave properly we should reparent
+ // the dialog for Windows as well - unfortunately,
+ // following the docs for SetParent() results in this
+ // code which plainly doesn't work
+#if 0
+ long dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+ dwStyle &= ~WS_POPUP;
+ dwStyle |= WS_CHILD;
+ ::SetWindowLong(GetHwnd(), GWL_STYLE, dwStyle);
+ ::SetParent(GetHwnd(), GetHwndOf(parent));
+#endif // 0
}
}
// ----------------------------------------------------------------------------
// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
if ( Validate() && TransferDataFromWindow() )
{
}
}
-void wxDialog::OnApply(wxCommandEvent& event)
+void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
{
if ( Validate() )
TransferDataFromWindow();
// TODO probably need to disable the Apply button until things change again
}
-void wxDialog::OnCancel(wxCommandEvent& event)
+void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
EndModal(wxID_CANCEL);
}
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
// We'll send a Cancel message by default, which may close the dialog.
// Check for looping if the Cancel event handler calls Close().
return TRUE;
}
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
#if wxUSE_CTL3D
Ctl3dColorChange();
switch ( message )
{
+#if 0 // now that we got owner window right it doesn't seem to be needed
case WM_ACTIVATE:
switch ( LOWORD(wParam) )
{
// fall through to process it normally as well
}
break;
+#endif // 0
case WM_CLOSE:
// if we can't close, tell the system that we processed the
projects / wxWidgets.git / blobdiff