removed erroneous return type from a membersection (patch 905562)

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

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 6bcf61a6ceb29bc90ce0c912be6f128af5b5421c..e25e124b3fba4b112d2bf7719bb612e734abbfe2 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -21,8 +21,8 @@
 #include "wx/mdi.h"
 #endif
 
-#include <wx/toolbar.h>
-#include <wx/laywin.h>
+#include "wx/toolbar.h"
+#include "wx/laywin.h"
 
 #include "sashtest.h"
 
@@ -42,33 +42,30 @@ bool MyApp::OnInit(void)
 {
   // Create the main frame window
 
-  frame = new MyFrame(NULL, -1, "Sash Demo", wxPoint(0, 0), wxSize(500, 400),
+  frame = new MyFrame(NULL, -1, _T("Sash Demo"), wxPoint(0, 0), wxSize(500, 400),
                       wxDEFAULT_FRAME_STYLE |
                       wxNO_FULL_REPAINT_ON_RESIZE |
                       wxHSCROLL | wxVSCROLL);
 
   // Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__
-  frame->SetIcon(wxIcon("sashtest_icn"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("sashtest.xbm"));
+  frame->SetIcon(wxIcon(_T("sashtest_icn")));
 #endif
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
-  file_menu->Append(SASHTEST_NEW_WINDOW, "&New window");
-  file_menu->Append(SASHTEST_TOGGLE_WINDOW, "&Toggle window");
-  file_menu->Append(SASHTEST_QUIT, "&Exit");
+  file_menu->Append(SASHTEST_NEW_WINDOW, _T("&New window"));
+  file_menu->Append(SASHTEST_TOGGLE_WINDOW, _T("&Toggle window"));
+  file_menu->Append(SASHTEST_QUIT, _T("&Exit"));
 
   wxMenu *help_menu = new wxMenu;
-  help_menu->Append(SASHTEST_ABOUT, "&About");
+  help_menu->Append(SASHTEST_ABOUT, _T("&About"));
 
   wxMenuBar *menu_bar = new wxMenuBar;
 
-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(help_menu, "&Help");
+  menu_bar->Append(file_menu, _T("&File"));
+  menu_bar->Append(help_menu, _T("&Help"));
 
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
@@ -94,7 +91,7 @@ END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
-       const long style):
+    const long style):
   wxMDIParentFrame(parent, id, title, pos, size, style)
 {
   // Create some dummy layout windows
@@ -136,17 +133,17 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetSashVisible(wxSASH_RIGHT, TRUE);
   win->SetExtraBorderSize(10);
 
-  wxTextCtrl* textWindow = new wxTextCtrl(win, -1, "", wxDefaultPosition, wxDefaultSize,
+  wxTextCtrl* textWindow = new wxTextCtrl(win, -1, _T(""), wxDefaultPosition, wxDefaultSize,
         wxTE_MULTILINE|wxSUNKEN_BORDER);
 //        wxTE_MULTILINE|wxNO_BORDER);
-  textWindow->SetValue("A help window");
+  textWindow->SetValue(_T("A help window"));
 
   m_leftWindow1 = win;
 
   // Another window to the left of the client window
   win = new wxSashLayoutWindow(this, ID_WINDOW_LEFT2,
                                wxDefaultPosition, wxSize(200, 30),
-                               wxNO_BORDER | wxSW_3 | wxCLIP_CHILDREND);
+                               wxNO_BORDER | wxSW_3D | wxCLIP_CHILDREN);
   win->SetDefaultSize(wxSize(120, 1000));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);
@@ -163,7 +160,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-      (void)wxMessageBox("wxWindows 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998", "About Sash Demo");
+      (void)wxMessageBox(_T("wxWindows 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998"), _T("About Sash Demo"));
 }
 
 void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
@@ -218,19 +215,17 @@ void MyFrame::OnSashDrag(wxSashEvent& event)
 void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
 {
       // Make another frame, containing a canvas
-      MyChild *subframe = new MyChild(frame, "Canvas Frame",
+      MyChild *subframe = new MyChild(frame, _T("Canvas Frame"),
                                       wxPoint(10, 10), wxSize(300, 300),
                                       wxDEFAULT_FRAME_STYLE |
                                       wxNO_FULL_REPAINT_ON_RESIZE);
 
-      char titleBuf[100];
-      sprintf(titleBuf, "Canvas Frame %d", winNumber);
-      subframe->SetTitle(titleBuf);
+      subframe->SetTitle(wxString::Format(_T("Canvas Frame %d"), winNumber));
       winNumber ++;
 
       // Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__
-      subframe->SetIcon(wxIcon("sashtest_icn"));
+      subframe->SetIcon(wxIcon(_T("sashtest_icn")));
 #endif
 
       // Give it a status line
@@ -239,23 +234,23 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
       // Make a menubar
       wxMenu *file_menu = new wxMenu;
 
-      file_menu->Append(SASHTEST_NEW_WINDOW, "&New window");
-      file_menu->Append(SASHTEST_CHILD_QUIT, "&Close child");
-      file_menu->Append(SASHTEST_QUIT, "&Exit");
+      file_menu->Append(SASHTEST_NEW_WINDOW, _T("&New window"));
+      file_menu->Append(SASHTEST_CHILD_QUIT, _T("&Close child"));
+      file_menu->Append(SASHTEST_QUIT, _T("&Exit"));
 
       wxMenu *option_menu = new wxMenu;
 
       // Dummy option
-      option_menu->Append(SASHTEST_REFRESH, "&Refresh picture");
+      option_menu->Append(SASHTEST_REFRESH, _T("&Refresh picture"));
 
       wxMenu *help_menu = new wxMenu;
-      help_menu->Append(SASHTEST_ABOUT, "&About");
+      help_menu->Append(SASHTEST_ABOUT, _T("&About"));
 
       wxMenuBar *menu_bar = new wxMenuBar;
 
-      menu_bar->Append(file_menu, "&File");
-      menu_bar->Append(option_menu, "&Options");
-      menu_bar->Append(help_menu, "&Help");
+      menu_bar->Append(file_menu, _T("&File"));
+      menu_bar->Append(option_menu, _T("&Options"));
+      menu_bar->Append(help_menu, _T("&Help"));
 
       // Associate the menu bar with the frame
       subframe->SetMenuBar(menu_bar);
@@ -273,7 +268,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-       EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
+    EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
@@ -302,7 +297,7 @@ void MyCanvas::OnDraw(wxDC& dc)
   dc.DrawSpline(50, 200, 50, 100, 200, 10);
 #endif // wxUSE_SPLINES
   dc.DrawLine(50, 230, 200, 230);
-  dc.DrawText("This is a test string", 50, 230);
+  dc.DrawText(_T("This is a test string"), 50, 230);
 
   wxPoint points[3];
   points[0].x = 200; points[0].y = 300;