// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/msw/private.h"
#include "wx/log.h"
-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
#include <commdlg.h>
#endif
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
m_windowDisabler = (wxWindowDisabler *)NULL;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent,
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
- return TRUE;
-}
-
-bool wxDialog::EnableCloseButton(bool enable)
-{
-#ifndef __WXMICROWIN__
- // 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("EnableMenuItem(SC_CLOSE)"));
-
- return FALSE;
- }
-
- // update appearance immediately
- if ( !::DrawMenuBar(GetHwnd()) )
- {
- wxLogLastError(_T("DrawMenuBar"));
- }
-#endif
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
}
bool wxDialog::IsModalShowing() const
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ return wxModalDialogs.Find(wxConstCast(this, wxDialog)) != NULL;
+}
+
+wxWindow *wxDialog::FindSuitableParent() const
+{
+ // first try to use the currently active window
+ HWND hwndFg = ::GetForegroundWindow();
+ wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
+ : NULL;
+ if ( !parent )
+ {
+ // next try the main app window
+ parent = wxTheApp->GetTopWindow();
+ }
+
+ // finally, check if the parent we found is really suitable
+ if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+ {
+ // don't use this one
+ parent = NULL;
+ }
+
+ return parent;
}
void wxDialog::DoShowModal()
m_windowDisabler = new wxWindowDisabler(this);
+ // before entering the modal loop, reset the "is in OnIdle()" flag (see
+ // comment in app.cpp)
+ extern bool wxIsInOnIdleFlag;
+ bool wasInOnIdle = wxIsInOnIdleFlag;
+ wxIsInOnIdleFlag = FALSE;
+
// enter the modal loop
while ( IsModalShowing() )
{
wxTheApp->DoMessage();
}
+ wxIsInOnIdleFlag = wasInOnIdle;
+
// 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
if ( show )
{
+ // dialogs don't get WM_SIZE message after creation unlike most (all?)
+ // other windows and so could start their life non laid out correctly
+ // if we didn't call Layout() from here
+ //
+ // NB: normally we should call it just the first time but doing it
+ // every time is simpler than keeping a flag
+ Layout();
+
// usually will result in TransferDataToWindow() being called
InitDialog();
}
// 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
- }
+ m_parent = FindSuitableParent();
}
DoShowModal();
// this will cause IsModalShowing() return FALSE and our local
// message loop will terminate
wxModalDialogs.DeleteObject(this);
+
+ // 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 TRUE;
}
+void wxDialog::Raise()
+{
+ ::SetForegroundWindow(GetHwnd());
+}
+
// a special version for Show(TRUE) for modal dialogs which returns return code
int wxDialog::ShowModal()
{
#if wxUSE_CTL3D
Ctl3dColorChange();
#else
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
#endif
}
switch ( message )
{
-#if 0 // now that we got owner window right it doesn't seem to be needed
- case WM_ACTIVATE:
- switch ( LOWORD(wParam) )
- {
- case WA_ACTIVE:
- case WA_CLICKACTIVE:
- if ( IsModalShowing() && GetParent() )
- {
- // bring the owner window to top as the standard dialog
- // boxes do
- if ( !::SetWindowPos
- (
- GetHwndOf(GetParent()),
- GetHwnd(),
- 0, 0,
- 0, 0,
- SWP_NOACTIVATE |
- SWP_NOMOVE |
- SWP_NOSIZE
- ) )
- {
- 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
// message - otherwise it would close us
processed = !Close();
break;
+ case WM_SIZE:
+ // the Windows dialogs unfortunately are not meant to be resizeable
+ // at all and their standard class doesn't include CS_[VH]REDRAW
+ // styles which means that the window is not refreshed properly
+ // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can
+ // help with it - so we have to refresh it manually which certainly
+ // creates flicker but at least doesn't show garbage on the screen
+ rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+ processed = TRUE;
+ if ( !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
+ {
+ ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */);
+ }
+ break;
+
#ifndef __WXMICROWIN__
case WM_SETCURSOR:
// we want to override the busy cursor for modal dialogs:
projects / wxWidgets.git / blobdiff