AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wxGtkString here to clean up code, and not leak in debug builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp 2006-03-15 09:12:52 +00:00
parent 4b84311a44
commit 67756da424
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/clipbrd.cpp
View File

@ -18,9 +18,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/log.h" #include "wx/log.h"
#include <glib.h> #include "wx/gtk/private.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// thread system // thread system
@ -88,17 +86,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
GdkAtom type = selection_data->type; GdkAtom type = selection_data->type;
if ( type != GDK_SELECTION_TYPE_ATOM ) if ( type != GDK_SELECTION_TYPE_ATOM )
{ {
gchar* atom_name = gdk_atom_name(type); if ( strcmp(wxGtkString(gdk_atom_name(type)), "TARGETS") )
if ( strcmp(atom_name, "TARGETS") )
{ {
wxLogTrace( TRACE_CLIPBOARD, wxLogTrace( TRACE_CLIPBOARD,
_T("got unsupported clipboard target") ); _T("got unsupported clipboard target") );
clipboard->m_waiting = FALSE; clipboard->m_waiting = FALSE;
g_free(atom_name);
return; return;
} }
g_free(atom_name);
} }
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@ -279,9 +274,9 @@ selection_handler( GtkWidget *WXUNUSED(widget),
wxLogTrace(TRACE_CLIPBOARD, wxLogTrace(TRACE_CLIPBOARD,
_T("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"), _T("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"),
format.GetId().c_str(), format.GetId().c_str(),
wxString::FromAscii(gdk_atom_name(selection_data->target)).c_str(), wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->target))).c_str(),
wxString::FromAscii(gdk_atom_name(selection_data->type)).c_str(), wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->type))).c_str(),
wxString::FromAscii(gdk_atom_name(selection_data->selection)).c_str(), wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->selection))).c_str(),
GPOINTER_TO_UINT( signal_data ) GPOINTER_TO_UINT( signal_data )
); );
#endif #endif