wxGTK1 compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index d17158dedde6515c01a60fe49d48360f0eeed60a..320b335854d6bfc55d2d1e2bfd4f73e5d6ae2688 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -35,7 +35,7 @@ GdkAtom  g_timestampAtom   = 0;
 // 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");
+#define TRACE_CLIPBOARD "clipboard"
 
 //-----------------------------------------------------------------------------
 // reminder

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index a1345d8e0682c4ce70119c941c823967238ae122..ade45b2cfc8885cd15b4d25498151051e7267a9e 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -489,7 +489,7 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
     return GetData() ? def : wxDragNone;
 }
 
-GdkAtom wxDropTarget::GetMatchingPair()
+GdkAtom wxDropTarget::GetMatchingPair(bool quiet)
 {
     if (!m_dataObject)
         return (GdkAtom) 0;