From 1c4fbbf1599c9912dab85d69798c6bcc97d907f2 Mon Sep 17 00:00:00 2001 From: David Webster <Dave.Webster@bhmi.com> Date: Wed, 21 Aug 2002 15:03:18 +0000 Subject: [PATCH] OS/2 update to get Tip icon created correctly. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/tipdlg.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index d1ce8278e0..8a10c41b60 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -176,7 +176,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip")); wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) ); -#if defined(__WXMSW__) +#if defined(__WXMSW__) || defined(__WXPM__) text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD)); #else text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD)); @@ -197,9 +197,24 @@ wxTipDialog::wxTipDialog(wxWindow *parent, m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)); #endif +#if defined(__WXPM__) + // + // The only way to get icons into an OS/2 static bitmap control + // + wxBitmap vBitmap; + + vBitmap.SetId(wxICON_TIP); // OS/2 specific bitmap method--OS/2 wxBitmaps all have an ID. + // and for StatBmp's under OS/2 it MUST be a valid resource ID. + + wxStaticBitmap* bmp = new wxStaticBitmap(this, -1, vBitmap); + +#else + wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG); wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon); +#endif + // 2) put them in boxes wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); -- 2.45.2