X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b5750291a6edda78a42ba64e656932277e4aeaf..6586750c6a4fa9084eaf5075006ca1fcfe50e818:/src/x11/clipbrd.cpp?ds=sidebyside diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp index c5abc23ce8..0e5f06f2ac 100644 --- a/src/x11/clipbrd.cpp +++ b/src/x11/clipbrd.cpp @@ -32,11 +32,15 @@ Atom g_clipboardAtom = 0; Atom g_targetsAtom = 0; #endif -#ifdef __WXDEBUG__ +// avoid warnings about unused static variable (notice that we still use it +// even in release build if the compiler doesn't support variadic macros) +#if defined(__WXDEBUG__) || !defined(HAVE_VARIADIC_MACROS) + // the trace mask we use with wxLogTrace() - call // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here // (there will be a *lot* of them!) -static const wxChar *TRACE_CLIPBOARD = _T("clipboard"); +static const wxChar *TRACE_CLIPBOARD = wxT("clipboard"); + #endif // __WXDEBUG__ //----------------------------------------------------------------------------- @@ -87,7 +91,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), if ( strcmp(gdk_atom_name(type), "TARGETS") ) { wxLogTrace( TRACE_CLIPBOARD, - _T("got unsupported clipboard target") ); + wxT("got unsupported clipboard target") ); clipboard->m_waiting = false; return; @@ -211,8 +215,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) { wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" )); - delete wxTheClipboard->m_data; - wxTheClipboard->m_data = (wxDataObject*) NULL; + wxDELETE(wxTheClipboard->m_data); } } @@ -289,8 +292,8 @@ wxClipboard::wxClipboard() m_ownsClipboard = false; m_ownsPrimarySelection = false; - m_data = (wxDataObject*) NULL; - m_receivedData = (wxDataObject*) NULL; + m_data = NULL; + m_receivedData = NULL; /* we use m_targetsWidget to query what formats are available */ @@ -302,8 +305,6 @@ wxClipboard::wxClipboard() m_formatSupported = false; m_targetRequested = 0; - - m_usePrimary = false; } wxClipboard::~wxClipboard() @@ -329,7 +330,7 @@ void wxClipboard::Clear() { m_waiting = true; - gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, + gtk_selection_owner_set( NULL, g_clipboardAtom, (guint32) GDK_CURRENT_TIME ); while (m_waiting) gtk_main_iteration(); @@ -339,18 +340,14 @@ void wxClipboard::Clear() { m_waiting = true; - gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, + gtk_selection_owner_set( NULL, GDK_SELECTION_PRIMARY, (guint32) GDK_CURRENT_TIME ); while (m_waiting) gtk_main_iteration(); } #endif - if (m_data) - { - delete m_data; - m_data = (wxDataObject*) NULL; - } + wxDELETE(m_data); #if wxUSE_THREADS /* re-enable GUI threads */