From f547bf04d46d32c9290845db8e9e4b638de278c1 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 15 Jan 1999 01:31:39 +0000 Subject: [PATCH] Fixed up print-preview menu git-svn-id: svn://10.0.0.236/trunk@17814 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/tests/viewer/nsGTKMenu.cpp | 5 +---- mozilla/webshell/tests/viewer/viewer.rc | 21 ++++++++------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/mozilla/webshell/tests/viewer/nsGTKMenu.cpp b/mozilla/webshell/tests/viewer/nsGTKMenu.cpp index da900ad3f03..d04c5a92d5e 100644 --- a/mozilla/webshell/tests/viewer/nsGTKMenu.cpp +++ b/mozilla/webshell/tests/viewer/nsGTKMenu.cpp @@ -58,10 +58,7 @@ GtkItemFactoryEntry menu_items[] = { "/File/Test Widgets/_Tree View", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_TREEVIEW, nsnull }, { "/File/Test Widgets/Tool_bar Test", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_TOOLBARDEMO, nsnull }, { "/File/sep1", nsnull, nsnull, 0, "" }, - { "/File/Print _Preview", nsnull, nsnull, 0, "" }, - { "/File/Print Preview/One Column", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_ONE_COLUMN, nsnull }, - { "/File/Print Preview/Two Column", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_TWO_COLUMN, nsnull }, - { "/File/Print Preview/Three Column", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_THREE_COLUMN, nsnull }, + { "/File/Print Preview", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_ONE_COLUMN, nsnull }, { "/File/Print", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_PRINT, nsnull }, { "/File/Print Setup", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_PRINT_SETUP, nsnull }, { "/File/sep2", nsnull, nsnull, 0, "" }, diff --git a/mozilla/webshell/tests/viewer/viewer.rc b/mozilla/webshell/tests/viewer/viewer.rc index 55d374a5d68..67f8ceaba42 100644 --- a/mozilla/webshell/tests/viewer/viewer.rc +++ b/mozilla/webshell/tests/viewer/viewer.rc @@ -40,20 +40,15 @@ VIEWER MENU DISCARDABLE MENUITEM "demo #8", VIEWER_DEMO8 MENUITEM "demo #9", VIEWER_DEMO9 MENUITEM "demo #10", VIEWER_DEMO10 - } - MENUITEM "&Test Sites", VIEWER_TOP100 - POPUP "Test &Widgets" - { - MENUITEM "&Tree View", VIEWER_TREEVIEW - MENUITEM "Tool&bar Test", VIEWER_TOOLBARDEMO - } - MENUITEM SEPARATOR - POPUP "Print &Preview" - { - MENUITEM "One Column", VIEWER_ONE_COLUMN - MENUITEM "Two Column", VIEWER_TWO_COLUMN - MENUITEM "Three Column", VIEWER_THREE_COLUMN } + MENUITEM "&Test Sites", VIEWER_TOP100 + POPUP "Test &Widgets" + { + MENUITEM "&Tree View", VIEWER_TREEVIEW + MENUITEM "Tool&bar Test", VIEWER_TOOLBARDEMO + } + MENUITEM SEPARATOR + MENUITEM "Print &Preview", VIEWER_ONE_COLUMN MENUITEM "Print", VIEWER_PRINT MENUITEM "Print Setup", VIEWER_PRINT_SETUP MENUITEM SEPARATOR