X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f46f4c86b234d87b9c1db889cc130d2d7d31c306..95fd7c35e06b07df649e8ae3e9a89eb0b2dff424:/src/msw/dialog.cpp?ds=sidebyside diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 9e94d472c4..8ecdaa9680 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -47,6 +47,10 @@ #include #endif +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + #include "wx/msw/wince/resources.h" +#endif // __SMARTPHONE__ && __WXWINCE__ + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -63,7 +67,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) @@ -99,7 +103,7 @@ 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) @@ -153,9 +157,9 @@ 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; + m_endModalCalled = false; } bool wxDialog::Create(wxWindow *parent, @@ -175,14 +179,16 @@ bool wxDialog::Create(wxWindow *parent, 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)); +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + SetLeftMenu(wxID_OK, _("OK")); +#endif - return TRUE; + return true; } // deprecated ctor @@ -198,7 +204,7 @@ wxDialog::wxDialog(wxWindow *parent, { Init(); - Create(parent, -1, title, wxPoint(x, y), wxSize(w, h), style, name); + Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name); } void wxDialog::SetModal(bool WXUNUSED(flag)) @@ -208,10 +214,10 @@ void wxDialog::SetModal(bool WXUNUSED(flag)) wxDialog::~wxDialog() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; // this will also reenable all the other windows for a modal dialog - Show(FALSE); + Show(false); } // ---------------------------------------------------------------------------- @@ -247,6 +253,9 @@ wxWindow *wxDialog::FindSuitableParent() const 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 @@ -257,13 +266,16 @@ 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; + // 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?) @@ -273,12 +285,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(); } - return TRUE; + return true; } void wxDialog::Raise() @@ -291,7 +300,7 @@ int wxDialog::ShowModal() { wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); - m_endModalCalled = FALSE; + m_endModalCalled = false; Show(); @@ -348,10 +357,18 @@ void wxDialog::EndModal(int retCode) { wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); - m_endModalCalled = TRUE; + m_endModalCalled = true; SetReturnCode(retCode); - Show(FALSE); + Hide(); +} + +void wxDialog::EndDialog(int rc) +{ + if ( IsModal() ) + EndModal(rc); + else + Hide(); } // ---------------------------------------------------------------------------- @@ -363,7 +380,7 @@ void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { if ( Validate() && TransferDataFromWindow() ) { - EndModal(wxID_OK); + EndDialog(wxID_OK); } } @@ -377,7 +394,7 @@ void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { - EndModal(wxID_CANCEL); + EndDialog(wxID_CANCEL); } void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) @@ -412,12 +429,8 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) { -#if wxUSE_CTL3D - Ctl3dColorChange(); -#else SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); -#endif } // --------------------------------------------------------------------------- @@ -427,26 +440,36 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) 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: - if (LOWORD(wParam) == IDOK) + { + switch ( LOWORD(wParam) ) { - wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton); - if ( btn && btn->IsEnabled() ) - { - // if we do have a cancel button, do press it - btn->MSWCommand(BN_CLICKED, 0 /* unused */); - processed = TRUE; +#ifndef __SMARTPHONE__ + case IDOK: + wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton); + if ( btn && btn->IsEnabled() ) + { + // if we do have a cancel button, do press it + btn->MSWCommand(BN_CLICKED, 0 /* unused */); + processed = true; + break; + } +#else // ifdef __SMARTPHONE__ + case IDM_LEFT: + case IDM_RIGHT: + processed = HandleCommand( LOWORD(wParam) , 0 , NULL ); break; - } +#endif // __SMARTPHONE__ } break; -#endif + } +#endif case WM_CLOSE: // if we can't close, tell the system that we processed the // message - otherwise it would close us @@ -461,10 +484,10 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar // 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; @@ -484,14 +507,14 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar // 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__ @@ -503,18 +526,3 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar 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 -