non-PCH build fix (according to Tinderbox).

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

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 6bcf61a6ceb29bc90ce0c912be6f128af5b5421c..fb3accf647ba590158665905b710b3ff626a4c8c 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$
 // 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".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -21,8 +21,8 @@
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"
 #endif
 

-#include <wx/toolbar.h>
-#include <wx/laywin.h>
+#include "wx/toolbar.h"
+#include "wx/laywin.h"

 
 #include "sashtest.h"
 
 
 #include "sashtest.h"
 


@@ -42,44 +42,43 @@ bool MyApp::OnInit(void)
 {
   // Create the main frame window
 
 {
   // Create the main frame window
 

-  frame = new MyFrame(NULL, -1, "Sash Demo", wxPoint(0, 0), wxSize(500, 400),
+  frame = new MyFrame(NULL, wxID_ANY, _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__
                       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;
 
 #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;
 
   wxMenu *help_menu = new wxMenu;

-  help_menu->Append(SASHTEST_ABOUT, "&About");
+  help_menu->Append(SASHTEST_ABOUT, _T("&About"));

 
   wxMenuBar *menu_bar = new wxMenuBar;
 
 
   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);
 
 
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

   frame->CreateStatusBar();
   frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
 

-  frame->Show(TRUE);
+  frame->Show(true);

 
   SetTopWindow(frame);
 
 
   SetTopWindow(frame);
 

-  return TRUE;
+  return true;

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)


@@ -94,7 +93,7 @@ END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
 
 // 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
   wxMDIParentFrame(parent, id, title, pos, size, style)
 {
   // Create some dummy layout windows


@@ -109,7 +108,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_TOP);
   win->SetBackgroundColour(wxColour(255, 0, 0));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_TOP);
   win->SetBackgroundColour(wxColour(255, 0, 0));

-  win->SetSashVisible(wxSASH_BOTTOM, TRUE);
+  win->SetSashVisible(wxSASH_BOTTOM, true);

 
   m_topWindow = win;
 
 
   m_topWindow = win;
 


@@ -121,7 +120,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_BOTTOM);
   win->SetBackgroundColour(wxColour(0, 0, 255));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_BOTTOM);
   win->SetBackgroundColour(wxColour(0, 0, 255));

-  win->SetSashVisible(wxSASH_TOP, TRUE);
+  win->SetSashVisible(wxSASH_TOP, true);

 
   m_bottomWindow = win;
 
 
   m_bottomWindow = win;
 


@@ -133,51 +132,53 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);
   win->SetBackgroundColour(wxColour(0, 255, 0));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);
   win->SetBackgroundColour(wxColour(0, 255, 0));

-  win->SetSashVisible(wxSASH_RIGHT, TRUE);
+  win->SetSashVisible(wxSASH_RIGHT, true);

   win->SetExtraBorderSize(10);
 
   win->SetExtraBorderSize(10);
 

-  wxTextCtrl* textWindow = new wxTextCtrl(win, -1, "", wxDefaultPosition, wxDefaultSize,
+  wxTextCtrl* textWindow = new wxTextCtrl(win, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,

         wxTE_MULTILINE|wxSUNKEN_BORDER);
 //        wxTE_MULTILINE|wxNO_BORDER);
         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),
 
   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);
   win->SetBackgroundColour(wxColour(0, 255, 255));
   win->SetDefaultSize(wxSize(120, 1000));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);
   win->SetBackgroundColour(wxColour(0, 255, 255));

-  win->SetSashVisible(wxSASH_RIGHT, TRUE);
+  win->SetSashVisible(wxSASH_RIGHT, true);

 
   m_leftWindow2 = win;
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
   m_leftWindow2 = win;
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-      Close(TRUE);
+      Close(true);

 }
 
 void MyFrame::OnAbout(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("wxWidgets 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998"), _T("About Sash Demo"));

 }
 
 void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
 {
     if (m_leftWindow1->IsShown())
     {
 }
 
 void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
 {
     if (m_leftWindow1->IsShown())
     {

-        m_leftWindow1->Show(FALSE);
+        m_leftWindow1->Show(false);

     }
     else
     {
     }
     else
     {

-        m_leftWindow1->Show(TRUE);
+        m_leftWindow1->Show(true);

     }
     }

+#if wxUSE_MDI_ARCHITECTURE

     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);
     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);

+#endif // wxUSE_MDI_ARCHITECTURE

 }
 
 void MyFrame::OnSashDrag(wxSashEvent& event)
 }
 
 void MyFrame::OnSashDrag(wxSashEvent& event)


@@ -208,8 +209,11 @@ void MyFrame::OnSashDrag(wxSashEvent& event)
             break;
         }
     }
             break;
         }
     }

+
+#if wxUSE_MDI_ARCHITECTURE

     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);
     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);

+#endif // wxUSE_MDI_ARCHITECTURE

 
     // Leaves bits of itself behind sometimes
     GetClientWindow()->Refresh();
 
     // Leaves bits of itself behind sometimes
     GetClientWindow()->Refresh();


@@ -218,44 +222,44 @@ void MyFrame::OnSashDrag(wxSashEvent& event)
 void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
 {
       // Make another frame, containing a canvas
 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);
 
                                       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__
       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
 
 #endif
 

+#if wxUSE_STATUSBAR

       // Give it a status line
       subframe->CreateStatusBar();
       // Give it a status line
       subframe->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
       // Make a menubar
       wxMenu *file_menu = new wxMenu;
 
 
       // 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
 
       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;
 
       wxMenu *help_menu = new wxMenu;

-      help_menu->Append(SASHTEST_ABOUT, "&About");
+      help_menu->Append(SASHTEST_ABOUT, _T("&About"));

 
       wxMenuBar *menu_bar = new wxMenuBar;
 
 
       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);
 
       // Associate the menu bar with the frame
       subframe->SetMenuBar(menu_bar);


@@ -269,16 +273,16 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
       // Give it scrollbars
       canvas->SetScrollbars(20, 20, 50, 50);
 
       // Give it scrollbars
       canvas->SetScrollbars(20, 20, 50, 50);
 

-      subframe->Show(TRUE);
+      subframe->Show(true);

 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)

-       EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
+    EVT_MOUSE_EVENTS(MyCanvas::OnEvent)

 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)

-        : wxScrolledWindow(parent, -1, pos, size,
+        : wxScrolledWindow(parent, wxID_ANY, pos, size,

                            wxSUNKEN_BORDER | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     SetBackgroundColour(* wxWHITE);
                            wxSUNKEN_BORDER | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     SetBackgroundColour(* wxWHITE);


@@ -287,29 +291,29 @@ MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {

-  dc.SetFont(*wxSWISS_FONT);
-  dc.SetPen(*wxGREEN_PEN);
-  dc.DrawLine(0, 0, 200, 200);
-  dc.DrawLine(200, 0, 0, 200);
+    dc.SetFont(*wxSWISS_FONT);
+    dc.SetPen(*wxGREEN_PEN);
+    dc.DrawLine(0, 0, 200, 200);
+    dc.DrawLine(200, 0, 0, 200);

 
 

-  dc.SetBrush(*wxCYAN_BRUSH);
-  dc.SetPen(*wxRED_PEN);
-  dc.DrawRectangle(100, 100, 100, 50);
-  dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
+    dc.SetBrush(*wxCYAN_BRUSH);
+    dc.SetPen(*wxRED_PEN);
+    dc.DrawRectangle(100, 100, 100, 50);
+    dc.DrawRoundedRectangle(150, 150, 100, 50, 20);

 
 

-  dc.DrawEllipse(250, 250, 100, 50);
+    dc.DrawEllipse(250, 250, 100, 50);

 #if wxUSE_SPLINES
 #if wxUSE_SPLINES

-  dc.DrawSpline(50, 200, 50, 100, 200, 10);
+    dc.DrawSpline(50, 200, 50, 100, 200, 10);

 #endif // wxUSE_SPLINES
 #endif // wxUSE_SPLINES

-  dc.DrawLine(50, 230, 200, 230);
-  dc.DrawText("This is a test string", 50, 230);
-
-  wxPoint points[3];
-  points[0].x = 200; points[0].y = 300;
-  points[1].x = 100; points[1].y = 400;
-  points[2].x = 300; points[2].y = 400;
-  
-  dc.DrawPolygon(3, points);
+    dc.DrawLine(50, 230, 200, 230);
+    dc.DrawText(_T("This is a test string"), 50, 230);
+
+    wxPoint points[3];
+    points[0].x = 200; points[0].y = 300;
+    points[1].x = 100; points[1].y = 400;
+    points[2].x = 300; points[2].y = 400;
+
+    dc.DrawPolygon(3, points);

 }
 
 // This implements a tiny doodling program! Drag the mouse using
 }
 
 // This implements a tiny doodling program! Drag the mouse using


@@ -332,8 +336,10 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
 
 void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
 {

+#if wxUSE_MDI_ARCHITECTURE

     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);
     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);

+#endif // wxUSE_MDI_ARCHITECTURE

 }
 
 // Note that SASHTEST_NEW_WINDOW and SASHTEST_ABOUT commands get passed
 }
 
 // Note that SASHTEST_NEW_WINDOW and SASHTEST_ABOUT commands get passed


@@ -346,7 +352,7 @@ END_EVENT_TABLE()
 
 MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size,
 const long style):
 
 MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size,
 const long style):

-  wxMDIChildFrame(parent, -1, title, pos, size, style)
+  wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style)

 {
   canvas = NULL;
   my_children.Append(this);
 {
   canvas = NULL;
   my_children.Append(this);


@@ -359,7 +365,7 @@ MyChild::~MyChild(void)
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-      Close(TRUE);
+      Close(true);

 }
 
 void MyChild::OnActivate(wxActivateEvent& event)
 }
 
 void MyChild::OnActivate(wxActivateEvent& event)


@@ -367,4 +373,3 @@ void MyChild::OnActivate(wxActivateEvent& event)
   if (event.GetActive() && canvas)
     canvas->SetFocus();
 }
   if (event.GetActive() && canvas)
     canvas->SetFocus();
 }

-