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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index d650aea0ae54663a202e20765922fc815a38ebf2..7ba8765da96c22666836bee54f46d8962e88f601 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -171,7 +171,11 @@ MyFrame::AddSampleText(wxLayoutList *llist)
    llist->Insert("The quick brown fox jumps over the lazy dog.");
    llist->LineBreak();
    llist->Insert("Hello ");
+#if wxICON_IS_BITMAP
    llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon)));
+#else
+   llist->Insert(new wxLayoutObjectIcon(new wxBitmap (wxICON(Micon))));
+#endif
    llist->SetFontWeight(wxBOLD);
    llist->Insert("World! ");
    llist->SetFontWeight(wxNORMAL);

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 2aafe648eb640597ab16bdd07ba1de3137b5c9e9..3a8e75082ea28c9736d4980017b66204dab8ea1a 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -449,7 +449,11 @@ wxLayoutObjectIcon::wxLayoutObjectIcon(wxBitmap *icon)
 {
    m_Icon = icon;
    if(! m_Icon)
+#if wxICON_IS_BITMAP
       m_Icon = new wxIcon;
+#else
+      m_Icon = new wxBitmap;
+#endif
 }
 
 void