Merge pull request #5546 from vomikan/master

fix(#5541): refactoring
moneymanagerex · Jan 13, 2023 · 4cc7a21 · 4cc7a21
2 parents b8c84c1 + 8a7b8cb
commit 4cc7a21
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/src/accountdialog.cpp b/src/accountdialog.cpp
@@ -426,26 +426,21 @@ void mmNewAcctDialog::OnAttachments(wxCommandEvent& /*event*/)
 
 void mmNewAcctDialog::OnImageButton(wxCommandEvent& /*event*/)
 {
-    wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, wxID_ANY);
-    ev.SetEventObject(this);
-
-    wxSharedPtr<wxMenu> mainMenu(new wxMenu);
-    wxMenuItem* menuItem = new wxMenuItem(mainMenu.get(), wxID_HIGHEST + acc_img::ACC_ICON_MONEY - 1, _("Default Image"));
-#ifdef __WXMSW__    // Avoid transparancy black background issue
-    menuItem->SetBackgroundColour(wxColour(* wxWHITE));
-#endif
+    wxMenu mainMenu;
+    wxMenuItem* menuItem = new wxMenuItem(&mainMenu, wxID_HIGHEST + acc_img::ACC_ICON_MONEY - 1, _("Default Image"));
+
     menuItem->SetBitmap(m_images.at(Option::instance().AccountImageId(this->m_account->ACCOUNTID, true)));
-    mainMenu->Append(menuItem);
+    mainMenu.Append(menuItem);
 
     for (int i = img::LAST_NAVTREE_PNG; i < acc_img::MAX_ACC_ICON; ++i)
     {
-        menuItem = new wxMenuItem(mainMenu.get(), wxID_HIGHEST + i
+        menuItem = new wxMenuItem(&mainMenu, wxID_HIGHEST + i
             , wxString::Format(_("Image #%i"), i - img::LAST_NAVTREE_PNG + 1));
         menuItem->SetBitmap(m_images.at(i));
-        mainMenu->Append(menuItem);
+        mainMenu.Append(menuItem);
     }
 
-    PopupMenu(mainMenu.get());
+    PopupMenu(&mainMenu);
 }
 
 void mmNewAcctDialog::OnCustonImage(wxCommandEvent& event)