Don't initialize argv member of wxApp in unicode mode where it's no longer a primitiv...

[wxWidgets.git] / src / gtk / dataobj.cpp

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index f0ed8dcb5a7e1089426e2faf2b215c88f11f05d9..6ea3dc4f2f1d22f67b9a7ddf5ded82a32ff8957c 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -204,13 +204,17 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir)
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 

-#if defined(__WXGTK20__) && wxUSE_UNICODE
-void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const
+#if wxUSE_UNICODE
+
+void
+wxTextDataObject::GetAllFormats(wxDataFormat *formats,
+                                wxDataObjectBase::Direction WXUNUSED(dir)) const

 {
     *formats++ = GetPreferredFormat();
     *formats = g_altTextAtom;
 }
 {
     *formats++ = GetPreferredFormat();
     *formats = g_altTextAtom;
 }

-#endif
+
+#endif // wxUSE_UNICODE

 
 // ----------------------------------------------------------------------------
 // wxFileDataObject
 
 // ----------------------------------------------------------------------------
 // wxFileDataObject