From 357f4c818d25cd63efc90363cc48d79c76f2faf1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 10 Nov 2010 13:52:17 +0000 Subject: [PATCH] Fix harmless unused parameter warnings in minimal build. No real changes, just add some wxUnusedVar() to avoid warnings about parameters unused in some non-default build configurations. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/bitmap.cpp | 2 ++ src/gtk/evtloop.cpp | 4 +++- src/unix/utilsunx.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 5cbff7b..b26bafc 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -672,6 +672,8 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) else #endif { + wxUnusedVar(type); // The type is detected automatically by GDK. + UnRef(); GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(name.fn_str(), NULL); if (pixbuf) diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index 54b2168..a35be35 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -91,10 +91,12 @@ void wxGUIEventLoop::WakeUp() extern "C" { -static gboolean wx_on_channel_event(GIOChannel * WXUNUSED_UNLESS_DEBUG(channel), +static gboolean wx_on_channel_event(GIOChannel *channel, GIOCondition condition, gpointer data) { + wxUnusedVar(channel); // Unused if !wxUSE_LOG || !wxDEBUG_LEVEL + wxLogTrace(wxTRACE_EVT_SOURCE, "wx_on_channel_event, fd=%d, condition=%08x", g_io_channel_unix_get_fd(channel), condition); diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index fa5ee5d..f5380ab 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1307,6 +1307,8 @@ bool wxAppTraits::CheckForRedirectedIO(wxExecuteData& execData) return hasIO; #else // !HAS_PIPE_INPUT_STREAM + wxUnusedVar(execData); + return false; #endif // HAS_PIPE_INPUT_STREAM/!HAS_PIPE_INPUT_STREAM } -- 2.7.4