X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..e6adf05834e880312efa3d59914ecc1d4f5f78a6:/src/generic/msgdlgg.cpp?ds=sidebyside diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 1fea61eafe..f4f383f676 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_MSGDLG + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" @@ -63,25 +65,23 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, { m_dialogStyle = style; - wxBeginBusyCursor(); - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL ); - + // 1) icon if (style & wxICON_MASK) { wxStaticBitmap *icon = new wxStaticBitmap( - this, -1, wxTheApp->GetStdIcon(style & wxICON_MASK)); + this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK))); 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 ); - + #if wxUSE_STATLINE // 3) static line topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); @@ -92,19 +92,17 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, SetAutoLayout( TRUE ); SetSizer( topsizer ); - + topsizer->SetSizeHints( this ); topsizer->Fit( this ); wxSize size( GetSize() ); if (size.x < size.y*3/2) { size.x = size.y*3/2; - SetSize( size ); + SetSize( size ); } Centre( wxBOTH | wxCENTER_FRAME); - - wxEndBusyCursor(); } void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event)) @@ -127,4 +125,5 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) } } +#endif // wxUSE_MSGDLG