EP_ADD_OPTS defaults to true

[wxWidgets.git] / samples / toolbar / toolbar.cpp

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index c13dc5050ee9e777a88df45682c2cbba6112937f..b0a791145fa10887dc149d96e76ddad032690b71 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -265,7 +265,7 @@ bool MyApp::OnInit()
 
     frame->Show(true);
 
-#ifndef __SMARTPHONE__
+#if wxUSE_STATUSBAR
     frame->SetStatusText(_T("Hello, wxWidgets"));
 #endif
 
@@ -279,7 +279,7 @@ void MyFrame::RecreateToolbar()
 #ifdef __WXWINCE__
     // On Windows CE, we should not delete the
     // previous toolbar in case it contains the menubar.
-    // We'll try to accomodate this usage in due course.
+    // We'll try to accommodate this usage in due course.
     wxToolBar* toolBar = CreateToolBar();
 #else
     // delete and recreate the toolbar
@@ -343,7 +343,7 @@ void MyFrame::RecreateToolbar()
     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {
-        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultSize.y) );
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultCoord) );
         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
@@ -389,7 +389,7 @@ MyFrame::MyFrame(wxFrame* parent,
     m_rows = 1;
     m_nPrint = 1;
 
-#ifndef __SMARTPHONE__
+#if wxUSE_STATUSBAR
     // Give it a status line
     CreateStatusBar();
 #endif
@@ -483,7 +483,7 @@ void MyFrame::LayoutChildren()
     int offset;
     if ( m_tbar )
     {
-        m_tbar->SetSize(wxDefaultSize.x, size.y);
+        m_tbar->SetSize(wxDefaultCoord, size.y);
         m_tbar->Move(0, 0);
 
         offset = m_tbar->GetSize().x;
@@ -711,7 +711,7 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 {
-#ifndef __SMARTPHONE__
+#if wxUSE_STATUSBAR
     if (event.GetSelection() > -1)
     {
         wxString str;
@@ -720,7 +720,9 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
     }
     else
         SetStatusText(_T(""));
-#endif
+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR
 }
 
 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)