X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/x11/clipbrd.cpp diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp index 479e96dff7..0e5f06f2ac 100644 --- a/src/x11/clipbrd.cpp +++ b/src/x11/clipbrd.cpp @@ -17,11 +17,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dataobj.h" #endif -#include "wx/dataobj.h" -#include "wx/utils.h" - #include "wx/x11/private.h" //----------------------------------------------------------------------------- @@ -33,10 +32,16 @@ Atom g_clipboardAtom = 0; Atom g_targetsAtom = 0; #endif +// 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__ //----------------------------------------------------------------------------- // reminder @@ -86,9 +91,9 @@ 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; + clipboard->m_waiting = false; return; } } @@ -113,14 +118,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), if (format == clipboard->m_targetRequested) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; clipboard->m_formatSupported = true; return; } } } - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; } //----------------------------------------------------------------------------- @@ -137,7 +142,7 @@ selection_received( GtkWidget *WXUNUSED(widget), { if (!wxTheClipboard) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } @@ -145,13 +150,13 @@ selection_received( GtkWidget *WXUNUSED(widget), if (!data_object) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } if (selection_data->length <= 0) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } @@ -160,7 +165,7 @@ selection_received( GtkWidget *WXUNUSED(widget), /* make sure we got the data in the correct format */ if (!data_object->IsSupportedFormat( format ) ) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } @@ -168,14 +173,14 @@ selection_received( GtkWidget *WXUNUSED(widget), if so, copy data to target object */ if (selection_data->type != GDK_SELECTION_TYPE_STRING) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data ); wxTheClipboard->m_formatSupported = true; - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; } //----------------------------------------------------------------------------- @@ -189,16 +194,16 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) if (event->selection == GDK_SELECTION_PRIMARY) { - wxTheClipboard->m_ownsPrimarySelection = FALSE; + wxTheClipboard->m_ownsPrimarySelection = false; } else if (event->selection == g_clipboardAtom) { - wxTheClipboard->m_ownsClipboard = FALSE; + wxTheClipboard->m_ownsClipboard = false; } else { - wxTheClipboard->m_waiting = FALSE; + wxTheClipboard->m_waiting = false; return FALSE; } @@ -210,12 +215,11 @@ 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); } } - wxTheClipboard->m_waiting = FALSE; + wxTheClipboard->m_waiting = false; return TRUE; } @@ -250,7 +254,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), // transform Unicode text into multibyte before putting it on clipboard #if wxUSE_UNICODE - if ( format.GetType() == wxDF_TEXT ) + if ( format.GetType() == wxDF_TEXT || format.GetType() == wxDF_UNICODETEXT) { const wchar_t *wstr = (const wchar_t *)d; size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0); @@ -283,13 +287,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject) wxClipboard::wxClipboard() { - m_open = FALSE; + m_open = false; - m_ownsClipboard = FALSE; - m_ownsPrimarySelection = FALSE; + 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 */ @@ -299,10 +303,8 @@ wxClipboard::wxClipboard() if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False ); #endif - m_formatSupported = FALSE; + m_formatSupported = false; m_targetRequested = 0; - - m_usePrimary = FALSE; } wxClipboard::~wxClipboard() @@ -328,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(); @@ -338,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 */ @@ -371,9 +369,9 @@ bool wxClipboard::Open() bool wxClipboard::SetData( wxDataObject *data ) { - wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); + wxCHECK_MSG( data, false, wxT("data is invalid") ); Clear(); @@ -383,11 +381,11 @@ bool wxClipboard::SetData( wxDataObject *data ) bool wxClipboard::AddData( wxDataObject *data ) { #if wxUSE_NANOX - return FALSE; + return false; #else - wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); + wxCHECK_MSG( data, false, wxT("data is invalid") ); /* we can only store one wxDataObject */ Clear(); @@ -432,7 +430,7 @@ bool wxClipboard::AddData( wxDataObject *data ) /* disable GUI threads */ #endif - bool res = FALSE; + bool res = false; #if 0 /* Tell the world we offer clipboard data */ res = (gtk_selection_owner_set( m_clipboardWidget, @@ -457,7 +455,7 @@ void wxClipboard::Close() { wxCHECK_RET( m_open, wxT("clipboard not open") ); - m_open = FALSE; + m_open = false; } bool wxClipboard::IsOpened() const @@ -539,7 +537,7 @@ bool wxClipboard::GetData( wxDataObject& data ) clipboard owner which is an asynchronous process. therefore we set m_waiting = true here and wait until the callback "targets_selection_received" - sets it to FALSE */ + sets it to false */ m_waiting = true; @@ -591,7 +589,7 @@ bool wxClipboard::GetData( wxDataObject& data ) #endif /* this is a true error as we checked for the presence of such data before */ - wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") ); + wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") ); /* return success */ delete[] array;