X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47e118ba9a99f27050c3fa5f19f0edd6917d5df5..cd9a8d40c9a7380f7fefe676cbe01089833cdd60:/src/generic/msgdlgg.cpp diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 8a3db3ba9d..7b94af45d4 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXGPE__)) +#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__)) #ifndef WX_PRECOMP #include "wx/utils.h" @@ -63,7 +63,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& caption, long style, const wxPoint& pos) - : wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE ) + : wxDialog( parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE ) { m_dialogStyle = style; @@ -99,7 +99,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX); break; } - wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap); + wxStaticBitmap *icon = new wxStaticBitmap(this, wxID_ANY, bitmap); if (is_pda) topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); else @@ -107,18 +107,22 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, } // 2) text - icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 ); + icon_text->Add( CreateTextSizer( message ), 0, wxALIGN_CENTER | wxLEFT, 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 ); + topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); +#endif // wxUSE_STATLINE // 4) buttons + int center_flag = wxEXPAND; + if (style & wxYES_NO) center_flag = wxALIGN_CENTRE; topsizer->Add( CreateButtonSizer( style & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ), - 0, wxCENTRE | wxALL, 10 ); + 0, center_flag | wxALL, 10 ); - SetAutoLayout( TRUE ); + SetAutoLayout( true ); SetSizer( topsizer ); topsizer->SetSizeHints( this );