Skip to content

Commit ef44a3c

Browse files
Found out why copy sometimes failed
The "wxID_COPY" signal was connected to more than one copy function. All of these functions worked. But filling the clipboard more than once seems to have caused a timing problem somewhere in gnome.
1 parent 0a3bafe commit ef44a3c

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

src/wxMaxima.cpp

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ wxMaxima::wxMaxima(wxWindow *parent, int id, wxLocale *locale, const wxString ti
290290
wxCommandEventHandler(wxMaxima::FileMenu), NULL, this);
291291
Connect(menu_check_updates, wxEVT_MENU,
292292
wxCommandEventHandler(wxMaxima::HelpMenu), NULL, this);
293-
Connect(wxID_COPY, wxEVT_MENU,
294-
wxCommandEventHandler(wxMaxima::PopupMenu), NULL, this);
295293
Connect(Worksheet::popid_copy_image, wxEVT_MENU,
296294
wxCommandEventHandler(wxMaxima::PopupMenu), NULL, this);
297295
Connect(Worksheet::popid_copy_animation, wxEVT_MENU,
@@ -714,8 +712,6 @@ wxMaxima::wxMaxima(wxWindow *parent, int id, wxLocale *locale, const wxString ti
714712
wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
715713
Connect(menu_copy_to_file, wxEVT_MENU,
716714
wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
717-
Connect(wxID_SELECTALL, wxEVT_MENU,
718-
wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
719715
Connect(menu_subst, wxEVT_MENU,
720716
wxCommandEventHandler(wxMaxima::MaximaMenu), NULL, this);
721717
Connect(ToolBar::tb_interrupt, wxEVT_TOOL,
@@ -797,11 +793,9 @@ wxMaxima::wxMaxima(wxWindow *parent, int id, wxLocale *locale, const wxString ti
797793
Connect(menu_paste_input, wxEVT_MENU,
798794
wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
799795
Connect(wxID_CUT, wxEVT_MENU,
800-
wxCommandEventHandler(wxMaxima::PopupMenu), NULL, this);
801-
Connect(wxID_PASTE, wxEVT_MENU,
802-
wxCommandEventHandler(wxMaxima::PopupMenu), NULL, this);
796+
wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
803797
Connect(wxID_SELECTALL, wxEVT_MENU,
804-
wxCommandEventHandler(wxMaxima::PopupMenu), NULL, this);
798+
wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
805799
Connect(Worksheet::popid_comment_selection, wxEVT_MENU,
806800
wxCommandEventHandler(wxMaxima::PopupMenu), NULL, this);
807801
Connect(Worksheet::popid_divide_cell, wxEVT_MENU,
@@ -8370,9 +8364,6 @@ void wxMaxima::PopupMenu(wxCommandEvent &event)
83708364
EvaluationQueueLength(m_worksheet->m_evaluationQueue.Size(), m_worksheet->m_evaluationQueue.CommandsLeftInCell());
83718365
TriggerEvaluation();
83728366
break;
8373-
case wxID_COPY:
8374-
m_worksheet->Copy();
8375-
break;
83768367
case Worksheet::popid_copy_matlab:
83778368
if (m_worksheet->CanCopy(true))
83788369
m_worksheet->CopyMatlab();
@@ -8385,16 +8376,6 @@ void wxMaxima::PopupMenu(wxCommandEvent &event)
83858376
if (m_worksheet->CanCopy(true))
83868377
m_worksheet->CopyText();
83878378
break;
8388-
case wxID_CUT:
8389-
if (m_worksheet->CanCut())
8390-
m_worksheet->CutToClipboard();
8391-
break;
8392-
case wxID_PASTE:
8393-
m_worksheet->PasteFromClipboard();
8394-
break;
8395-
case wxID_SELECTALL:
8396-
m_worksheet->SelectAll();
8397-
break;
83988379
case Worksheet::popid_comment_selection:
83998380
m_worksheet->CommentSelection();
84008381
break;

0 commit comments

Comments
 (0)