No changes, just fix unused variable in wxUSE_STATBMP==0 build.
Move the condition used only for wxStaticBitmap positioning inside "#if wxUSE_STATBMP" section. Closes #14929. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -166,8 +166,6 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
|
|||||||
{
|
{
|
||||||
wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
|
wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
|
||||||
|
|
||||||
bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
|
|
||||||
|
|
||||||
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
|
wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
|
||||||
@@ -182,7 +180,7 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
|
|||||||
wxID_ANY,
|
wxID_ANY,
|
||||||
wxArtProvider::GetMessageBoxIcon(m_dialogStyle)
|
wxArtProvider::GetMessageBoxIcon(m_dialogStyle)
|
||||||
);
|
);
|
||||||
if (is_pda)
|
if ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA )
|
||||||
topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
|
topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
|
||||||
else
|
else
|
||||||
icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20));
|
icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20));
|
||||||
|
Reference in New Issue
Block a user