From 6a06eecfb2c325b1844b9a7b004ba07d93219806 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 4 Jul 2011 14:05:14 +0000
Subject: [PATCH] Suppress some harmless warnings about unused parameters in
 wxOSX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/osx/carbon/renderer.cpp | 2 +-
 src/osx/core/evtloop_cf.cpp | 4 +++-
 src/osx/window_osx.cpp      | 3 ++-
 src/stc/stc.cpp             | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index 26aa6d6baf..7e5c766acc 100644
--- a/src/osx/carbon/renderer.cpp
+++ b/src/osx/carbon/renderer.cpp
@@ -40,7 +40,7 @@
 
 
 // check if we're having a CGContext we can draw into
-inline bool wxHasCGContext(wxWindow* win, wxDC& dc)
+inline bool wxHasCGContext(wxWindow* WXUNUSED(win), wxDC& dc)
 {
     wxGCDCImpl* gcdc = wxDynamicCast( dc.GetImpl() , wxGCDCImpl);
     
diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 03a71cb9c3..afe67a048c 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -192,7 +192,9 @@ void wxCFEventLoop::CommonModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(obs
     }
 }
 
-void wxCFEventLoop::DefaultModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity)
+void
+wxCFEventLoop::DefaultModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer),
+                                           int WXUNUSED(activity))
 {
     /*
     if ( activity & kCFRunLoopBeforeTimers )
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 628f51c44d..00115ba251 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -444,7 +444,8 @@ void wxWindowMac::MacChildAdded()
 #endif
 }
 
-void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
+void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos),
+                                       const wxSize& WXUNUSED(size))
 {
     // todo remove if refactoring works correctly
 #if 0
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b0a98e41ee..c31f350f55 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -527,9 +527,9 @@ void wxStyledTextCtrl::MarkerDefine(int markerNumber, int markerSymbol,
                 const wxColour& background) {
 
                 SendMsg(2040, markerNumber, markerSymbol);
-                if (foreground.Ok())
+                if (foreground.IsOk())
                     MarkerSetForeground(markerNumber, foreground);
-                if (background.Ok())
+                if (background.IsOk())
                     MarkerSetBackground(markerNumber, background);
 }
 
-- 
2.47.2