DnD updates
Clipboard pasting (for wxDF_TEXT) print dialog looks better now font dialog ibid git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,30 +21,87 @@ wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
|
||||
|
||||
GdkAtom g_textAtom = 0;
|
||||
GdkAtom g_clipboardAtom = 0;
|
||||
GdkAtom g_targetsAtom = 0;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// functions
|
||||
// reminder
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void wxInitClipboard()
|
||||
{
|
||||
if (wxTheClipboard) delete wxTheClipboard;
|
||||
wxTheClipboard = new wxClipboard();
|
||||
}
|
||||
/* The contents of a selection are returned in a GtkSelectionData
|
||||
structure. selection/target identify the request.
|
||||
type specifies the type of the return; if length < 0, and
|
||||
the data should be ignored. This structure has object semantics -
|
||||
no fields should be modified directly, they should not be created
|
||||
directly, and pointers to them should not be stored beyond the duration of
|
||||
a callback. (If the last is changed, we'll need to add reference
|
||||
counting)
|
||||
|
||||
void wxDoneClipboard()
|
||||
struct _GtkSelectionData
|
||||
{
|
||||
if (wxTheClipboard) delete wxTheClipboard;
|
||||
wxTheClipboard = (wxClipboard*) NULL;
|
||||
GdkAtom selection;
|
||||
GdkAtom target;
|
||||
GdkAtom type;
|
||||
gint format;
|
||||
guchar *data;
|
||||
gint length;
|
||||
};
|
||||
|
||||
*/
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "selection_received" for targets
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static void
|
||||
targets_selection_received( GtkWidget *WXUNUSED(widget),
|
||||
GtkSelectionData *selection_data,
|
||||
wxClipboard *clipboard )
|
||||
{
|
||||
if (!wxTheClipboard) return;
|
||||
|
||||
if (selection_data->length <= 0) return;
|
||||
|
||||
// make sure we got the data in the correct form
|
||||
if (selection_data->type != GDK_SELECTION_TYPE_ATOM) return;
|
||||
|
||||
// the atoms we received, holding a list of targets (= formats)
|
||||
GdkAtom *atoms = (GdkAtom *)selection_data->data;
|
||||
|
||||
for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
|
||||
{
|
||||
if (atoms[i] == clipboard->m_targetRequested)
|
||||
{
|
||||
clipboard->m_formatSupported = TRUE;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "selection_received"
|
||||
// "selection_received" for the actual data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static void
|
||||
selection_received( GtkWidget *widget, GtkSelectionData *selection_data, gpointer data )
|
||||
selection_received( GtkWidget *WXUNUSED(widget),
|
||||
GtkSelectionData *selection_data,
|
||||
wxClipboard *clipboard )
|
||||
{
|
||||
if (!wxTheClipboard) return;
|
||||
|
||||
if (selection_data->length <= 0) return;
|
||||
|
||||
size_t size = (size_t) selection_data->length;
|
||||
|
||||
// make sure we got the data in the correct form
|
||||
if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
|
||||
|
||||
clipboard->m_receivedSize = size;
|
||||
|
||||
clipboard->m_receivedData = new char[size+1];
|
||||
|
||||
memcpy( clipboard->m_receivedData, selection_data->data, size);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -52,13 +109,13 @@ selection_received( GtkWidget *widget, GtkSelectionData *selection_data, gpointe
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static gint
|
||||
selection_clear( GtkWidget *widget, GdkEventSelection *event )
|
||||
selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event) )
|
||||
{
|
||||
/* The clipboard is no longer in our hands. We can delete the
|
||||
* clipboard data. I hope I got that one right... */
|
||||
|
||||
if (!wxTheClipboard) return TRUE;
|
||||
|
||||
/* the clipboard is no longer in our hands. we can delete the
|
||||
* clipboard data. I hope I got that one right... */
|
||||
|
||||
wxTheClipboard->SetData( (wxDataObject*) NULL );
|
||||
|
||||
return TRUE;
|
||||
@@ -115,9 +172,22 @@ wxClipboard::wxClipboard()
|
||||
|
||||
if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
|
||||
if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
|
||||
if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
|
||||
|
||||
m_receivedData = (char*)NULL;
|
||||
m_receivedSize = 0;
|
||||
m_formatSupported = FALSE;
|
||||
m_targetRequested = 0;
|
||||
}
|
||||
|
||||
wxClipboard::~wxClipboard()
|
||||
{
|
||||
Clear();
|
||||
|
||||
if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
|
||||
}
|
||||
|
||||
void wxClipboard::Clear()
|
||||
{
|
||||
/* As we have data we also own the clipboard. Once we no longer own
|
||||
it, clear_selection is called which will set m_data to zero */
|
||||
@@ -127,7 +197,18 @@ wxClipboard::~wxClipboard()
|
||||
delete m_data;
|
||||
gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
|
||||
}
|
||||
if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
|
||||
|
||||
m_receivedSize = 0;
|
||||
|
||||
if (m_receivedData)
|
||||
{
|
||||
delete[] m_receivedData;
|
||||
m_receivedData = (char*) NULL;
|
||||
}
|
||||
|
||||
m_targetRequested = 0;
|
||||
|
||||
m_formatSupported = FALSE;
|
||||
}
|
||||
|
||||
void wxClipboard::SetData( wxDataObject *data )
|
||||
@@ -147,14 +228,6 @@ void wxClipboard::SetData( wxDataObject *data )
|
||||
|
||||
switch (m_data->GetPreferredFormat())
|
||||
{
|
||||
/*
|
||||
case wxDF_STRING:
|
||||
gtk_selection_add_handler( m_clipboardWidget,
|
||||
g_clipboardAtom,
|
||||
GDK_TARGET_STRING,
|
||||
selection_handler,
|
||||
NULL );
|
||||
break;
|
||||
case wxDF_TEXT:
|
||||
gtk_selection_add_handler( m_clipboardWidget,
|
||||
g_clipboardAtom,
|
||||
@@ -162,23 +235,108 @@ void wxClipboard::SetData( wxDataObject *data )
|
||||
selection_handler,
|
||||
NULL );
|
||||
break;
|
||||
*/
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void *wxClipboard::GetData( wxDataFormat format, size_t *length )
|
||||
bool wxClipboard::IsSupportedFormat( wxDataFormat format )
|
||||
{
|
||||
if (!IsAvailable(format))
|
||||
m_targetRequested = 0;
|
||||
|
||||
if (format == wxDF_TEXT)
|
||||
{
|
||||
if (length) *length = 0;
|
||||
return NULL;
|
||||
// m_targetRequested = g_textAtom;
|
||||
m_targetRequested = GDK_TARGET_STRING;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
if (m_targetRequested == 0) return FALSE;
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
|
||||
"selection_received",
|
||||
GTK_SIGNAL_FUNC( targets_selection_received ),
|
||||
(gpointer) this );
|
||||
|
||||
m_formatSupported = FALSE;
|
||||
|
||||
gtk_selection_convert( m_clipboardWidget,
|
||||
g_clipboardAtom,
|
||||
g_targetsAtom,
|
||||
GDK_CURRENT_TIME );
|
||||
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget),
|
||||
GTK_SIGNAL_FUNC( targets_selection_received ),
|
||||
(gpointer) this );
|
||||
|
||||
if (!m_formatSupported) return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool wxClipboard::IsAvailable( wxDataFormat WXUNUSED(format) )
|
||||
bool wxClipboard::ObtainData( wxDataFormat format )
|
||||
{
|
||||
return FALSE;
|
||||
m_receivedSize = 0;
|
||||
|
||||
if (m_receivedData)
|
||||
{
|
||||
delete[] m_receivedData;
|
||||
m_receivedData = (char*) NULL;
|
||||
}
|
||||
|
||||
m_targetRequested = 0;
|
||||
|
||||
if (format == wxDF_TEXT)
|
||||
{
|
||||
// m_targetRequested = g_textAtom;
|
||||
m_targetRequested = GDK_TARGET_STRING;
|
||||
}
|
||||
|
||||
if (m_targetRequested == 0) return FALSE;
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
|
||||
"selection_received",
|
||||
GTK_SIGNAL_FUNC( selection_received ),
|
||||
(gpointer) this );
|
||||
|
||||
gtk_selection_convert( m_clipboardWidget,
|
||||
g_clipboardAtom,
|
||||
m_targetRequested,
|
||||
GDK_CURRENT_TIME );
|
||||
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget),
|
||||
GTK_SIGNAL_FUNC( selection_received ),
|
||||
(gpointer) this );
|
||||
|
||||
if (m_receivedSize == 0) return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
size_t wxClipboard::GetDataSize() const
|
||||
{
|
||||
return m_receivedSize;
|
||||
}
|
||||
|
||||
void wxClipboard::GetDataHere( void *data ) const
|
||||
{
|
||||
memcpy(data, m_receivedData, m_receivedSize );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxClipboardModule
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
|
||||
|
||||
bool wxClipboardModule::OnInit()
|
||||
{
|
||||
wxTheClipboard = new wxClipboard();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxClipboardModule::OnExit()
|
||||
{
|
||||
if (wxTheClipboard) delete wxTheClipboard;
|
||||
wxTheClipboard = (wxClipboard*) NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user