Use status bar even for WinCE; use standard frame style

to adapt to WinCE version

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 6915f9828ec8e148cab7abb801aac7d784aba563..97ed31ee62270399f6dd445248cf6158605b02fd 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -257,7 +257,7 @@ bool MyApp::OnInit()
     MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
                                  _T("wxToolBar Sample"),
 #ifdef __WXWINCE__
     MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
                                  _T("wxToolBar Sample"),
 #ifdef __WXWINCE__

-                                 wxPoint(0, 0), wxDefaultSize, wxNO_BORDER
+                                 wxPoint(0, 0), wxDefaultSize

 #else
                                  wxPoint(100, 100), wxSize(550, 300)
 #endif
 #else
                                  wxPoint(100, 100), wxSize(550, 300)
 #endif


@@ -387,10 +387,8 @@ MyFrame::MyFrame(wxFrame* parent,
     m_rows = 1;
     m_nPrint = 1;
 
     m_rows = 1;
     m_nPrint = 1;
 

-#ifndef __WXWINCE__

     // Give it a status line
     CreateStatusBar();
     // Give it a status line
     CreateStatusBar();

-#endif

 
     // Give it an icon
     SetIcon(wxICON(mondrian));
 
     // Give it an icon
     SetIcon(wxICON(mondrian));