removed 2.0 compatibility stuff (patch 1054261)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 18:59:51 +00:00
parent 16ca2e0fac
commit 81152407d0
13 changed files with 7 additions and 131 deletions
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -183,14 +183,7 @@ void MyFrame::AddSampleText(wxLayoutList *llist)
   llist->LineBreak();

    llist->Insert(_T("Hello "));
-    wxBitmap *icon =
-#if wxICON_IS_BITMAP
-        new wxIcon(Micon_xpm)
-#else
-        new wxBitmap (wxIcon(Micon_xpm))
-#endif
-
-        ;
+    wxBitmap *icon = new wxBitmap (wxIcon(Micon_xpm));

    llist->Insert(new wxLayoutObjectIcon(icon));
    llist->SetFontWeight(wxBOLD);