Get the OS X Cocoa native combobox building by having the native code compile if...

[wxWidgets.git] / src / osx / cocoa / taskbar.mm

diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index b6d327b863f991d1e14d5e71fc240b1bcbd7b354..2f5762665c233105375fe75e8e58f762ef5b0d31 100644 (file)
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
-#ifdef wxUSE_TASKBARICON
+#if wxUSE_TASKBARICON
 
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
@@ -48,9 +48,9 @@ public:
     inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; }
     wxMenu * CreatePopupMenu()
     { return m_taskBarIcon->CreatePopupMenu(); }
-    
-    DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl)
-    
+
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl);
+
 protected:
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;
@@ -162,7 +162,7 @@ wxTaskBarIcon::~wxTaskBarIcon()
 // Operations
 
 bool wxTaskBarIcon::IsIconInstalled() const
-{ 
+{
     return false;
 }
 
@@ -231,7 +231,7 @@ WX_NSMenu wxTaskBarIconDockImpl::CocoaDoGetDockNSMenu()
     return (WX_NSMenu)dockMenu->GetHMenu();
 }
 
-bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
+bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& WXUNUSED(icon), const wxString& WXUNUSED(tooltip))
 {
     wxMacAutoreleasePool pool;
     m_originalDockIcon = [[[NSApplication sharedApplication] applicationIconImage] retain];
@@ -246,7 +246,7 @@ bool wxTaskBarIconDockImpl::RemoveIcon()
     return true;
 }
 
-bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *menu)
+bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu))
 {
     wxFAIL_MSG(wxT("You cannot force the Dock icon menu to popup"));
     return false;
@@ -266,7 +266,7 @@ wxTaskBarIconCustomStatusItemImpl::~wxTaskBarIconCustomStatusItemImpl()
 {
 }
 
-bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
+bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(tooltip))
 {
     wxMacAutoreleasePool pool;
     if(!m_cocoaNSStatusItem)
@@ -359,7 +359,7 @@ void wxTaskBarIconWindowCustom::OnMouseEvent(wxMouseEvent &event)
     m_taskBarIconImpl->GetTaskBarIcon()->ProcessEvent(tbiEvent);
 }
 
-void wxTaskBarIconWindowCustom::OnPaint(wxPaintEvent &event)
+void wxTaskBarIconWindowCustom::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxPaintDC dc(this);
     // FIXME: This is a temporary hack until we can see real icons