// 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);
- if (!parent)
- wxTopLevelWindows.Append(this);
-
- // windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
+ wxTopLevelWindows.Append(this);
- 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_windowStyle & wxSTAY_ON_TOP)
extendedStyle |= WS_EX_TOPMOST;
+#ifndef __WIN16__
+ 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)
if ( !hwnd )
{
- wxLogError(_("Failed to create dialog."));
+ wxFAIL_MSG(_("Failed to create dialog. You probably forgot to include wx/msw/wx.rc in your resources."));
return FALSE;
}
SubclassWin(GetHWND());
SetWindowText(hwnd, title);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+
+ return TRUE;
+}
+
+bool wxDialog::EnableCloseButton(bool enable)
+{
+ // get system (a.k.a. window) menu
+ HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
+ if ( !hmenu )
+ {
+ wxLogLastError(_T("GetSystemMenu"));
+
+ return FALSE;
+ }
+
+ // enabling/disabling the close item from it also automatically
+ // disables/enabling the close title bar button
+ if ( !::EnableMenuItem(hmenu, SC_CLOSE,
+ MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
+ {
+ wxLogLastError(_T("DeleteMenu(SC_CLOSE)"));
+
+ return FALSE;
+ }
+
+ // update appearance immediately
+ if ( !::DrawMenuBar(GetHwnd()) )
+ {
+ wxLogLastError(_T("DrawMenuBar"));
+ }
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() )
void wxDialog::DoShowModal()
{
wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+ wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
wxModalDialogs.Append(this);
wxWindow *parent = GetParent();
+ wxWindow* oldFocus = m_oldFocus;
+
+ // We have to remember the HWND because we need to check
+ // the HWND still exists (oldFocus can be garbage when the dialog
+ // exits, if it has been destroyed)
+ HWND hwndOldFocus = 0;
+ if (oldFocus)
+ hwndOldFocus = (HWND) oldFocus->GetHWND();
+
// remember where the focus was
- if ( !m_oldFocus )
- {
- m_oldFocus = parent;
- }
- if ( !m_oldFocus )
+ if ( !oldFocus )
{
- m_oldFocus = wxTheApp->GetTopWindow();
+ oldFocus = parent;
+ if ( parent )
+ hwndOldFocus = GetHwndOf(parent);
}
- // disable the parent window first
- HWND hwndParent = parent ? GetHwndOf(parent) : (HWND)NULL;
- if ( hwndParent )
- {
- ::EnableWindow(hwndParent, FALSE);
- }
+ // disable all other app windows
+ wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
+
+ m_windowDisabler = new wxWindowDisabler(this);
// enter the modal loop
while ( IsModalShowing() )
wxTheApp->DoMessage();
}
- // reenable the parent window if any
- if ( hwndParent )
- {
- ::EnableWindow(hwndParent, TRUE);
- }
-
// and restore focus
- if ( m_oldFocus && (m_oldFocus != this) )
+ // Note that this code MUST NOT access the dialog object's data
+ // in case the object has been deleted (which will be the case
+ // for a modal dialog that has been destroyed before calling EndModal).
+ if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
{
- m_oldFocus->SetFocus();
+ // This is likely to prove that the object still exists
+ if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+ oldFocus->SetFocus();
}
}
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;
}
}
{
if ( show )
{
+ // modal dialog needs a parent window, so try to find one
+ if ( !GetParent() )
+ {
+ wxWindow *parent = wxTheApp->GetTopWindow();
+ if ( parent && parent != this && parent->IsShown() )
+ {
+ // 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
+ }
+ }
+
DoShowModal();
}
else // end of modal dialog
return TRUE;
}
-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// a special version for Show(TRUE) for modal dialogs which returns return code
int wxDialog::ShowModal()
{
- // modal dialog needs a parent window, so try to find one
- if ( !GetParent() )
- {
- wxWindow *parent = wxTheApp->GetTopWindow();
- if ( parent && parent != this )
- {
- // use it
- m_parent = parent;
- }
- }
-
- wxWindowDisabler *wd = (wxWindowDisabler *)NULL;
- if ( !GetParent() )
+ if ( !IsModal() )
{
- // still no parent? make the dialog app modal by disabling all windows
- wd = new wxWindowDisabler(this);
+ SetModal(TRUE);
}
- m_windowStyle |= wxDIALOG_MODAL;
Show(TRUE);
- delete wd;
-
return GetReturnCode();
}
// ----------------------------------------------------------------------------
// 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) )
{
SWP_NOSIZE
) )
{
- wxLogLastError("SetWindowPos(SWP_NOACTIVATE)");
+ wxLogLastError(wxT("SetWindowPos(SWP_NOACTIVATE)"));
}
}
// 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