projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly reject the use of wxTE_PASSWORD in generic wxSpinCtrl.
[wxWidgets.git]
/
src
/
x11
/
clipbrd.cpp
diff --git
a/src/x11/clipbrd.cpp
b/src/x11/clipbrd.cpp
index 1ae753aec7a944efa3805679eac298891fa1c834..0e5f06f2ac55411828ee660972ae72d4b35a07e0 100644
(file)
--- a/
src/x11/clipbrd.cpp
+++ b/
src/x11/clipbrd.cpp
@@
-32,10
+32,16
@@
Atom g_clipboardAtom = 0;
Atom g_targetsAtom = 0;
#endif
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!)
// 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
//-----------------------------------------------------------------------------
// reminder
@@
-85,7
+91,7
@@
targets_selection_received( GtkWidget *WXUNUSED(widget),
if ( strcmp(gdk_atom_name(type), "TARGETS") )
{
wxLogTrace( TRACE_CLIPBOARD,
if ( strcmp(gdk_atom_name(type), "TARGETS") )
{
wxLogTrace( TRACE_CLIPBOARD,
-
_
T("got unsupported clipboard target") );
+
wx
T("got unsupported clipboard target") );
clipboard->m_waiting = false;
return;
clipboard->m_waiting = false;
return;
@@
-209,8
+215,7
@@
selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
{
wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
{
wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
- delete wxTheClipboard->m_data;
- wxTheClipboard->m_data = (wxDataObject*) NULL;
+ wxDELETE(wxTheClipboard->m_data);
}
}
}
}
@@
-249,7
+254,7
@@
selection_handler( GtkWidget *WXUNUSED(widget),
// transform Unicode text into multibyte before putting it on clipboard
#if wxUSE_UNICODE
// 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);
{
const wchar_t *wstr = (const wchar_t *)d;
size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0);
@@
-287,8
+292,8
@@
wxClipboard::wxClipboard()
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 */
/* we use m_targetsWidget to query what formats are available */
@@
-300,8
+305,6
@@
wxClipboard::wxClipboard()
m_formatSupported = false;
m_targetRequested = 0;
m_formatSupported = false;
m_targetRequested = 0;
-
- m_usePrimary = false;
}
wxClipboard::~wxClipboard()
}
wxClipboard::~wxClipboard()
@@
-327,7
+330,7
@@
void wxClipboard::Clear()
{
m_waiting = true;
{
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();
(guint32) GDK_CURRENT_TIME );
while (m_waiting) gtk_main_iteration();
@@
-337,18
+340,14
@@
void wxClipboard::Clear()
{
m_waiting = true;
{
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
(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 */
#if wxUSE_THREADS
/* re-enable GUI threads */