// 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__
- #pragma implementation "dialog.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/dialog.h"
+
#ifndef WX_PRECOMP
- #include "wx/dialog.h"
+ #include "wx/msw/wrapcdlg.h"
#include "wx/utils.h"
#include "wx/frame.h"
#include "wx/app.h"
+ #include "wx/button.h"
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/toolbar.h"
#endif
#include "wx/msw/private.h"
-#include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/ptr_scpd.h"
-#if wxUSE_COMMON_DIALOGS
- #include <commdlg.h>
-#endif
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ #include "wx/msw/wince/resources.h"
+#endif // __SMARTPHONE__ && __WXWINCE__
// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// default dialog pos and size
-
-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
-
-#define wxDIALOG_DEFAULT_WIDTH 500
-#define wxDIALOG_DEFAULT_HEIGHT 500
-
-// ----------------------------------------------------------------------------
-// globals
+// wxWin macros
// ----------------------------------------------------------------------------
-// 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;
+#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(wxWS_EX_VALIDATE_RECURSIVELY)
+ wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+ wxFLAGS_MEMBER(wxCAPTION)
+#if WXWIN_COMPATIBILITY_2_6
+ wxFLAGS_MEMBER(wxTHICK_FRAME)
+#endif // WXWIN_COMPATIBILITY_2_6
+ wxFLAGS_MEMBER(wxSYSTEM_MENU)
+ wxFLAGS_MEMBER(wxRESIZE_BORDER)
+#if WXWIN_COMPATIBILITY_2_6
+ wxFLAGS_MEMBER(wxRESIZE_BOX)
+#endif // WXWIN_COMPATIBILITY_2_6
+ 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 , EMPTY_MACROVALUE , 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)
-// all modal dialogs currently shown
-static wxWindowList wxModalDialogs;
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+#endif
// ----------------------------------------------------------------------------
-// wxWin macros
+// wxDialogModalData
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+// 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) { }
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
- EVT_BUTTON(wxID_OK, wxDialog::OnOK)
- EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
- EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
+ void RunLoop()
+ {
+ m_evtLoop.Run();
+ }
- EVT_CHAR_HOOK(wxDialog::OnCharHook)
+ void ExitLoop()
+ {
+ m_evtLoop.Exit();
+ }
- EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
+private:
+ wxModalEventLoop m_evtLoop;
+};
- EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)
// ============================================================================
// implementation
// wxDialog construction
// ----------------------------------------------------------------------------
-wxDialog::wxDialog()
+void wxDialog::Init()
{
- m_isShown = FALSE;
-
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ m_oldFocus = (wxWindow *)NULL;
+ m_isShown = false;
+ m_modalData = NULL;
+ m_endModalCalled = false;
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ m_dialogToolBar = NULL;
+#endif
}
-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)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- SetName(name);
-
- if (!parent)
- 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;
-
- WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
- if (m_windowStyle & wxSTAY_ON_TOP)
- extendedStyle |= WS_EX_TOPMOST;
-
- // 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 )
- {
- wxLogError(_("Failed to create dialog."));
+ style |= wxTAB_TRAVERSAL;
- return FALSE;
- }
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ return false;
- SubclassWin(GetHWND());
+ if ( !m_hasFont )
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- SetWindowText(hwnd, title);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ SetLeftMenu(wxID_OK, _("OK"));
+#endif
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ CreateToolBar();
+#endif
- return TRUE;
+ return true;
}
-void wxDialog::SetModal(bool flag)
+#if WXWIN_COMPATIBILITY_2_6
+
+// deprecated ctor
+wxDialog::wxDialog(wxWindow *parent,
+ const wxString& title,
+ bool WXUNUSED(modal),
+ int x,
+ int y,
+ int w,
+ int h,
+ long style,
+ const wxString& name)
{
- if ( flag )
- {
- m_windowStyle |= wxDIALOG_MODAL;
-
- wxModelessWindows.DeleteObject(this);
- }
- else
- {
- m_windowStyle &= ~wxDIALOG_MODAL;
+ Init();
- wxModelessWindows.Append(this);
- }
+ Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
}
-wxDialog::~wxDialog()
+void wxDialog::SetModal(bool WXUNUSED(flag))
{
- m_isBeingDeleted = TRUE;
-
- wxTopLevelWindows.DeleteObject(this);
-
- Show(FALSE);
-
- // VZ: this is bogus and breaks focus handling - it won't be returned to
- // the window which had it previosuly if we do this
-#if 0
- if (m_modalShowing)
- {
- // For some reason, wxWindows can activate another task altogether
- // when a frame is destroyed after a modal dialog has been invoked.
- // Try to bring the parent to the top.
- // dfgg: I moved this following line from end of function -
- // must not call if another window is on top!!
- // This can often happen with Close() and delayed deleting
- if (GetParent() && GetParent()->GetHWND())
- ::BringWindowToTop((HWND) GetParent()->GetHWND());
- }
-
- m_modalShowing = FALSE;
-#endif // 0
-
- 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);
- }
- }
+ // nothing to do, obsolete method
}
-// ----------------------------------------------------------------------------
-// kbd handling
-// ----------------------------------------------------------------------------
+#endif // WXWIN_COMPATIBILITY_2_6
-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
+wxDialog::~wxDialog()
{
- if (GetHWND())
- {
- if (event.m_keyCode == WXK_ESCAPE)
- {
- // Behaviour changed in 2.0: we'll send a Cancel message
- // to the dialog instead of Close.
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent);
-
- // 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;
- }
- }
- // We didn't process this event.
- event.Skip();
+ m_isBeingDeleted = true;
+
+ // this will also reenable all the other windows for a modal dialog
+ Show(false);
}
// ----------------------------------------------------------------------------
-// Windows dialog boxes can't be iconized
+// showing the dialogs
// ----------------------------------------------------------------------------
-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-}
+#if WXWIN_COMPATIBILITY_2_6
-bool wxDialog::IsIconized() const
+bool wxDialog::IsModalShowing() const
{
- return FALSE;
+ return IsModal();
}
-// ----------------------------------------------------------------------------
-// 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);
-}
+#endif // WXWIN_COMPATIBILITY_2_6
-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;
-}
+ // 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();
+ }
-// ----------------------------------------------------------------------------
-// showing the dialogs
-// ----------------------------------------------------------------------------
+ // 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::IsModal() const
-{
- return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+ return parent;
}
-// VZ: this is the old version unchanged (reindented only), it will be removed
-// as soon as we're sure the new one works correctly
-#if 0
-
bool wxDialog::Show(bool show)
{
- m_isShown = show;
-
- if (show)
- InitDialog();
+ if ( show == IsShown() )
+ return false;
- bool modal = IsModal();
-
- if (modal)
+ if ( !show && m_modalData )
{
- if (show)
- {
- // find the top level window which had focus before - we will restore
- // focus to it later
- m_hwndOldFocus = 0;
- for ( HWND hwnd = ::GetFocus(); hwnd; hwnd = ::GetParent(hwnd) )
- {
- m_hwndOldFocus = (WXHWND)hwnd;
- }
-
- if (m_modalShowing)
- {
- BringWindowToTop((HWND) GetHWND());
- return TRUE;
- }
-
- m_modalShowing = TRUE;
- wxNode *node = wxModalDialogs.First();
- while (node)
- {
- wxDialog *box = (wxDialog *)node->Data();
- if (box != this)
- ::EnableWindow((HWND) box->GetHWND(), FALSE);
- node = node->Next();
- }
-
- // if we don't do it, some window might be deleted while we have pointers
- // to them in our disabledWindows list and the program will crash when it
- // will try to reenable them after the modal dialog end
- wxTheApp->DeletePendingObjects();
- wxList disabledWindows;
-
- node = wxModelessWindows.First();
- while (node)
- {
- wxWindow *win = (wxWindow *)node->Data();
- if (::IsWindowEnabled((HWND) win->GetHWND()))
- {
- ::EnableWindow((HWND) win->GetHWND(), FALSE);
- disabledWindows.Append(win);
- }
- node = node->Next();
- }
-
- ShowWindow((HWND) GetHWND(), SW_SHOW);
- EnableWindow((HWND) GetHWND(), TRUE);
- BringWindowToTop((HWND) GetHWND());
-
- if ( !wxModalDialogs.Find(this) )
- wxModalDialogs.Append(this);
-
- MSG msg;
- // Must test whether this dialog still exists: we may not process
- // a message before the deletion.
- while (wxModalDialogs.Find(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
- {
- if ( m_acceleratorTable.Ok() &&
- ::TranslateAccelerator((HWND)GetHWND(),
- (HACCEL)m_acceleratorTable.GetHACCEL(),
- &msg) )
- {
- // Have processed the message
- }
- else if ( !wxTheApp->ProcessMessage((WXMSG *)&msg) )
- {
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
-
- // If we get crashes (as per George Tasker's message) with nested modal dialogs,
- // we should try removing the m_modalShowing test
-
- if (m_modalShowing && !::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE))
- // dfgg: NB MUST test m_modalShowing again as the message loop could have triggered
- // a Show(FALSE) in the mean time!!!
- // Without the test, we might delete the dialog before the end of modal showing.
- {
- while (wxTheApp->ProcessIdle() && m_modalShowing)
- {
- // Keep going until we decide we've done enough
- }
- }
- }
- // dfgg: now must specifically re-enable all other app windows that we disabled earlier
- node=disabledWindows.First();
- while(node) {
- wxWindow* win = (wxWindow*) node->Data();
- if (wxModalDialogs.Find(win) || wxModelessWindows.Find(win))
- {
- HWND hWnd = (HWND) win->GetHWND();
- if (::IsWindow(hWnd))
- ::EnableWindow(hWnd,TRUE);
- }
- node=node->Next();
- }
- }
- else // !show
- {
- ::SetFocus((HWND)m_hwndOldFocus);
+ // 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) when we're hidden in the base class Show()
+ // and we will lose activation
+ m_modalData->ExitLoop();
+ }
- wxModalDialogs.DeleteObject(this);
+ if ( show )
+ {
+ // this usually will result in TransferDataToWindow() being called
+ // which will change the controls values so do it before showing as
+ // otherwise we could have some flicker
+ InitDialog();
+ }
- wxNode *last = wxModalDialogs.Last();
+ wxDialogBase::Show(show);
- // If there's still a modal dialog active, we
- // enable it, else we enable all modeless windows
- if (last)
- {
- // VZ: I don't understand what this is supposed to do, so I'll leave
- // it out for now and look for horrible consequences
- wxDialog *box = (wxDialog *)last->Data();
- HWND hwnd = (HWND) box->GetHWND();
-#if 0
- if (box->IsUserEnabled())
-#endif // 0
- EnableWindow(hwnd, TRUE);
- BringWindowToTop(hwnd);
- }
- else
- {
- wxNode *node = wxModelessWindows.First();
- while (node)
- {
- wxWindow *win = (wxWindow *)node->Data();
- HWND hwnd = (HWND) win->GetHWND();
- // Only enable again if not user-disabled.
-#if 0
- if (win->IsUserEnabled())
-#endif // 0
- EnableWindow(hwnd, TRUE);
- node = node->Next();
- }
- }
- // Try to highlight the correct window (the parent)
- HWND hWndParent = 0;
- if (GetParent())
- {
- hWndParent = (HWND) GetParent()->GetHWND();
- if (hWndParent)
- ::BringWindowToTop(hWndParent);
- }
- ShowWindow((HWND) GetHWND(), SW_HIDE);
- m_modalShowing = FALSE;
- }
- }
- else // !modal
+ if ( show )
{
- if (show)
- {
- ShowWindow((HWND) GetHWND(), SW_SHOW);
- BringWindowToTop((HWND) GetHWND());
- }
- else
- {
- // Try to highlight the correct window (the parent)
- HWND hWndParent = 0;
- if (GetParent())
- {
- hWndParent = (HWND) GetParent()->GetHWND();
- if (hWndParent)
- ::BringWindowToTop(hWndParent);
- }
-
- if ( m_hWnd )
- ShowWindow((HWND) GetHWND(), SW_HIDE);
- }
+ // 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();
}
- return TRUE;
+ return true;
}
-#else // 1
-
-bool wxDialog::IsModalShowing() const
+void wxDialog::Raise()
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ ::SetForegroundWindow(GetHwnd());
}
-void wxDialog::DoShowModal()
+// show dialog modally
+int wxDialog::ShowModal()
{
- wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+ wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
- wxModalDialogs.Append(this);
+ m_endModalCalled = false;
- wxWindow *parent = GetParent();
+ Show();
- // remember where the focus was
- wxWindow *winFocus = FindFocus();
- if ( !winFocus )
- {
- winFocus = parent;
- }
- if ( !winFocus )
+ // EndModal may have been called from InitDialog handler (called from
+ // inside Show()), which would cause an infinite loop if we didn't take it
+ // into account
+ if ( !m_endModalCalled )
{
- winFocus = wxTheApp->GetTopWindow();
- }
-
- // disable the parent window first
- HWND hwndParent = parent ? GetHwndOf(parent) : (HWND)NULL;
- if ( hwndParent )
- {
- ::EnableWindow(hwndParent, FALSE);
- }
-
- // 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();
- }
+ // modal dialog needs a parent window, so try to find one
+ wxWindow *parent = GetParent();
+ if ( !parent )
+ {
+ parent = FindSuitableParent();
+ }
- // reenable the parent window if any
- if ( hwndParent )
- {
- ::EnableWindow(hwndParent, TRUE);
- }
+ // remember where the focus was
+ wxWindow *oldFocus = m_oldFocus;
+ if ( !oldFocus )
+ {
+ // VZ: do we really want to do this?
+ oldFocus = parent;
+ }
- // and restore focus
- if ( winFocus && (winFocus != this) )
- {
- winFocus->SetFocus();
- }
-}
+ // 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 = oldFocus ? GetHwndOf(oldFocus) : NULL;
-bool wxDialog::Show(bool show)
-{
- if ( !wxDialogBase::Show(show) )
- {
- // nothing to do
- return FALSE;
- }
- if ( show )
- {
- // usually will result in TransferDataToWindow() being called
- InitDialog();
- }
-
- if ( IsModal() )
- {
- if ( show )
+ // enter and run the modal loop
{
- DoShowModal();
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
}
- else // end of modal dialog
+
+
+ // 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
+ // for a modal dialog that has been destroyed before calling EndModal).
+ if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
{
- // this will cause IsModalShowing() return FALSE and our local
- // message loop will terminate
- wxModalDialogs.DeleteObject(this);
+ // This is likely to prove that the object still exists
+ if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+ oldFocus->SetFocus();
}
}
- return TRUE;
-}
-
-#endif // 0/1
-
-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal()
-{
- m_windowStyle |= wxDIALOG_MODAL;
- Show(TRUE);
return GetReturnCode();
}
-// NB: this function (surprizingly) may be called for both modal and modeless
-// dialogs and should work for both of them
void wxDialog::EndModal(int retCode)
{
+ wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+
+ m_endModalCalled = true;
SetReturnCode(retCode);
- Show(FALSE);
+
+ Hide();
}
// ----------------------------------------------------------------------------
// wxWin event handlers
// ----------------------------------------------------------------------------
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
+#ifdef __POCKETPC__
+// Responds to the OK button in a PocketPC titlebar. This
+// can be overridden, or you can change the id used for
+// sending the event, by calling SetAffirmativeId.
+bool wxDialog::DoOK()
{
- if ( Validate() && TransferDataFromWindow() )
- {
- EndModal(wxID_OK);
- }
-}
+ const int idOk = GetAffirmativeId();
+ if ( EmulateButtonClickIfPresent(idOk) )
+ return true;
-void wxDialog::OnApply(wxCommandEvent& event)
-{
- if ( Validate() )
- TransferDataFromWindow();
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+ event.SetEventObject(this);
- // TODO probably need to disable the Apply button until things change again
+ return GetEventHandler()->ProcessEvent(event);
}
+#endif // __POCKETPC__
-void wxDialog::OnCancel(wxCommandEvent& event)
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+// create main toolbar by calling OnCreateToolBar()
+wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name)
{
- EndModal(wxID_CANCEL);
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
- // We'll send a Cancel message by default, which may close the dialog.
- // Check for looping if the Cancel event handler calls Close().
-
- // Note that if a cancel button and handler aren't present in the dialog,
- // nothing will happen when you close the dialog via the window manager, or
- // via Close(). We wouldn't want to destroy the dialog by default, since
- // the dialog may have been created on the stack. However, this does mean
- // that calling dialog->Close() won't delete the dialog unless the handler
- // for wxID_CANCEL does so. So use Destroy() if you want to be sure to
- // destroy the dialog. The default OnCancel (above) simply ends a modal
- // dialog, and hides a modeless dialog.
+ m_dialogToolBar = OnCreateToolBar(style, winid, name);
- // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
- // lists here? don't dare to change it now, but should be done later!
- static wxList closing;
-
- if ( closing.Member(this) )
- return;
-
- closing.Append(this);
-
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
-
- closing.DeleteObject(this);
+ return m_dialogToolBar;
}
-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
+// return a new toolbar
+wxToolBar *wxDialog::OnCreateToolBar(long style,
+ wxWindowID winid,
+ const wxString& name)
{
- wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
- _T("wxDialog destroyed twice") );
-
- wxPendingDelete.Append(this);
-
- return TRUE;
+ return new wxToolMenuBar(this, winid,
+ wxDefaultPosition, wxDefaultSize,
+ style, name);
}
-
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-#if wxUSE_CTL3D
- Ctl3dColorChange();
-#else
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- Refresh();
#endif
-}
// ---------------------------------------------------------------------------
-// dialog window proc
+// dialog Windows messages processing
// ---------------------------------------------------------------------------
-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
- long rc = 0;
- bool processed = FALSE;
+ WXLRESULT rc = 0;
+ bool processed = false;
switch ( message )
{
+#ifdef __WXWINCE__
+ // react to pressing the OK button in the title
+ case WM_COMMAND:
+ {
+ switch ( LOWORD(wParam) )
+ {
+#ifdef __POCKETPC__
+ case IDOK:
+ processed = DoOK();
+ if (!processed)
+ processed = !Close();
+#endif
+#ifdef __SMARTPHONE__
+ case IDM_LEFT:
+ case IDM_RIGHT:
+ processed = HandleCommand( LOWORD(wParam) , 0 , NULL );
+ break;
+#endif // __SMARTPHONE__
+ }
+ break;
+ }
+#endif
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
+ // is shown, but the modal dialog shouldn't have hourglass cursor
+ if ( IsModal() && wxIsBusy() )
+ {
+ // set our cursor for all windows (but see below)
+ wxCursor cursor = m_cursor;
+ if ( !cursor.Ok() )
+ cursor = wxCURSOR_ARROW;
+
+ ::SetCursor(GetHcursorOf(cursor));
+
+ // in any case, stop here and don't let wxWindow process this
+ // message (it would set the busy cursor)
+ processed = true;
+
+ // but return false to tell the child window (if the event
+ // comes from one of them and not from ourselves) that it can
+ // set its own cursor if it has one: thus, standard controls
+ // (e.g. text ctrl) still have correct cursors in a dialog
+ // invoked while wxIsBusy()
+ rc = false;
+ }
+ break;
+#endif // __WXMICROWIN__
}
if ( !processed )
return rc;
}
-
-#if wxUSE_CTL3D
-
-// Define for each class of dialog and control
-WXHBRUSH wxDialog::OnCtlColor(WXHDC WXUNUSED(pDC),
- WXHWND WXUNUSED(pWnd),
- WXUINT WXUNUSED(nCtlColor),
- WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam)
-{
- return (WXHBRUSH)Ctl3dCtlColorEx(message, wParam, lParam);
-}
-
-#endif // wxUSE_CTL3D
-
projects / wxWidgets.git / blobdiff