X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/389d906b21e2cf2939fad5990383f2b33dcc6373..d2c2afc91be4bdb6e036516785f334ddb54afa0c:/src/generic/msgdlgg.cpp diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 0326abef58..4fd8c800d6 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart, Markus Holzem, Robert Roebling -// Licence: wxWindows license +// Copyright: (c) Julian Smart and Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "msgdlgg.h" #endif @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_MSGDLG +#if wxUSE_MSGDLG && !defined(__WXGTK20__) #ifndef WX_PRECOMP #include "wx/utils.h" @@ -40,6 +40,7 @@ #include "wx/generic/msgdlgg.h" #include "wx/artprov.h" +#include "wx/settings.h" #if wxUSE_STATLINE #include "wx/statline.h" @@ -66,6 +67,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, { m_dialogStyle = style; + bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL ); @@ -76,33 +79,44 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, wxBitmap bitmap; switch ( style & wxICON_MASK ) { + default: + wxFAIL_MSG(_T("incorrect log style")); + // fall through + case wxICON_ERROR: - bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); break; + bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); + break; + case wxICON_INFORMATION: - bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); break; + bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); + break; + case wxICON_WARNING: - bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); break; + bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); + break; + case wxICON_QUESTION: - bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX); break; - default: - wxFAIL_MSG(_T("incorrect log style")); + bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX); + break; } wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap); - icon_text->Add( icon, 0, wxCENTER ); + if (is_pda) + topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); + else + icon_text->Add( icon, 0, wxCENTER ); } // 2) text icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 ); - topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); + topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); -#if wxUSE_STATLINE // 3) static line topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif // 4) buttons - topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 ); + topsizer->Add( CreateButtonSizer( style & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ), + 0, wxCENTRE | wxALL, 10 ); SetAutoLayout( TRUE ); SetSizer( topsizer ); @@ -131,13 +145,13 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event)) void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { - /* Allow cancellation via ESC/Close button except if - only YES and NO are specified. */ + // Allow cancellation via ESC/Close button except if + // only YES and NO are specified. if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) ) { EndModal( wxID_CANCEL ); } } -#endif // wxUSE_MSGDLG +#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)