X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..d109c5849ed117966311a44875c97ae3d77b44e5:/src/mac/carbon/taskbar.cpp

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index 7213103b04..523bd62524 100644
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -1,70 +1,214 @@
-/////////////////////////////////////////////////////////////////////////
-// File:        taskbar.cpp
-// Purpose:	    Implements wxTaskBarIcon class for manipulating icons on
-//              the task bar. Optional.
-// Author:      Stefan Csomor
+/////////////////////////////////////////////////////////////////////////////
+// Name:       	taskbar.cpp
+// Purpose:     wxTaskBarIcon OSX Implementation
+// Author:      Ryan Norton
 // Modified by:
-// Created:     1998-01-01
+// Created:     09/25/2004
 // RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:   	wxWindows licence
-/////////////////////////////////////////////////////////////////////////
+// Copyright:   (c) 2004 Ryan Norton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "taskbar.h"
-#endif
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"
+
+#ifdef wxHAS_TASK_BAR_ICON
+
+#include "wx/mac/private.h"
 
 #include "wx/taskbar.h"
+#include "wx/menu.h"
+#include "wx/icon.h"
 
-wxTaskBarIcon::wxTaskBarIcon()
-{
-    // TODO
-}
+//
+//TODO:  Implement  Apple Software Guidelines - show the top window it it's not shown,
+//and force it to be unminimized - and all unminimized windows should be brought to 
+//the front
+//
+//TODO:
+IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
-wxTaskBarIcon::~wxTaskBarIcon()
+pascal OSStatus wxDockEventHandler(	EventHandlerCallRef inHandlerCallRef,
+									EventRef inEvent, void* pData)
 {
-    // TODO
-}
+    wxTaskBarIcon*& pTB = (wxTaskBarIcon*&) pData;
 
-// Operations
-bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
-{
-    // TODO
-    return FALSE;
-}
+    const UInt32 eventClass = GetEventClass(inEvent);
+    const UInt32 eventKind = GetEventKind(inEvent);
+            
+    if (eventClass == kEventClassCommand && eventKind == kEventCommandProcess) 
+    {
+    //TODO:
+    //TODO:	This is a complete copy of 
+    //static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+    //FIND A WAY TO EXTERN THIS AND USE THAT HERE INSTEAD!!
+    //TODO:
+	MenuRef hMenu = MAC_WXHMENU(pTB->GetCurrentMenu()->GetHMenu());
+    OSStatus result = eventNotHandledErr ;
 
-bool wxTaskBarIcon::RemoveIcon()
-{
-    // TODO
-    return FALSE;
-}
+    HICommand command ;
+    OSErr err;
+    
+    err =    GetEventParameter(inEvent, kEventParamDirectObject, typeHICommand, 	
+                            NULL, sizeof(HICommand), NULL, &command);
+    wxASSERT(err == noErr);
+                
+    MenuItemIndex menuItemIndex;
+    err = GetIndMenuItemWithCommandID(hMenu, command.commandID, 1, NULL, &menuItemIndex);
+    wxASSERT(err == noErr);
+                
+                    
+    MenuCommand id = command.commandID ;
+    wxMenuItem* item = NULL;
+    // for items we don't really control
+    if ( id == kHICommandPreferences )
+    {
+        id = wxApp::s_macPreferencesMenuItemId ;
+        
+        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+        if ( mbar )
+        {
+            wxMenu* menu = NULL ;
+            item = mbar->FindItem( id , &menu ) ;
+        }
+    }
+   else if (id != 0)
+        GetMenuItemRefCon( hMenu , menuItemIndex , (UInt32*) &item ) ;
 
-// Overridables
-void wxTaskBarIcon::OnMouseMove()
-{
+    if ( item )
+    {
+                if (item->IsCheckable())
+                {
+                    item->Check( !item->IsChecked() ) ;
+                }
+
+                item->GetMenu()->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
+                result = noErr ;
+    }
+    return result ;
+    }
+    
+    wxASSERT(eventClass == kEventClassApplication && eventKind == kEventAppGetDockTileMenu);
+		    	
+	//process the right click event
+	wxTaskBarIconEvent evt(wxEVT_TASKBAR_RIGHT_UP,NULL);
+	pTB->ProcessEvent(evt);
+		
+    //create popup menu
+    wxMenu* menu = pTB->DoCreatePopupMenu();
+    
+    OSStatus err = noErr;
+
+    if(menu)
+    {
+        //note to self - a MenuRef IS A MenuHandle
+        MenuRef hMenu = MAC_WXHMENU(menu->GetHMenu());
+
+        //When we call SetEventParameter it will decrement
+        //the reference count of the menu - we need to make
+        //sure it stays around in the wxMenu class here
+        RetainMenu(hMenu);
+
+        //set the actual dock menu
+        err = SetEventParameter((EventRef) inEvent, kEventParamMenuRef, 
+					typeMenuRef, sizeof(MenuRef), 
+					 &hMenu);
+        wxASSERT(err == 0);
+    }
+
+	return err;
 }
 
-void wxTaskBarIcon::OnLButtonDown()
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxDockEventHandler );
+
+wxTaskBarIcon::wxTaskBarIcon(const wxTaskBarIconType& nType)
+    : m_nType(nType), m_pEventHandlerRef(NULL), m_pMenu(NULL), m_iconAdded(false)
 {
+    //Register the events that will return the dock menu
+	EventTypeSpec tbEventList[] = { { kEventClassCommand, kEventProcessCommand },
+                                    { kEventClassApplication, kEventAppGetDockTileMenu } };
+	
+#ifdef __WXDEBUG__
+	OSStatus err =
+#endif
+      InstallApplicationEventHandler(
+            GetwxDockEventHandlerUPP(),
+            GetEventTypeCount(tbEventList), tbEventList, 
+			this, (&(EventHandlerRef&)m_pEventHandlerRef));
+			
+	wxASSERT(err == noErr);
 }
 
-void wxTaskBarIcon::OnLButtonUp()
+wxTaskBarIcon::~wxTaskBarIcon()
 {
+    RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);
 }
 
-void wxTaskBarIcon::OnRButtonDown()
+wxMenu* wxTaskBarIcon::GetCurrentMenu()
 {
+    return m_pMenu;
 }
 
-void wxTaskBarIcon::OnRButtonUp()
+wxMenu* wxTaskBarIcon::DoCreatePopupMenu()
 {
+    if (m_pMenu)
+        delete m_pMenu;
+
+    m_pMenu = CreatePopupMenu();
+    
+    if (m_pMenu)
+        m_pMenu->SetEventHandler(this);
+    
+    return m_pMenu;
 }
 
-void wxTaskBarIcon::OnLButtonDClick()
+// Operations:
+bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
+    //TODO: (IT WORKS!)  Make work without mask - mayby by using a wxDC?
+    
+    wxASSERT(icon.GetMask() != NULL);
+    
+	CGImageRef pImage;
+	//create the icon from the bitmap and mask bitmap contained within
+	OSStatus err = CreateCGImageFromPixMaps(
+		GetGWorldPixMap(MAC_WXHBITMAP(icon.GetHBITMAP())),
+		GetGWorldPixMap(MAC_WXHBITMAP(icon.GetMask()->GetMaskBitmap())),
+		&pImage
+		);
+		
+	wxASSERT(err == 0);
+	
+	err = SetApplicationDockTileImage(pImage);
+		
+	wxASSERT(err == 0);
+    
+    if (pImage != NULL)
+        CGImageRelease(pImage);
+
+	return m_iconAdded = err == noErr;
 }
+	
+bool wxTaskBarIcon::RemoveIcon()
+{
+	OSStatus err = RestoreApplicationDockTileImage();
+	wxASSERT(err == 0);
 
-void wxTaskBarIcon::OnRButtonDClick()
+	return !(m_iconAdded = !(err == noErr));
+}
+	
+bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
+    if (m_pMenu)
+        delete m_pMenu;
+    
+    m_pMenu = menu;
+    
+    wxASSERT(menu);
+    m_pMenu->SetEventHandler(this);
+    
+    return SetApplicationDockTileMenu(MAC_WXHMENU(menu->GetHMenu()));
 }
 
+#endif //wxHAS_TASK_BAR_ICON