wxString and wxChar* access for file functions. Source cleaning.

[wxWidgets.git] / contrib / samples / fl / fl_demo1.cpp

diff --git a/contrib/samples/fl/fl_demo1.cpp b/contrib/samples/fl/fl_demo1.cpp
index 9ba3f3bf2a3b9d2f79a2e10614b8405234222160..30f4b8d514dae6a3779a87a5fe9539649a269aa6 100644 (file)
--- a/contrib/samples/fl/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1.cpp
@@ -69,7 +69,9 @@ bool MyApp::OnInit(void)
     
     frame->SetMenuBar(menu_bar);
     
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
     
     frame->Show(true);
     
@@ -217,7 +219,9 @@ MyFrame::MyFrame(wxFrame *frame)
     pToolBar->AddSeparator();
     pToolBar->AddTool( 1002, wxString(wxT(BMP_DIR)) + wxT("open.bmp") );
     pToolBar->AddTool( 1003, wxString(wxT(BMP_DIR)) + wxT("save.bmp") );
+#if wxUSE_STATLINE
     pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, wxID_ANY));    
+#endif // wxUSE_STATLINE
     pToolBar->AddTool( 1004, wxString(wxT(BMP_DIR)) + wxT("cut.bmp") );
     pToolBar->AddTool( 1005, wxString(wxT(BMP_DIR)) + wxT("copy.bmp") );
     pToolBar->AddTool( 1006, wxString(wxT(BMP_DIR)) + wxT("paste.bmp") );
@@ -241,6 +245,7 @@ MyFrame::~MyFrame()
 }
 
 #define LINE_SIZE 3
+#if wxUSE_STATLINE
 void wxMySeparatorLine::DoSetSize( int x, int y,
                                    int width, int height,
                                    int sizeFlags)
@@ -258,3 +263,4 @@ void wxMySeparatorLine::DoSetSize( int x, int y,
     
     wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
 }
+#endif // wxUSE_STATLINE