Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index 800c52cee2d167588efb090f6a21f8d56ca30f6a..20d09701ac3b12b29e58fad8e1003e9fe17c5d0a 100644 (file)
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -4,7 +4,7 @@
 // Author:      David Elliott, Stefan Csomor
 // Modified by:
 // Created:     2004/01/24
 // Author:      David Elliott, Stefan Csomor
 // Modified by:
 // Created:     2004/01/24

-// RCS-ID:      $Id: taskbar.mm 35650 2005-09-23 12:56:45Z MR $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2004 David Elliott, Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 David Elliott, Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////


@@ -62,7 +62,7 @@ public:
     virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) = 0;
     virtual bool RemoveIcon() = 0;
     
     virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) = 0;
     virtual bool RemoveIcon() = 0;
     

-    bool IsIconInstalled() const { return m_icon.Ok(); }
+    bool IsIconInstalled() const { return m_icon.IsOk(); }

         
     virtual bool PopupMenu(wxMenu *menu) = 0;
     virtual ~wxTaskBarIconImpl();
         
     virtual bool PopupMenu(wxMenu *menu) = 0;
     virtual ~wxTaskBarIconImpl();


@@ -141,9 +141,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType iconType)
 {
 
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType iconType)
 {

-    if(iconType == DOCK)
+    if(iconType == wxTBI_DOCK)

         m_impl = new wxTaskBarIconDockImpl(this);
         m_impl = new wxTaskBarIconDockImpl(this);

-    else if(iconType == CUSTOM_STATUSITEM)
+    else if(iconType == wxTBI_CUSTOM_STATUSITEM)

         m_impl = new wxTaskBarIconCustomStatusItemImpl(this);
     else
     {   m_impl = NULL;
         m_impl = new wxTaskBarIconCustomStatusItemImpl(this);
     else
     {   m_impl = NULL;


@@ -291,6 +291,8 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu))
 @implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory)
 - (NSMenu*)applicationDockMenu:(NSApplication *)sender
 {
 @implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory)
 - (NSMenu*)applicationDockMenu:(NSApplication *)sender
 {

+    wxUnusedVar(sender);
+    

     return wxTaskBarIconDockImpl::OSXGetDockHMenu();
 }
 @end
     return wxTaskBarIconDockImpl::OSXGetDockHMenu();
 }
 @end


@@ -303,6 +305,7 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu))
 
 - (void) clickedAction: (id) sender
 {
 
 - (void) clickedAction: (id) sender
 {

+    wxUnusedVar(sender);

     wxMenu *menu = impl->CreatePopupMenu();
     if (menu)
     {
     wxMenu *menu = impl->CreatePopupMenu();
     if (menu)
     {


@@ -335,7 +338,7 @@ wxTaskBarIconCustomStatusItemImpl::~wxTaskBarIconCustomStatusItemImpl()
 {
 }
 
 {
 }
 

-bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(tooltip))
+bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)

 {
     if(!m_statusItem)
     {
 {
     if(!m_statusItem)
     {


@@ -344,6 +347,7 @@ bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxStri
 
         m_target = [[wxOSXStatusItemTarget alloc] init];
         [m_target setImplementation:this];
 
         m_target = [[wxOSXStatusItemTarget alloc] init];
         [m_target setImplementation:this];

+        [m_statusItem setHighlightMode:YES];

         [m_statusItem setTarget:m_target];
         [m_statusItem setAction:@selector(clickedAction:)];
         [m_statusItem sendActionOn:NSLeftMouseDownMask];
         [m_statusItem setTarget:m_target];
         [m_statusItem setAction:@selector(clickedAction:)];
         [m_statusItem sendActionOn:NSLeftMouseDownMask];


@@ -364,6 +368,8 @@ bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxStri
     }
 
     [m_statusItem setImage:m_icon.GetNSImage()];
     }
 
     [m_statusItem setImage:m_icon.GetNSImage()];

+    wxCFStringRef cfTooltip(tooltip);
+    [m_statusItem setToolTip:cfTooltip.AsNSString()];

     return true;
 }
 
     return true;
 }