Use wxART_BUTTON instead of wxART_MENU for info bar icons.
wxART_BUTTON seems to be more appropriate, although in practice this doesn't make any difference. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -111,10 +111,10 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid)
|
|||||||
m_text = new wxStaticText(this, wxID_ANY, "");
|
m_text = new wxStaticText(this, wxID_ANY, "");
|
||||||
|
|
||||||
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
|
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
|
||||||
const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_FRAME_ICON);
|
const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_BUTTON);
|
||||||
wxBitmap bmp = GetCloseButtonBitmap(this, sizeBmp, colBg);
|
wxBitmap bmp = GetCloseButtonBitmap(this, sizeBmp, colBg);
|
||||||
#else // !wxHAS_DRAW_TITLE_BAR_BITMAP
|
#else // !wxHAS_DRAW_TITLE_BAR_BITMAP
|
||||||
wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_MENU);
|
wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_BUTTON);
|
||||||
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
|
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
|
||||||
m_button = new wxBitmapButton
|
m_button = new wxBitmapButton
|
||||||
(
|
(
|
||||||
@@ -264,7 +264,7 @@ void wxInfoBarGeneric::ShowMessage(const wxString& msg, int flags)
|
|||||||
{
|
{
|
||||||
m_icon->SetBitmap(wxArtProvider::GetBitmap(
|
m_icon->SetBitmap(wxArtProvider::GetBitmap(
|
||||||
wxArtProvider::GetMessageBoxIconId(flags),
|
wxArtProvider::GetMessageBoxIconId(flags),
|
||||||
wxART_MENU));
|
wxART_BUTTON));
|
||||||
m_icon->Show();
|
m_icon->Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user