Position change - still can't use default size for Wince/desktop

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 97ed31ee62270399f6dd445248cf6158605b02fd..d32714c31b070b1f9c67692b5a0d3e85aa7b0bda 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
+                                 wxDefaultPosition, wxDefaultSize

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


@@ -265,7 +265,9 @@ bool MyApp::OnInit()
 
     frame->Show(TRUE);
 
 
     frame->Show(TRUE);
 

+#ifndef __SMARTPHONE__

     frame->SetStatusText(_T("Hello, wxWidgets"));
     frame->SetStatusText(_T("Hello, wxWidgets"));

+#endif

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 


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

+#ifndef __SMARTPHONE__

     // 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));


@@ -707,6 +711,7 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 {
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 {

+#ifndef __SMARTPHONE__

     if (event.GetSelection() > -1)
     {
         wxString str;
     if (event.GetSelection() > -1)
     {
         wxString str;


@@ -715,6 +720,7 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
     }
     else
         SetStatusText(_T(""));
     }
     else
         SetStatusText(_T(""));

+#endif

 }
 
 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
 }
 
 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)