wxUSE_STATLINE fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/fl/fl_demo1.cpp b/contrib/samples/fl/fl_demo1.cpp
index e0c08532d135e381c1153371ae5eb56b5b74ce2d..30f4b8d514dae6a3779a87a5fe9539649a269aa6 100644 (file)
--- a/contrib/samples/fl/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1.cpp
@@ -219,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") );
     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));    
     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") );
     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") );


@@ -243,6 +245,7 @@ MyFrame::~MyFrame()
 }
 
 #define LINE_SIZE 3
 }
 
 #define LINE_SIZE 3

+#if wxUSE_STATLINE

 void wxMySeparatorLine::DoSetSize( int x, int y,
                                    int width, int height,
                                    int sizeFlags)
 void wxMySeparatorLine::DoSetSize( int x, int y,
                                    int width, int height,
                                    int sizeFlags)


@@ -260,3 +263,4 @@ void wxMySeparatorLine::DoSetSize( int x, int y,
     
     wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
 }
     
     wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
 }

+#endif // wxUSE_STATLINE

diff --git a/contrib/samples/fl/fl_demo1.h b/contrib/samples/fl/fl_demo1.h
index 70675acf2446b3a0f03e1f4ea6ddcb551c5f2a1d..2a1bc1eb06bfa959d0ebf6f415a9d0a95dcaccbe 100644 (file)
--- a/contrib/samples/fl/fl_demo1.h
+++ b/contrib/samples/fl/fl_demo1.h
@@ -52,6 +52,7 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#if wxUSE_STATLINE

 /*
  * Quick example of your own Separator class...
  */
 /*
  * Quick example of your own Separator class...
  */


@@ -69,6 +70,7 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 };
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 };

+#endif // wxUSE_STATLINE

 
 #endif
 
 
 #endif