X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f01da876d87591e1809a8e612723af698eab9f11..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/msw/dialog.cpp?ds=sidebyside diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index eb1db5599b..67144e1bba 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,93 +24,33 @@ #pragma hdrstop #endif +#include "wx/dialog.h" +#include "wx/testing.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" +#include "wx/scopedptr.h" -#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) - #include -#endif +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + #include "wx/msw/wince/resources.h" +#endif // __SMARTPHONE__ && __WXWINCE__ // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -#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) - 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, wxDialogBase) - EVT_BUTTON(wxID_OK, wxDialog::OnOK) - EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) - EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) - - EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) - - EVT_CLOSE(wxDialog::OnCloseWindow) -END_EVENT_TABLE() - // ---------------------------------------------------------------------------- // wxDialogModalData // ---------------------------------------------------------------------------- @@ -140,7 +76,7 @@ private: wxModalEventLoop m_evtLoop; }; -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData) // ============================================================================ // implementation @@ -152,10 +88,14 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); void wxDialog::Init() { - m_oldFocus = (wxWindow *)NULL; - m_isShown = FALSE; + m_isShown = false; m_modalData = NULL; - m_endModalCalled = FALSE; +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + m_dialogToolBar = NULL; +#endif +#if wxUSE_DIALOG_SIZEGRIP + m_hGripper = 0; +#endif // wxUSE_DIALOG_SIZEGRIP } bool wxDialog::Create(wxWindow *parent, @@ -168,124 +108,54 @@ bool wxDialog::Create(wxWindow *parent, { SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); - // save focus before doing anything which can potentially change it - m_oldFocus = FindFocus(); - // All dialogs should really have this style style |= wxTAB_TRAVERSAL; if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) - return FALSE; + return false; if ( !m_hasFont ) SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - - return TRUE; -} +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + SetLeftMenu(wxID_OK, _("OK")); +#endif +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + CreateToolBar(); +#endif -void wxDialog::SetModal(bool flag) -{ - if ( flag ) +#if wxUSE_DIALOG_SIZEGRIP + if ( HasFlag(wxRESIZE_BORDER) ) { - wxModelessWindows.DeleteObject(this); - } - else - { - wxModelessWindows.Append(this); + CreateGripper(); + + Connect(wxEVT_CREATE, + wxWindowCreateEventHandler(wxDialog::OnWindowCreate)); } +#endif // wxUSE_DIALOG_SIZEGRIP + + return true; } wxDialog::~wxDialog() { - m_isBeingDeleted = TRUE; - // this will also reenable all the other windows for a modal dialog - Show(FALSE); + Show(false); + +#if wxUSE_DIALOG_SIZEGRIP + DestroyGripper(); +#endif // wxUSE_DIALOG_SIZEGRIP } // ---------------------------------------------------------------------------- // showing the dialogs // ---------------------------------------------------------------------------- -bool wxDialog::IsModal() const -{ - return !wxModelessWindows.Find(this); -} - -bool wxDialog::IsModalShowing() const -{ - return m_modalData != 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() -{ - 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); - } - - // enter the modal loop - { - wxDialogModalDataTiedPtr modalData(&m_modalData, - new wxDialogModalData(this)); - modalData->RunLoop(); - } - - // 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 @@ -296,150 +166,236 @@ bool wxDialog::Show(bool show) m_modalData->ExitLoop(); } - // ShowModal() may be called for already shown dialog - if ( !wxDialogBase::Show(show) && !(show && IsModal()) ) - { - // nothing to do - return FALSE; - } - 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(); + 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(); } - // EndModal may have been called from InitDialog handler, - // which would cause an infinite loop if we didn't take it - // into account - if ( show && IsModal() && !m_endModalCalled ) - { - // modal dialog needs a parent window, so try to find one - if ( !GetParent() ) - { - m_parent = FindSuitableParent(); - } + wxDialogBase::Show(show); - DoShowModal(); + if ( show ) + { + // dialogs don't get WM_SIZE message from ::ShowWindow() for some + // reason so generate it ourselves for consistency with frames and + // dialogs in other ports + // + // NB: normally we should call it just the first time but doing it + // every time is simpler than keeping a flag + const wxSize size = GetClientSize(); + ::SendMessage(GetHwnd(), WM_SIZE, + SIZE_RESTORED, MAKELPARAM(size.x, size.y)); } - return TRUE; -} - -void wxDialog::Raise() -{ - ::SetForegroundWindow(GetHwnd()); + return true; } -// a special version for Show(TRUE) for modal dialogs which returns return code +// show dialog modally int wxDialog::ShowModal() { - m_endModalCalled = FALSE; - if ( !IsModal() ) + WX_TESTING_SHOW_MODAL_HOOK(); + + wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") ); + + Show(); + + // EndModal may have been called from InitDialog handler (called from + // inside Show()) and hidden the dialog back again + if ( IsShown() ) { - SetModal(TRUE); + // enter and run the modal loop + wxDialogModalDataTiedPtr modalData(&m_modalData, + new wxDialogModalData(this)); + modalData->RunLoop(); } - 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) { - m_endModalCalled = TRUE; + wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") ); + SetReturnCode(retCode); - Show(FALSE); + Hide(); } // ---------------------------------------------------------------------------- -// wxWin event handlers +// wxDialog gripper handling // ---------------------------------------------------------------------------- -// Standard buttons -void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) +#if wxUSE_DIALOG_SIZEGRIP + +void wxDialog::SetWindowStyleFlag(long style) { - if ( Validate() && TransferDataFromWindow() ) - { - EndModal(wxID_OK); - } + wxDialogBase::SetWindowStyleFlag(style); + + if ( HasFlag(wxRESIZE_BORDER) ) + CreateGripper(); + else + DestroyGripper(); } -void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) +void wxDialog::CreateGripper() { - if ( Validate() ) - TransferDataFromWindow(); + if ( !m_hGripper ) + { + // just create it here, it will be positioned and shown later + m_hGripper = (WXHWND)::CreateWindow + ( + wxT("SCROLLBAR"), + wxT(""), + WS_CHILD | + WS_CLIPSIBLINGS | + SBS_SIZEGRIP | + SBS_SIZEBOX | + SBS_SIZEBOXBOTTOMRIGHTALIGN, + 0, 0, 0, 0, + GetHwnd(), + 0, + wxGetInstance(), + NULL + ); + } +} - // TODO probably need to disable the Apply button until things change again +void wxDialog::DestroyGripper() +{ + if ( m_hGripper ) + { + // we used to have trouble with gripper appearing on top (and hence + // overdrawing) the other, real, dialog children -- check that this + // isn't the case automatically (but notice that this could be false if + // we're not shown at all as in this case ResizeGripper() might not + // have been called yet) + wxASSERT_MSG( !IsShown() || + ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0, + wxT("Bug in wxWidgets: gripper should be at the bottom of Z-order") ); + ::DestroyWindow((HWND) m_hGripper); + m_hGripper = 0; + } } -void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) +void wxDialog::ShowGripper(bool show) { - EndModal(wxID_CANCEL); + wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") ); + + if ( show ) + ResizeGripper(); + + ::ShowWindow((HWND)m_hGripper, show ? SW_SHOW : SW_HIDE); } -void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) +void wxDialog::ResizeGripper() { - // We'll send a Cancel message by default, which may close the dialog. - // Check for looping if the Cancel event handler calls Close(). + wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") ); - // 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. + HWND hwndGripper = (HWND)m_hGripper; - // 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; + const wxRect rectGripper = wxRectFromRECT(wxGetWindowRect(hwndGripper)); + const wxSize size = GetClientSize() - rectGripper.GetSize(); - if ( closing.Member(this) ) - return; + ::SetWindowPos(hwndGripper, HWND_BOTTOM, + size.x, size.y, + rectGripper.width, rectGripper.height, + SWP_NOACTIVATE); +} - closing.Append(this); +void wxDialog::OnWindowCreate(wxWindowCreateEvent& event) +{ + if ( m_hGripper && IsShown() && + event.GetWindow() && event.GetWindow()->GetParent() == this ) + { + // Put gripper below the newly created child window + ::SetWindowPos((HWND)m_hGripper, HWND_BOTTOM, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + } + + event.Skip(); +} + +#endif // wxUSE_DIALOG_SIZEGRIP + +// ---------------------------------------------------------------------------- +// wxWin event handlers +// ---------------------------------------------------------------------------- - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog +#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() +{ + const int idOk = GetAffirmativeId(); + if ( EmulateButtonClickIfPresent(idOk) ) + return true; + + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId()); + event.SetEventObject(this); - closing.DeleteObject(this); + return HandleWindowEvent(event); } +#endif // __POCKETPC__ -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) +#if wxUSE_TOOLBAR && defined(__POCKETPC__) +// create main toolbar by calling OnCreateToolBar() +wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name) { -#if wxUSE_CTL3D - Ctl3dColorChange(); -#else - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -#endif + m_dialogToolBar = OnCreateToolBar(style, winid, name); + + return m_dialogToolBar; } +// return a new toolbar +wxToolBar *wxDialog::OnCreateToolBar(long style, + wxWindowID winid, + const wxString& name) +{ + return new wxToolMenuBar(this, winid, + wxDefaultPosition, wxDefaultSize, + style, name); +} +#endif + // --------------------------------------------------------------------------- -// dialog window proc +// dialog Windows messages processing // --------------------------------------------------------------------------- WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { WXLRESULT rc = 0; - bool processed = FALSE; + 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 @@ -447,17 +403,32 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar break; case WM_SIZE: - // the Windows dialogs unfortunately are not meant to be resizeable +#if wxUSE_DIALOG_SIZEGRIP + if ( m_hGripper ) + { + switch ( wParam ) + { + case SIZE_MAXIMIZED: + ShowGripper(false); + break; + + case SIZE_RESTORED: + ShowGripper(true); + } + } +#endif // wxUSE_DIALOG_SIZEGRIP + + // the Windows dialogs unfortunately are not meant to be resizable // 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; + processed = true; if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) ) { - ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */); + ::InvalidateRect(GetHwnd(), NULL, false /* erase bg */); } break; @@ -466,48 +437,32 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar // 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; - if ( !cursor.Ok() ) + if ( !cursor.IsOk() ) 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; + 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__ } if ( !processed ) - rc = wxWindow::MSWWindowProc(message, wParam, lParam); + rc = wxDialogBase::MSWWindowProc(message, wParam, 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 -