X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6757b5e31cb48dd909754fdd5ceb5947585b76e1..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/dialog.cpp?ds=sidebyside diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 948fd5bc80..4fce3f8d47 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dialog.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,35 +24,27 @@ #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 && !defined(__WXMICROWIN__) - #include -#endif - -// ---------------------------------------------------------------------------- -// 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 +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + #include "wx/msw/wince/resources.h" +#endif // __SMARTPHONE__ && __WXWINCE__ // ---------------------------------------------------------------------------- // wxWin macros @@ -74,7 +62,7 @@ wxBEGIN_FLAGS( wxDialogStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -88,16 +76,17 @@ wxBEGIN_FLAGS( wxDialogStyle ) 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) +#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) @@ -106,67 +95,46 @@ 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 + 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) +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, wxDialogBase) - EVT_BUTTON(wxID_OK, wxDialog::OnOK) - EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) - EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) - - EVT_CHAR_HOOK(wxDialog::OnCharHook) - - EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) - - EVT_CLOSE(wxDialog::OnCloseWindow) -END_EVENT_TABLE() - // ---------------------------------------------------------------------------- // wxDialogModalData // ---------------------------------------------------------------------------- -// this is simply a container for wxEventLoop and wxWindowDisabler which allows -// to have a single opaque pointer in wxDialog itself +// 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() { m_windowDisabler = NULL; } + wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { } - void RunLoop(wxDialog *dialog) + void RunLoop() { - m_windowDisabler = new wxWindowDisabler(dialog); - m_evtLoop.Run(); } void ExitLoop() { - delete m_windowDisabler; - m_windowDisabler = NULL; - m_evtLoop.Exit(); } - ~wxDialogModalData() - { - wxASSERT_MSG( !m_windowDisabler, _T("forgot to call ExitLoop?") ); - } - private: - wxEventLoop m_evtLoop; - wxWindowDisabler *m_windowDisabler; + wxModalEventLoop m_evtLoop; }; +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData) + // ============================================================================ // implementation // ============================================================================ @@ -178,12 +146,12 @@ private: void wxDialog::Init() { m_oldFocus = (wxWindow *)NULL; - - m_isShown = FALSE; - + m_isShown = false; m_modalData = NULL; - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + m_endModalCalled = false; +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + m_dialogToolBar = NULL; +#endif } bool wxDialog::Create(wxWindow *parent, @@ -194,8 +162,6 @@ bool wxDialog::Create(wxWindow *parent, long style, const wxString& name) { - Init(); - SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); // save focus before doing anything which can potentially change it @@ -205,80 +171,33 @@ bool wxDialog::Create(wxWindow *parent, style |= wxTAB_TRAVERSAL; if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) - return FALSE; + return false; - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + if ( !m_hasFont ) + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - return TRUE; -} - -void wxDialog::SetModal(bool flag) -{ - if ( flag ) - { - m_windowStyle |= wxDIALOG_MODAL; - - wxModelessWindows.DeleteObject(this); - } - else - { - m_windowStyle &= ~wxDIALOG_MODAL; +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + SetLeftMenu(wxID_OK, _("OK")); +#endif +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + CreateToolBar(); +#endif - wxModelessWindows.Append(this); - } + return true; } wxDialog::~wxDialog() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; // this will also reenable all the other windows for a modal dialog - Show(FALSE); -} - -// ---------------------------------------------------------------------------- -// kbd handling -// ---------------------------------------------------------------------------- - -// By default, pressing escape cancels the dialog -void wxDialog::OnCharHook(wxKeyEvent& event) -{ - if (GetHWND()) - { - // "Esc" works as an accelerator for the "Cancel" button, but it - // shouldn't close the dialog which doesn't have any cancel button - if ( (event.m_keyCode == WXK_ESCAPE) && FindWindow(wxID_CANCEL) ) - { - 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(); + Show(false); } // ---------------------------------------------------------------------------- // showing the dialogs // ---------------------------------------------------------------------------- -bool wxDialog::IsModal() const -{ - return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; -} - -bool wxDialog::IsModalShowing() const -{ - return m_modalData != NULL; -} - wxWindow *wxDialog::FindSuitableParent() const { // first try to use the currently active window @@ -301,58 +220,11 @@ wxWindow *wxDialog::FindSuitableParent() const return parent; } -void wxDialog::DoShowModal() -{ - wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") ); - wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") ); - - 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 ( !oldFocus ) - { - oldFocus = parent; - if ( parent ) - hwndOldFocus = GetHwndOf(parent); - } - - // 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 - m_modalData = new wxDialogModalData; - m_modalData->RunLoop(this); - delete m_modalData; - m_modalData = NULL; - - 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 - // for a modal dialog that has been destroyed before calling EndModal). - if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus)) - { - // This is likely to prove that the object still exists - if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) - oldFocus->SetFocus(); - } -} - bool wxDialog::Show(bool show) { + if ( show == IsShown() ) + return false; + if ( !show && m_modalData ) { // we need to do this before calling wxDialogBase version because if we @@ -363,13 +235,19 @@ bool wxDialog::Show(bool show) m_modalData->ExitLoop(); } - // ShowModal() may be called for already shown dialog - if ( !wxDialogBase::Show(show) && !(show && IsModal()) ) + if ( show ) { - // nothing to do - return FALSE; + if (CanDoLayoutAdaptation()) + DoLayoutAdaptation(); + + // 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(); } + wxDialogBase::Show(show); + if ( show ) { // dialogs don't get WM_SIZE message after creation unlike most (all?) @@ -379,23 +257,9 @@ bool wxDialog::Show(bool show) // 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 ( show && IsModal() ) - { - // modal dialog needs a parent window, so try to find one - if ( !GetParent() ) - { - m_parent = FindSuitableParent(); - } - - DoShowModal(); - } - - return TRUE; + return true; } void wxDialog::Raise() @@ -403,105 +267,148 @@ void wxDialog::Raise() ::SetForegroundWindow(GetHwnd()); } -// a special version for Show(TRUE) for modal dialogs which returns return code +// show dialog modally int wxDialog::ShowModal() { - if ( !IsModal() ) + wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); + + m_endModalCalled = false; + + Show(); + + // 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 ) { - SetModal(TRUE); - } + // modal dialog needs a parent window, so try to find one + wxWindow *parent = GetParent(); + if ( !parent ) + { + parent = FindSuitableParent(); + } + + // remember where the focus was + wxWindow *oldFocus = m_oldFocus; + if ( !oldFocus ) + { + // VZ: do we really want to do this? + oldFocus = parent; + } + + // 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; + + + // enter and run the modal loop + { + wxDialogModalDataTiedPtr modalData(&m_modalData, + new wxDialogModalData(this)); + modalData->RunLoop(); + } - Show(TRUE); + + // 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 is likely to prove that the object still exists + if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) + oldFocus->SetFocus(); + } + } 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& WXUNUSED(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& WXUNUSED(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 HandleWindowEvent(event); } +#endif // __POCKETPC__ -void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(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& 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(). - - // 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. - - // 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 + m_dialogToolBar = OnCreateToolBar(style, winid, name); - closing.DeleteObject(this); + return m_dialogToolBar; } -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) +// return a new toolbar +wxToolBar *wxDialog::OnCreateToolBar(long style, + wxWindowID winid, + const wxString& name) { -#if wxUSE_CTL3D - Ctl3dColorChange(); -#else - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -#endif + return new wxToolMenuBar(this, winid, + wxDefaultPosition, wxDefaultSize, + style, name); } +#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 @@ -516,10 +423,10 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) // 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) ) + processed = true; + if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) ) { - ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */); + ::InvalidateRect(GetHwnd(), NULL, false /* erase bg */); } break; @@ -528,7 +435,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) // 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 ( IsModalShowing() && wxIsBusy() ) + if ( IsModal() && wxIsBusy() ) { // set our cursor for all windows (but see below) wxCursor cursor = m_cursor; @@ -539,14 +446,14 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) // in any case, stop here and don't let wxWindow process this // message (it would set the busy cursor) - processed = TRUE; + processed = true; - // but return FALSE to tell the child window (if the event + // 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; + rc = false; } break; #endif // __WXMICROWIN__ @@ -557,19 +464,3 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) 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 -