Skip to content

Commit fd6721a

Browse files
committed
gui: rename ID_MULTISYNC to ID_INPUT_MULTISYNC
re #216
1 parent d67a168 commit fd6721a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/gui/FrameMain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ FrameMain::FrameMain(wxWindow* parent, wxWindowID id, const wxString& title, con
4646
Bind(wxEVT_MENU, &FrameMain::machine_input_record, this, ID_INPUT_RECORD);
4747
wxglade_tmp_menu->Append(ID_INPUT_REPLAY, _("Replay Input"), wxEmptyString);
4848
Bind(wxEVT_MENU, &FrameMain::machine_input_replay, this, ID_INPUT_REPLAY);
49-
wxglade_tmp_menu->Append(ID_MULTISYNC, _("Multi-Sync Input\tCtrl-M"), wxEmptyString, wxITEM_CHECK);
50-
Bind(wxEVT_MENU, &FrameMain::machine_multisync, this, ID_MULTISYNC);
49+
wxglade_tmp_menu->Append(ID_INPUT_MULTISYNC, _("Multi-Sync Input\tCtrl-M"), wxEmptyString, wxITEM_CHECK);
50+
Bind(wxEVT_MENU, &FrameMain::machine_multisync, this, ID_INPUT_MULTISYNC);
5151
wxglade_tmp_menu->AppendSeparator();
5252
wxglade_tmp_menu->Append(wxID_EXIT, _("Quit"), _("Exit MultiVNC."));
5353
Bind(wxEVT_MENU, &FrameMain::machine_exit, this, wxID_EXIT);

src/gui/MyFrameMain.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ MyFrameMain::MyFrameMain(wxWindow* parent, int id, const wxString& title,
121121
frame_main_menubar->Enable(ID_INPUT_REPLAY, false);
122122
// multi-sync input
123123
multi_sync_enabled = false;
124-
frame_main_menubar->Enable(ID_MULTISYNC, false);
124+
frame_main_menubar->Enable(ID_INPUT_MULTISYNC, false);
125125
// bookmarks
126126
frame_main_menubar->Enable(wxID_ADD, false);
127127
// window sharing
@@ -1362,7 +1362,7 @@ void MyFrameMain::conn_terminate(int which)
13621362
// multi-sync: auto-disable if fewer than 2 connections remain
13631363
if (multi_sync_enabled && connections.size() < 2) {
13641364
multi_sync_enabled = false;
1365-
frame_main_menubar->Check(ID_MULTISYNC, false);
1365+
frame_main_menubar->Check(ID_INPUT_MULTISYNC, false);
13661366
}
13671367
updateMultiSyncTargets();
13681368

@@ -1991,7 +1991,7 @@ void MyFrameMain::machine_multisync(wxCommandEvent &event)
19911991

19921992
void MyFrameMain::updateMultiSyncTargets()
19931993
{
1994-
frame_main_menubar->Enable(ID_MULTISYNC, connections.size() >= 2);
1994+
frame_main_menubar->Enable(ID_INPUT_MULTISYNC, connections.size() >= 2);
19951995

19961996
const wxString syncPrefix = "[Sync] ";
19971997

src/gui/evtids.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ enum
2323
ID_INPUT_RECORD,
2424
ID_INPUT_REPLAY,
2525
ID_ISSUE_LIST,
26-
ID_MULTISYNC,
26+
ID_INPUT_MULTISYNC,
2727
};
2828

2929

src/gui/multivnc.wxg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</item>
6868
<item>
6969
<label>Multi-Sync Input Ctrl-M</label>
70-
<id>ID_MULTISYNC</id>
70+
<id>ID_INPUT_MULTISYNC</id>
7171
<checkable>1</checkable>
7272
<handler>machine_multisync</handler>
7373
</item>

0 commit comments

Comments
 (0)