X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abceee76ea4d642ccfd3cf91cc139a3fe2b471b7..24f932d22a085ce899b94c98578f475782c75bf6:/src/generic/tipdlg.cpp?ds=sidebyside diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 417a093903..c13b869e2b 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -45,6 +45,7 @@ #endif // WX_PRECOMP #include "wx/statline.h" +#include "wx/artprov.h" #include "wx/tipdlg.h" @@ -181,7 +182,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD)); #endif // -// text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)); +// text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); m_text = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(200, 160), @@ -195,12 +196,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL)); #endif -#if defined(__WXMSW__) || defined(__WXPM__) - wxIcon icon("wxICON_TIP"); -#else - #include "wx/generic/tip.xpm" - wxIcon icon(tipIcon); -#endif + wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG); wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon); // 2) put them in boxes