X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/119727ad9e58e42326764a259a5b88267bb43528..e637208a3210dfae3ee044cc5b7179fd76082769:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 5d86517ffd..83260301ee 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,28 +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 - -#ifdef __SMARTPHONE__ +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) #include "wx/msw/wince/resources.h" -#endif // __SMARTPHONE__ +#endif // __SMARTPHONE__ && __WXWINCE__ // ---------------------------------------------------------------------------- // wxWin macros @@ -84,10 +79,14 @@ wxBEGIN_FLAGS( wxDialogStyle ) 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) @@ -109,16 +108,6 @@ wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Ti 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 // ---------------------------------------------------------------------------- @@ -144,7 +133,7 @@ private: wxModalEventLoop m_evtLoop; }; -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData) // ============================================================================ // implementation @@ -160,6 +149,9 @@ void wxDialog::Init() m_isShown = false; m_modalData = NULL; m_endModalCalled = false; +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + m_dialogToolBar = NULL; +#endif } bool wxDialog::Create(wxWindow *parent, @@ -184,15 +176,18 @@ bool wxDialog::Create(wxWindow *parent, if ( !m_hasFont ) SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - -#ifdef __SMARTPHONE__ +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) SetLeftMenu(wxID_OK, _("OK")); #endif +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + CreateToolBar(); +#endif return true; } +#if WXWIN_COMPATIBILITY_2_6 + // deprecated ctor wxDialog::wxDialog(wxWindow *parent, const wxString& title, @@ -206,7 +201,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)) @@ -214,6 +209,8 @@ void wxDialog::SetModal(bool WXUNUSED(flag)) // nothing to do, obsolete method } +#endif // WXWIN_COMPATIBILITY_2_6 + wxDialog::~wxDialog() { m_isBeingDeleted = true; @@ -226,11 +223,15 @@ wxDialog::~wxDialog() // showing the dialogs // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2_6 + bool wxDialog::IsModalShowing() const { return IsModal(); } +#endif // WXWIN_COMPATIBILITY_2_6 + wxWindow *wxDialog::FindSuitableParent() const { // first try to use the currently active window @@ -365,82 +366,49 @@ void wxDialog::EndModal(int retCode) Hide(); } -void wxDialog::EndDialog(int rc) -{ - if ( IsModal() ) - EndModal(rc); - else - 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() ) - { - EndDialog(wxID_OK); - } -} - -void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) -{ - if ( Validate() ) - TransferDataFromWindow(); + const int idOk = GetAffirmativeId(); + if ( EmulateButtonClickIfPresent(idOk) ) + return true; - // TODO probably need to disable the Apply button until things change again -} + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId()); + event.SetEventObject(this); -void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) -{ - EndDialog(wxID_CANCEL); + return GetEventHandler()->ProcessEvent(event); } +#endif // __POCKETPC__ -void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) +#if wxUSE_TOOLBAR && defined(__POCKETPC__) +// create main toolbar by calling OnCreateToolBar() +wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name) { - // 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; } -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 // --------------------------------------------------------------------------- WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) @@ -456,17 +424,13 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar { switch ( LOWORD(wParam) ) { -#ifndef __SMARTPHONE__ +#ifdef __POCKETPC__ 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__ + processed = DoOK(); + if (!processed) + processed = !Close(); +#endif +#ifdef __SMARTPHONE__ case IDM_LEFT: case IDM_RIGHT: processed = HandleCommand( LOWORD(wParam) , 0 , NULL ); @@ -531,19 +495,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 -