// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dialog.h"
#endif
#include "wx/msw/private.h"
#include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/ptr_scpd.h"
-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
#include <commdlg.h>
#endif
#define wxDIALOG_DEFAULT_WIDTH 500
#define wxDIALOG_DEFAULT_HEIGHT 500
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// all objects to be deleted during next idle processing - from window.cpp
-extern wxList WXDLLEXPORT wxPendingDelete;
-
-// all frames and modeless dialogs - not static, used in frame.cpp, mdi.cpp &c
-wxWindowList wxModelessWindows;
-
-// all modal dialogs currently shown
-static wxWindowList wxModalDialogs;
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxDialogStyle )
+
+wxBEGIN_FLAGS( wxDialogStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxNO_BORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+
+ // dialog styles
+ wxFLAGS_MEMBER(wxDIALOG_MODAL)
+ wxFLAGS_MEMBER(wxDIALOG_MODELESS)
+ wxFLAGS_MEMBER(wxNO_3D)
+ wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
+ wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+ wxFLAGS_MEMBER(wxCAPTION)
+ wxFLAGS_MEMBER(wxTHICK_FRAME)
+ wxFLAGS_MEMBER(wxSYSTEM_MENU)
+ wxFLAGS_MEMBER(wxRESIZE_BORDER)
+ wxFLAGS_MEMBER(wxRESIZE_BOX)
+ wxFLAGS_MEMBER(wxCLOSE_BOX)
+ wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
+ wxFLAGS_MEMBER(wxMINIMIZE_BOX)
+wxEND_FLAGS( wxDialogStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxDialog)
+ wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxDialog)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+#endif
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------
+
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes
+class wxDialogModalData
+{
+public:
+ wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }
+
+ void RunLoop()
+ {
+ m_evtLoop.Run();
+ }
+
+ void ExitLoop()
+ {
+ m_evtLoop.Exit();
+ }
+
+private:
+ wxModalEventLoop m_evtLoop;
+};
+
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+
// ============================================================================
// implementation
// ============================================================================
m_isShown = FALSE;
- m_windowDisabler = (wxWindowDisabler *)NULL;
+ m_modalData = NULL;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent,
{
Init();
- m_oldFocus = FindFocus();
-
- SetName(name);
-
- wxTopLevelWindows.Append(this);
-
- if ( parent )
- parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if (x < 0)
- x = wxDIALOG_DEFAULT_X;
- if (y < 0)
- y = wxDIALOG_DEFAULT_Y;
+ SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
- m_windowStyle = style;
-
- if (width < 0)
- width = wxDIALOG_DEFAULT_WIDTH;
- if (height < 0)
- height = wxDIALOG_DEFAULT_HEIGHT;
+ // save focus before doing anything which can potentially change it
+ m_oldFocus = FindFocus();
// All dialogs should really have this style
- m_windowStyle |= wxTAB_TRAVERSAL;
-
- WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
- 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)
- const wxChar *dlg;
- if ( style & wxRESIZE_BORDER )
- dlg = wxT("wxResizeableDialog");
- else if ( style & wxCAPTION )
- dlg = wxT("wxCaptionDialog");
- else
- dlg = wxT("wxNoCaptionDialog");
- MSWCreate(m_windowId, parent, NULL, this, NULL,
- x, y, width, height,
- 0, // style is not used if we have dlg template
- dlg,
- extendedStyle);
-
- HWND hwnd = (HWND)GetHWND();
-
- if ( !hwnd )
- {
- wxFAIL_MSG(_("Failed to create dialog. You probably forgot to include wx/msw/wx.rc in your resources."));
+ style |= wxTAB_TRAVERSAL;
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
- }
-
- SubclassWin(GetHWND());
- SetWindowText(hwnd, title);
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
}
{
m_isBeingDeleted = TRUE;
- wxTopLevelWindows.DeleteObject(this);
-
// this will also reenable all the other windows for a modal dialog
Show(FALSE);
-
- if ( !IsModal() )
- wxModelessWindows.DeleteObject(this);
-
- // If this is the last top-level window, exit.
- if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
- {
- wxTheApp->SetTopWindow(NULL);
-
- if ( wxTheApp->GetExitOnFrameDelete() )
- {
- ::PostQuitMessage(0);
- }
- }
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
-// Windows dialog boxes can't be iconized
+// showing the dialogs
// ----------------------------------------------------------------------------
-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-}
-
-bool wxDialog::IsIconized() const
+bool wxDialog::IsModal() const
{
- return FALSE;
+ return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
}
-// ----------------------------------------------------------------------------
-// size/position handling
-// ----------------------------------------------------------------------------
-
-void wxDialog::DoSetClientSize(int width, int height)
+bool wxDialog::IsModalShowing() const
{
- HWND hWnd = (HWND) GetHWND();
- RECT rect;
- ::GetClientRect(hWnd, &rect);
-
- RECT rect2;
- GetWindowRect(hWnd, &rect2);
-
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window
- int actual_width = rect2.right - rect2.left - rect.right + width;
- int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
-
- MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
-
- wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ return m_modalData != NULL;
}
-void wxDialog::DoGetPosition(int *x, int *y) const
+wxWindow *wxDialog::FindSuitableParent() const
{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
-
- if ( x )
- *x = rect.left;
- if ( y )
- *y = rect.top;
-}
-
-// ----------------------------------------------------------------------------
-// showing the dialogs
-// ----------------------------------------------------------------------------
+ // 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();
+ }
-bool wxDialog::IsModal() const
-{
- return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
-}
+ // finally, check if the parent we found is really suitable
+ if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+ {
+ // don't use this one
+ parent = NULL;
+ }
-bool wxDialog::IsModalShowing() const
-{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ return parent;
}
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;
hwndOldFocus = GetHwndOf(parent);
}
- // disable all other app windows
- wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
-
- m_windowDisabler = new wxWindowDisabler(this);
-
// enter the modal loop
- while ( IsModalShowing() )
{
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- ;
-
- // a message came or no more idle processing to do
- wxTheApp->DoMessage();
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
}
// and restore focus
bool wxDialog::Show(bool show)
{
- if ( !show )
+ if ( !show && m_modalData )
{
- // if we had disabled other app windows, reenable them back now because
+ // we need to do this before calling wxDialogBase version because if we
+ // had disabled other app windows, they must be reenabled right now as
// if they stay disabled Windows will activate another window (one
- // which is enabled, anyhow) and we will lose activation
- if ( m_windowDisabler )
- {
- delete m_windowDisabler;
- m_windowDisabler = NULL;
- }
+ // which is enabled, anyhow) when we're hidden in the base class Show()
+ // and we will lose activation
+ m_modalData->ExitLoop();
}
// ShowModal() may be called for already shown dialog
if ( show )
{
- // usually will result in TransferDataToWindow() being called
+ // 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();
+
+ // this usually will result in TransferDataToWindow() being called
InitDialog();
}
- if ( IsModal() )
+ if ( show && IsModal() )
{
- 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
+ // modal dialog needs a parent window, so try to find one
+ if ( !GetParent() )
{
- // this will cause IsModalShowing() return FALSE and our local
- // message loop will terminate
- wxModalDialogs.DeleteObject(this);
+ m_parent = FindSuitableParent();
}
+
+ DoShowModal();
}
return TRUE;
}
+void wxDialog::Raise()
+{
+ ::SetForegroundWindow(GetHwnd());
+}
+
// a special version for Show(TRUE) for modal dialogs which returns return code
int wxDialog::ShowModal()
{
closing.DeleteObject(this);
}
-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
-{
- wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
- _T("wxDialog destroyed twice") );
-
- wxPendingDelete.Append(this);
-
- return TRUE;
-}
-
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
#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(wxFULL_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:
// typically, wxBeginBusyCursor() is called and then a modal dialog
rc = FALSE;
}
break;
+#endif // __WXMICROWIN__
}
if ( !processed )
projects / wxWidgets.git / blobdiff