Regenerated makefiles for 3rd-party lib change

[wxWidgets.git] / contrib / samples / plot / plot.cpp

diff --git a/contrib/samples/plot/plot.cpp b/contrib/samples/plot/plot.cpp
index 0082a382bba41898ea712eef28e8f77dcde594fe..61de98f20de760e378bc7cd34d1937d4908377da 100644 (file)
--- a/contrib/samples/plot/plot.cpp
+++ b/contrib/samples/plot/plot.cpp
@@ -69,7 +69,9 @@ public:
     void OnPlotDClick( wxPlotEvent &event );
 
     wxPlotWindow   *m_plot;
     void OnPlotDClick( wxPlotEvent &event );
 
     wxPlotWindow   *m_plot;

+#if wxUSE_LOG

     wxTextCtrl     *m_log;
     wxTextCtrl     *m_log;

+#endif // wxUSE_LOG

 
 private:
     DECLARE_DYNAMIC_CLASS(MyFrame)
 
 private:
     DECLARE_DYNAMIC_CLASS(MyFrame)


@@ -115,9 +117,11 @@ MyFrame::MyFrame()
 
     SetMenuBar( menu_bar );
 
 
     SetMenuBar( menu_bar );
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

 
     m_plot = new wxPlotWindow( this, -1, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER | wxPLOT_DEFAULT );
     m_plot->SetUnitsPerValue( 0.01 );
 
     m_plot = new wxPlotWindow( this, -1, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER | wxPLOT_DEFAULT );
     m_plot->SetUnitsPerValue( 0.01 );


@@ -132,28 +136,32 @@ MyFrame::MyFrame()
     oo->Add( 1000, 2000 );
     m_plot->Add( oo );
   
     oo->Add( 1000, 2000 );
     m_plot->Add( oo );
   

+#if wxUSE_LOG

     m_log = new wxTextCtrl( this, -1, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
     delete old_log;
     m_log = new wxTextCtrl( this, -1, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
     delete old_log;

+#endif // wxUSE_LOG

     
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     
     topsizer->Add( m_plot, 1, wxEXPAND );
     
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     
     topsizer->Add( m_plot, 1, wxEXPAND );

+#if wxUSE_LOG

     topsizer->Add( m_log, 0, wxEXPAND );
     topsizer->Add( m_log, 0, wxEXPAND );

+#endif // wxUSE_LOG

 
 

-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );

     SetSizer( topsizer );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 {
     SetSizer( topsizer );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 {

-  Close( TRUE );
+  Close( true );

 }
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {

-  (void)wxMessageBox( _T("wxPlotWindow Demo\n"
-                         "Robert Roebling (c) 1999,2000"),
+  (void)wxMessageBox( _T("wxPlotWindow Demo\n")
+                      _T("Robert Roebling (c) 1999,2000"),

                       _T("About wxPlotWindow Demo"), wxICON_INFORMATION | wxOK );
 }
 
                       _T("About wxPlotWindow Demo"), wxICON_INFORMATION | wxOK );
 }