X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..da00a8bb164dd1f58dd0bb211475538a375867b4:/src/generic/tipdlg.cpp diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 6f9ba6f7df..d1ce8278e0 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" @@ -187,20 +188,16 @@ wxTipDialog::wxTipDialog(wxWindow *parent, wxDefaultPosition, wxSize(200, 160), wxTE_MULTILINE | wxTE_READONLY | + wxTE_NO_VSCROLL | wxTE_RICH | // a hack to get rid of vert scrollbar wxSUNKEN_BORDER); #if defined(__WXMSW__) - m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL)); + m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL)); #else - m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL)); + m_text->SetFont(wxFont(14, wxSWISS, 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