Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug related to icon/bitmap conversion, fix by Mumit Khan

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-15 21:45:30 +00:00
parent d6e4587ece
commit 74b28d5cc8
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/richedit/wxLayout.cpp
View File

@@ -171,7 +171,11 @@ MyFrame::AddSampleText(wxLayoutList *llist)
llist->Insert("The quick brown fox jumps over the lazy dog."); llist->Insert("The quick brown fox jumps over the lazy dog.");
llist->LineBreak(); llist->LineBreak();
llist->Insert("Hello "); llist->Insert("Hello ");
#if wxICON_IS_BITMAP
llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon))); llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon)));
#else
llist->Insert(new wxLayoutObjectIcon(new wxBitmap (wxICON(Micon))));
#endif
llist->SetFontWeight(wxBOLD); llist->SetFontWeight(wxBOLD);
llist->Insert("World! "); llist->Insert("World! ");
llist->SetFontWeight(wxNORMAL); llist->SetFontWeight(wxNORMAL);

4
samples/richedit/wxllist.cpp
View File

@@ -449,7 +449,11 @@ wxLayoutObjectIcon::wxLayoutObjectIcon(wxBitmap *icon)
{ {
m_Icon = icon; m_Icon = icon;
if(! m_Icon) if(! m_Icon)
#if wxICON_IS_BITMAP
m_Icon = new wxIcon; m_Icon = new wxIcon;
#else
m_Icon = new wxBitmap;
#endif
} }
void void