Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused variable mergetbar #781

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Remove unused variable mergetbar #781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 24 additions & 28 deletions src/myframe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ struct MyFrame : wxFrame {
tbi.Connect(wxID_ANY, wxEVT_TASKBAR_LEFT_DCLICK,
wxTaskBarIconEventHandler(MyFrame::OnTBIDBLClick), nullptr, this);

bool mergetbar = false;

bool showtbar, showsbar, lefttabs;

sys->cfg->Read(L"showtbar", &showtbar, true);
Expand Down Expand Up @@ -638,32 +636,30 @@ struct MyFrame : wxFrame {
wxAcceleratorTable accel(3, entries);
SetAcceleratorTable(accel);

if (!mergetbar) {
wxMenuBar *menubar = new wxMenuBar();
menubar->Append(filemenu, _(L"&File"));
menubar->Append(editmenu, _(L"&Edit"));
menubar->Append(semenu, _(L"&Search"));
menubar->Append(viewmenu, _(L"&View"));
menubar->Append(optmenu, _(L"&Options"));
menubar->Append(scriptmenu, _(L"Script"));
menubar->Append(langmenu, _(L"&Program"));
menubar->Append(helpmenu,
#ifdef __WXMAC__
wxApp::s_macHelpMenuTitleName // so merges with osx provided help
#else
_(L"&Help")
#endif
);
#ifdef __WXMAC__
// these don't seem to work anymore in the newer wxWidgets, handled in the menu event
// handler below instead
wxApp::s_macAboutMenuItemId = wxID_ABOUT;
wxApp::s_macExitMenuItemId = wxID_EXIT;
wxApp::s_macPreferencesMenuItemId =
wxID_SELECT_FONT; // we have no prefs, so for now just select the font
#endif
SetMenuBar(menubar);
}
wxMenuBar *menubar = new wxMenuBar();
menubar->Append(filemenu, _(L"&File"));
menubar->Append(editmenu, _(L"&Edit"));
menubar->Append(semenu, _(L"&Search"));
menubar->Append(viewmenu, _(L"&View"));
menubar->Append(optmenu, _(L"&Options"));
menubar->Append(scriptmenu, _(L"Script"));
menubar->Append(langmenu, _(L"&Program"));
menubar->Append(helpmenu,
#ifdef __WXMAC__
wxApp::s_macHelpMenuTitleName // so merges with osx provided help
#else
_(L"&Help")
#endif
);
#ifdef __WXMAC__
// these don't seem to work anymore in the newer wxWidgets, handled in the menu event
// handler below instead
wxApp::s_macAboutMenuItemId = wxID_ABOUT;
wxApp::s_macExitMenuItemId = wxID_EXIT;
wxApp::s_macPreferencesMenuItemId =
wxID_SELECT_FONT; // we have no prefs, so for now just select the font
#endif
SetMenuBar(menubar);

ConstructToolBar();

Expand Down
Loading