Fix crash when editing wxDVC items in place in wxOSX/Cocoa.

[wxWidgets.git] / samples / html / printing / printing.cpp

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index bfec54d97f31d099a816d7e4e29a1ebc08a6fe22..db862e7b4552225309ed89c6f8385942e4a16f60 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -1,11 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.cpp
 // Purpose:     wxHtml sample: wxHtmlEasyPrinting test
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.cpp
 // Purpose:     wxHtml sample: wxHtmlEasyPrinting test

-// Author:      ?
-// Modified by:
-// Created:     ?
+// Author:      Vaclav Slavik

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWidgets team
+// Copyright:   (c) 1998-2009 wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -181,23 +179,23 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(Minimal_Open, _("Open...\tCtrl-O"));
     menuFile->AppendSeparator();
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(Minimal_Open, _("Open...\tCtrl-O"));
     menuFile->AppendSeparator();

-    menuFile->Append(Minimal_PageSetup, _("Page Setup"));
-    menuFile->Append(Minimal_Print, _("Print..."));
-    menuFile->Append(Minimal_Preview, _("Preview..."));
+    menuFile->Append(Minimal_PageSetup, _("Page &Setup"));
+    menuFile->Append(Minimal_Preview, _("Print pre&view..."));
+    menuFile->Append(Minimal_Print, _("Print...\tCtrl-P"));

     menuFile->AppendSeparator();
     menuFile->Append(wxID_ABOUT, _("&About"));
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, _("&Exit"));
 
     menuFile->AppendSeparator();
     menuFile->Append(wxID_ABOUT, _("&About"));
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, _("&Exit"));
 

-    wxMenu *testFile = new wxMenu;
-    testFile->Append(Minimal_PrintSmall, _("Small Printer Fonts"));
-    testFile->Append(Minimal_PrintNormal, _("Normal Printer Fonts"));
-    testFile->Append(Minimal_PrintHuge, _("Huge Printer Fonts"));
+    wxMenu *menuFonts = new wxMenu;
+    menuFonts->AppendRadioItem(Minimal_PrintSmall, _("&Small Printer Fonts"));
+    menuFonts->AppendRadioItem(Minimal_PrintNormal, _("&Normal Printer Fonts"));
+    menuFonts->AppendRadioItem(Minimal_PrintHuge, _("&Huge Printer Fonts"));

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, _("&File"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, _("&File"));

-    menuBar->Append(testFile, _("&Test"));
+    menuBar->Append(menuFonts, _("F&onts"));

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);