merged wxLogDebug -> wxLogTrace change from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -212,7 +212,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
|
|||||||
/* the clipboard is no longer in our hands. we can the delete clipboard data. */
|
/* the clipboard is no longer in our hands. we can the delete clipboard data. */
|
||||||
if (wxTheClipboard->m_data)
|
if (wxTheClipboard->m_data)
|
||||||
{
|
{
|
||||||
wxLogDebug( wxT("wxClipboard will get cleared" ) );
|
wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
|
||||||
|
|
||||||
delete wxTheClipboard->m_data;
|
delete wxTheClipboard->m_data;
|
||||||
wxTheClipboard->m_data = (wxDataObject*) NULL;
|
wxTheClipboard->m_data = (wxDataObject*) NULL;
|
||||||
@@ -590,7 +590,8 @@ bool wxClipboard::GetData( wxDataObject& data )
|
|||||||
|
|
||||||
m_waiting = TRUE;
|
m_waiting = TRUE;
|
||||||
|
|
||||||
wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
|
wxLogTrace( TRACE_CLIPBOARD,
|
||||||
|
wxT("wxClipboard::GetData: format found, start convert") );
|
||||||
|
|
||||||
gtk_selection_convert( m_clipboardWidget,
|
gtk_selection_convert( m_clipboardWidget,
|
||||||
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
||||||
@@ -608,7 +609,8 @@ bool wxClipboard::GetData( wxDataObject& data )
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxLogDebug( wxT("wxClipboard::GetData: format not found") );
|
wxLogTrace( TRACE_CLIPBOARD,
|
||||||
|
wxT("wxClipboard::GetData: format not found") );
|
||||||
|
|
||||||
/* return failure */
|
/* return failure */
|
||||||
delete[] array;
|
delete[] array;
|
||||||
|
@@ -212,7 +212,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
|
|||||||
/* the clipboard is no longer in our hands. we can the delete clipboard data. */
|
/* the clipboard is no longer in our hands. we can the delete clipboard data. */
|
||||||
if (wxTheClipboard->m_data)
|
if (wxTheClipboard->m_data)
|
||||||
{
|
{
|
||||||
wxLogDebug( wxT("wxClipboard will get cleared" ) );
|
wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
|
||||||
|
|
||||||
delete wxTheClipboard->m_data;
|
delete wxTheClipboard->m_data;
|
||||||
wxTheClipboard->m_data = (wxDataObject*) NULL;
|
wxTheClipboard->m_data = (wxDataObject*) NULL;
|
||||||
@@ -590,7 +590,8 @@ bool wxClipboard::GetData( wxDataObject& data )
|
|||||||
|
|
||||||
m_waiting = TRUE;
|
m_waiting = TRUE;
|
||||||
|
|
||||||
wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
|
wxLogTrace( TRACE_CLIPBOARD,
|
||||||
|
wxT("wxClipboard::GetData: format found, start convert") );
|
||||||
|
|
||||||
gtk_selection_convert( m_clipboardWidget,
|
gtk_selection_convert( m_clipboardWidget,
|
||||||
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
||||||
@@ -608,7 +609,8 @@ bool wxClipboard::GetData( wxDataObject& data )
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxLogDebug( wxT("wxClipboard::GetData: format not found") );
|
wxLogTrace( TRACE_CLIPBOARD,
|
||||||
|
wxT("wxClipboard::GetData: format not found") );
|
||||||
|
|
||||||
/* return failure */
|
/* return failure */
|
||||||
delete[] array;
|
delete[] array;
|
||||||
|
Reference in New Issue
Block a user