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

Removed Vadim's surplus code in clipboard.

Browse Source 
wxTreeCtrl now creates its two font in the constructor.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-09 14:48:41 +00:00
parent dcda1c71b1
commit eff869aad2
5 changed files with 43 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk1/clipbrd.cpp
View File

@@ -79,31 +79,17 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
if ( wxTheClipboard && selection_data->length > 0 )
{
/* make sure we got the data in the correct form */
// VZ: I don't know what does this mean (and GTK+ authors apparently
// don't know either, Owen Taylor writes that "Motif seems to ask
// for TARGETS atom sometimes" (??)), but it seems that xterm
// (which is not a Motif app AFAIK) does this too, so it's
// absolutely essential to support this, otherwise we can't paste
// text from xterm!
GdkAtom type = selection_data->type;
if ( type != GDK_SELECTION_TYPE_ATOM )
{
if ( strcmp(gdk_atom_name(type), "TARGETS") != 0 )
{
// don't know what this is
clipboard->m_waiting = FALSE;
return;
}
//else: don't know what this is, but it seems to work in the same
// way as GDK_SELECTION_TYPE_ATOM does
clipboard->m_waiting = FALSE;
return;
}
//else: the data is the list of formats supported by the selection
/*
/*
wxDataFormat clip( selection_data->selection );
wxLogDebug( wxT("selection received for targets, clipboard %s"), clip.GetId().c_str() );
*/
*/
// the atoms we received, holding a list of targets (= formats)
GdkAtom *atoms = (GdkAtom *)selection_data->data;
@@ -112,9 +98,9 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
{
wxDataFormat format( atoms[i] );
/*
/*
wxLogDebug( wxT("selection received for targets, format %s"), format.GetId().c_str() );
*/
*/
if (format == clipboard->m_targetRequested)
{
@@ -484,11 +470,13 @@ bool wxClipboard::IsOpened() const
bool wxClipboard::IsSupported( const wxDataFormat& format )
{
/* reentrance problems */
if (m_open) return TRUE;
if (m_waiting) return FALSE;
/* store requested format to be asked for by callbacks */
m_targetRequested = format;
wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() );
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
m_formatSupported = FALSE;