Minor fixes for gcc

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

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 5ed2b19b314def794b26866f5087be58123b3ef3..e6a46a1ea3b2ad3ebda02b665745a1055b38b46b 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -66,8 +66,8 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
-   EVT_MENU    (-1,       MyFrame::OnCommand)
-   EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
+   EVT_MENU    (wxID_ANY,       MyFrame::OnCommand)
+   EVT_COMMAND (wxID_ANY,wxID_ANY,    MyFrame::OnCommand)
    EVT_CHAR    (  wxLayoutWindow::OnChar  )
 END_EVENT_TABLE()
 
@@ -76,9 +76,10 @@ MyFrame::MyFrame() :
    wxFrame( (wxFrame *) NULL, wxID_ANY, _T("wxLayout"),
              wxDefaultPosition, wxDefaultSize )
 {
+#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();
 
@@ -128,7 +129,9 @@ MyFrame::MyFrame() :
    SetMenuBar( menu_bar );
 
    m_lwin = new wxLayoutWindow(this);
+#if wxUSE_STATUSBAR
    m_lwin->SetStatusBar(GetStatusBar(), 0, 1);
+#endif // wxUSE_STATUSBAR
    m_lwin->SetMouseTracking(true);
    m_lwin->SetEditable(true);
    m_lwin->SetWrapMargin(40);
@@ -180,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);
@@ -434,7 +430,7 @@ void MyFrame::OnCommand( wxCommandEvent &event )
         // VZ: this doesn't work, of course, but I think it should -
         //     wxLayoutWindow should have a flag m_highlightUrls and do it itself
         //     (instead of doing it manually like M does now)
-        m_lwin->GetLayoutList()->Insert(_T("http://www.wxwindows.org/"));
+        m_lwin->GetLayoutList()->Insert(_T("http://www.wxwidgets.org/"));
         m_lwin->Refresh();
     }
 };
@@ -577,7 +573,7 @@ bool MyApp::OnInit()
    wxFrame *frame = new MyFrame();
    wxInitAllImageHandlers();
    frame->Show( true );
-//   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");
+//   wxSetAFMPath("/usr/local/src/wxWidgets/misc/afm/");
    return true;
 };