X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6daf794895df62114204499c0c1d54f902be189..f1d93f0beeec9d88f8a225aa35a9ccc163dcdb15:/src/generic/msgdlgg.cpp diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 19aefb7c06..ec65ed52bf 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -46,7 +46,6 @@ // icons // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) @@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) END_EVENT_TABLE() IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog) -#endif wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, @@ -70,20 +68,20 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, 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 ); @@ -94,14 +92,14 @@ 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);