From: Po Lu <luangruo@yahoo.com>
Date: Tue, 17 May 2022 03:11:23 +0000 (+0000)
Subject: Remove extra EmacsPopUpMenu class
X-Git-Tag: emacs-29.0.90~1910^2~636
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=803041e01474f2a522170c9f388068e8460be2ae;p=emacs.git

Remove extra EmacsPopUpMenu class

* src/haiku_support.cc (class EmacsPopUpMenu): Delete class that
does nothing.
(BPopUpMenu_new): Use BPopUpMenu directly.
(BMenu_add_title): Clean up coding style.
---

diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 6cdc4e31beb..c883d865343 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -2383,22 +2383,6 @@ public:
   }
 };
 
-class EmacsPopUpMenu : public BPopUpMenu
-{
-public:
-  EmacsPopUpMenu (const char *name) : BPopUpMenu (name, 0)
-  {
-
-  }
-
-  void
-  FrameResized (float w, float h)
-  {
-    Invalidate ();
-    BPopUpMenu::FrameResized (w, h);
-  }
-};
-
 class EmacsFontPreviewDialog : public BWindow
 {
   BStringView text_view;
@@ -3745,7 +3729,8 @@ BView_emacs_delete (void *view)
 void *
 BPopUpMenu_new (const char *name)
 {
-  BPopUpMenu *menu = new EmacsPopUpMenu (name);
+  BPopUpMenu *menu = new BPopUpMenu (name);
+
   menu->SetRadioMode (0);
   return menu;
 }
@@ -3755,9 +3740,11 @@ BPopUpMenu_new (const char *name)
 void
 BMenu_add_title (void *menu, const char *text)
 {
-  EmacsTitleMenuItem *it = new EmacsTitleMenuItem (text);
-  BMenu *mn = (BMenu *) menu;
-  mn->AddItem (it);
+  BMenu *be_menu = (BMenu *) menu;
+  EmacsTitleMenuItem *it;
+
+  it = new EmacsTitleMenuItem (text);
+  be_menu->AddItem (it);
 }
 
 /* Add an item to the menu MENU.  */