remove odbc lib to prevent rpm errors about unpackaged files (patch 1151783)

[wxWidgets.git] / samples / richedit / wxLayout.cpp

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 034eefb85b97e2bf4ce4925ca066a69e2291895d..e6a46a1ea3b2ad3ebda02b665745a1055b38b46b 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -78,7 +78,7 @@ MyFrame::MyFrame() :
 {
 #if wxUSE_STATUSBAR
    CreateStatusBar( 2 );
-   SetStatusText( _T("wxLayout by Karsten Ballüder.") );
+   SetStatusText( _T("wxLayout by Karsten Ballueder.") );
 #endif // wxUSE_STATUSBAR
 
    wxMenuBar *menu_bar = new wxMenuBar();
@@ -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);