From b6d0231a53abe3be35f71aa73ddda8654835833f Mon Sep 17 00:00:00 2001
From: Jaakko Keränen <jaakko.keranen@iki.fi>
Date: Sat, 28 Nov 2020 11:26:37 +0200
Subject: Cleanup: Removed (hidden) preformatted wrap option

---
 src/ui/documentwidget.c | 11 +++++------
 src/ui/window.c         |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ef856558..c82e823d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -317,6 +317,7 @@ static iRect siteBannerRect_DocumentWidget_(const iDocumentWidget *d) {
     return moved_Rect(banner->visBounds, origin);
 }
 
+#if 0
 static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
     if (equalCase_Rangecc(urlScheme_String(d->mod.url), "gopher")) {
         return documentWidth_DocumentWidget_(d);
@@ -328,6 +329,7 @@ static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
     }
     return 0;
 }
+#endif
 
 static iInt2 documentPos_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
     return addY_I2(sub_I2(pos, topLeft_Rect(documentBounds_DocumentWidget_(d))),
@@ -691,8 +693,7 @@ static void updateOutline_DocumentWidget_(iDocumentWidget *d) {
 
 static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
     setUrl_GmDocument(d->doc, d->mod.url);
-    setSource_GmDocument(
-        d->doc, source, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+    setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
     d->foundMark       = iNullRange;
     d->selectMark      = iNullRange;
     d->hoverLink       = NULL;
@@ -1354,8 +1355,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         const char *midLoc = (mid ? mid->text.start : NULL);
         /* Alt/Option key may be involved in window size changes. */
         iChangeFlags(d->flags, showLinkNumbers_DocumentWidgetFlag, iFalse);
-        setWidth_GmDocument(
-            d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+        setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
         scroll_DocumentWidget_(d, 0);
         if (midLoc) {
             mid = findRunAtLoc_GmDocument(d->doc, midLoc);
@@ -2948,8 +2948,7 @@ iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
 }
 
 void updateSize_DocumentWidget(iDocumentWidget *d) {
-    setWidth_GmDocument(
-        d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+    setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
     updateSideIconBuf_DocumentWidget_(d);
     updateOutline_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
diff --git a/src/ui/window.c b/src/ui/window.c
index 906e1084..c0afe266 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -155,8 +155,6 @@ static const iMenuItem viewMenuItems_[] = {
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
-    { "---", 0, 0, NULL },
-    { "Wrap Preformatted", 0, 0, "forcewrap.toggle" } /* TODO: remove this; should scroll preformatted */
 };
 
 static iMenuItem bookmarksMenuItems_[] = {
-- 
cgit v1.2.3