Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate clipboard events for wxComboBox in wxGTK too.

Browse Source 
These events were only generated for wxTextCtrl but should be sent for
non-readonly wxComboBox too, so refactor the code to allow its reuse from
wxComboBox.

Also add EVT_TEXT_PASTE handlers for both controls to the widgets sample for
testing.

Closes #14520.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-29 22:08:15 +00:00
parent 756ead6f83
commit 1043456035
7 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gtk/textctrl.cpp
View File

@@ -555,48 +555,6 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
}
}
//-----------------------------------------------------------------------------
// clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
//-----------------------------------------------------------------------------
// common part of the event handlers below
static void
handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
wxEventType eventType, const gchar * signal_name)
{
wxClipboardTextEvent event( eventType, win->GetId() );
event.SetEventObject( win );
if ( win->HandleWindowEvent( event ) )
{
// don't let the default processing to take place if we did something
// ourselves in the event handler
g_signal_stop_emission_by_name (widget, signal_name);
}
}
extern "C" {
static void
gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
{
handle_text_clipboard_callback(
widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
}
static void
gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
{
handle_text_clipboard_callback(
widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
}
static void
gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
{
handle_text_clipboard_callback(
widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
}
}
//-----------------------------------------------------------------------------
// "mark_set"
//-----------------------------------------------------------------------------
@@ -829,12 +787,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
}
g_signal_connect (m_text, "copy-clipboard",
G_CALLBACK (gtk_copy_clipboard_callback), this);
g_signal_connect (m_text, "cut-clipboard",
G_CALLBACK (gtk_cut_clipboard_callback), this);
g_signal_connect (m_text, "paste-clipboard",
G_CALLBACK (gtk_paste_clipboard_callback), this);
GTKConnectClipboardSignals(m_text);
m_cursor = wxCursor( wxCURSOR_IBEAM );