// 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)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
+BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
// 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)
{
- m_oldFocus = FindFocus();
+ Init();
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- SetName(name);
-
- wxTopLevelWindows.Append(this);
-
- // windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
-
- if (parent) parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
+ SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
- 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;
-
- m_windowStyle = style;
-
- m_isShown = FALSE;
-
- 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;
+ style |= wxTAB_TRAVERSAL;
- WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
- if (m_windowStyle & wxSTAY_ON_TOP)
- extendedStyle |= WS_EX_TOPMOST;
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ return FALSE;
-#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);
+ SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
- HWND hwnd = (HWND)GetHWND();
+ return TRUE;
+}
- if ( !hwnd )
+bool wxDialog::EnableCloseButton(bool enable)
+{
+#ifndef __WXMICROWIN__
+ // get system (a.k.a. window) menu
+ HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
+ if ( !hmenu )
{
- wxFAIL_MSG(_("Failed to create dialog. You probably forgot to include wx/msw/wx.rc in your resources."));
+ wxLogLastError(_T("GetSystemMenu"));
return FALSE;
}
- SubclassWin(GetHWND());
+ // 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)"));
- SetWindowText(hwnd, title);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ return FALSE;
+ }
+
+ // update appearance immediately
+ if ( !::DrawMenuBar(GetHwnd()) )
+ {
+ wxLogLastError(_T("DrawMenuBar"));
+ }
+#endif
return TRUE;
}
{
m_isBeingDeleted = 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() )
- 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);
- }
- }
}
// ----------------------------------------------------------------------------
event.Skip();
}
-// ----------------------------------------------------------------------------
-// Windows dialog boxes can't be iconized
-// ----------------------------------------------------------------------------
-
-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-}
-
-bool wxDialog::IsIconized() const
-{
- return FALSE;
-}
-
-// ----------------------------------------------------------------------------
-// size/position handling
-// ----------------------------------------------------------------------------
-
-void wxDialog::DoSetClientSize(int width, int height)
-{
- 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);
-}
-
-void wxDialog::DoGetPosition(int *x, int *y) const
-{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
-
- if ( x )
- *x = rect.left;
- if ( y )
- *y = rect.top;
-}
-
// ----------------------------------------------------------------------------
// showing the dialogs
// ----------------------------------------------------------------------------
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().
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& 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
processed = !Close();
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