Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch 1372567, with some minor mods and cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-04 07:54:19 +00:00
parent ca7d651d5d
commit 30efba0a9a
1 changed files with 60 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/mac/carbon/taskbar.cpp
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: taskbar.cpp // Name: taskbar.cpp
// Purpose: wxTaskBarIcon OSX Implementation // Purpose: wxTaskBarIcon - OSX implementation
// Author: Ryan Norton // Author: Ryan Norton
// Modified by: // Modified by:
// Created: 09/25/2004 // Created: 09/25/2004
@@ -93,7 +93,7 @@ class wxDockTaskBarIcon : public wxTaskBarIconImpl
public: public:
wxDockTaskBarIcon(wxTaskBarIcon* parent); wxDockTaskBarIcon(wxTaskBarIcon* parent);
virtual ~wxDockTaskBarIcon(); virtual ~wxDockTaskBarIcon();
virtual bool IsIconInstalled() const; virtual bool IsIconInstalled() const;
virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip); virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip);
virtual bool RemoveIcon(); virtual bool RemoveIcon();
@@ -103,10 +103,10 @@ public:
EventHandlerRef m_eventHandlerRef; EventHandlerRef m_eventHandlerRef;
EventHandlerUPP m_eventupp; EventHandlerUPP m_eventupp;
wxWindow* m_eventWindow;
wxMenu* m_pMenu; wxMenu* m_pMenu;
MenuRef m_theLastMenu; MenuRef m_theLastMenu;
bool m_iconAdded; bool m_iconAdded;
wxWindow* m_eventWindow;
}; };
// Forward declarations for utility functions for dock implementation // Forward declarations for utility functions for dock implementation
@@ -169,19 +169,16 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
wxDockTaskBarIcon* pTB = (wxDockTaskBarIcon*) pData; wxDockTaskBarIcon* pTB = (wxDockTaskBarIcon*) pData;
const UInt32 eventClass = GetEventClass(inEvent); const UInt32 eventClass = GetEventClass(inEvent);
const UInt32 eventKind = GetEventKind(inEvent); const UInt32 eventKind = GetEventKind(inEvent);
//
// Handle wxTaskBar menu events (note that this is a global event handler // Handle wxTaskBar menu events (note that this is a global event handler
// so it will actually get called by all commands/menus) // so it will actually get called by all commands/menus)
// //
if (eventClass == kEventClassCommand && eventKind == kEventCommandProcess) if ((eventClass == kEventClassCommand) && (eventKind == kEventCommandProcess))
{ {
// if we have no taskbar menu quickly pass it back to wxApp // if we have no taskbar menu quickly pass it back to wxApp
if (! pTB->m_pMenu ) if (pTB->m_pMenu == NULL)
{
return eventNotHandledErr; return eventNotHandledErr;
}
// //
// This is the real reason why we need this. Normally menus // This is the real reason why we need this. Normally menus
// get handled in wxMacAppEventHandler // get handled in wxMacAppEventHandler
@@ -196,7 +193,7 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
MenuRef taskbarMenuRef = MAC_WXHMENU(pTB->m_pMenu->GetHMenu()); MenuRef taskbarMenuRef = MAC_WXHMENU(pTB->m_pMenu->GetHMenu());
OSStatus result = eventNotHandledErr; OSStatus result = eventNotHandledErr;
OSErr err; OSErr err;
// get the HICommand from the event // get the HICommand from the event
HICommand command; HICommand command;
err = GetEventParameter(inEvent, kEventParamDirectObject, err = GetEventParameter(inEvent, kEventParamDirectObject,
@@ -204,7 +201,6 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
sizeof(HICommand), NULL, &command); sizeof(HICommand), NULL, &command);
if (err == noErr) if (err == noErr)
{ {
//
// Obtain the REAL menuRef and the menuItemIndex in the real menuRef // Obtain the REAL menuRef and the menuItemIndex in the real menuRef
// //
// NOTE: menuRef is generally used here for submenus, as // NOTE: menuRef is generally used here for submenus, as
@@ -221,10 +217,10 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
{ {
MenuCommand id = command.commandID; MenuCommand id = command.commandID;
wxMenuItem* item = NULL; wxMenuItem* item = NULL;
if (id != 0) // get the wxMenuItem reference from the MenuRef if (id != 0) // get the wxMenuItem reference from the MenuRef
GetMenuItemRefCon(menuRef, menuItemIndex, (UInt32*) &item); GetMenuItemRefCon(menuRef, menuItemIndex, (UInt32*) &item);
if (item) if (item)
{ {
// Handle items that are checkable // Handle items that are checkable
@@ -242,7 +238,8 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
} }
} //end if noErr on getting HICommand from event } //end if noErr on getting HICommand from event
return err; // return whether we handled the event or not // return whether we handled the event or not
return err;
} }
// We better have a kEventClassApplication/kEventAppGetDockTileMenu combo here, // We better have a kEventClassApplication/kEventAppGetDockTileMenu combo here,
@@ -259,17 +256,17 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
wxTaskBarIconEvent upevt(wxEVT_TASKBAR_RIGHT_UP,NULL); wxTaskBarIconEvent upevt(wxEVT_TASKBAR_RIGHT_UP,NULL);
pTB->m_parent->ProcessEvent(upevt); pTB->m_parent->ProcessEvent(upevt);
//create popup menu // create popup menu
wxMenu* menu = pTB->DoCreatePopupMenu(); wxMenu* menu = pTB->DoCreatePopupMenu();
OSStatus err = noErr;
if (menu) OSStatus err = eventNotHandledErr;
if (menu != NULL)
{ {
//note to self - a MenuRef IS A MenuHandle // note to self - a MenuRef *is* a MenuHandle
MenuRef hMenu = MAC_WXHMENU(menu->GetHMenu()); MenuRef hMenu = MAC_WXHMENU(menu->GetHMenu());
// When we call SetEventParameter it will decrement // When SetEventParameter is called it will decrement
// the reference count of the menu - we need to make // the reference count of the menu - we need to make
// sure it stays around in the wxMenu class here // sure it stays around in the wxMenu class here
RetainMenu(hMenu); RetainMenu(hMenu);
@@ -278,11 +275,9 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
err = SetEventParameter(inEvent, kEventParamMenuRef, err = SetEventParameter(inEvent, kEventParamMenuRef,
typeMenuRef, sizeof(MenuRef), &hMenu); typeMenuRef, sizeof(MenuRef), &hMenu);
wxASSERT(err == noErr); wxASSERT(err == noErr);
return err;
} }
else
return eventNotHandledErr; return err;
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -319,28 +314,30 @@ wxMenu* wxDeepCopyMenu(wxMenu* menu)
// perform a deep copy of the menu // perform a deep copy of the menu
wxMenuItemList& theList = menu->GetMenuItems(); wxMenuItemList& theList = menu->GetMenuItems();
wxMenuItemList::compatibility_iterator theNode = theList.GetFirst(); wxMenuItemList::compatibility_iterator theNode = theList.GetFirst();
// create the main menu // create the main menu
wxMenu* m_pMenu = new wxMenu(menu->GetTitle()); wxMenu* m_pMenu = new wxMenu(menu->GetTitle());
while (theNode != NULL) while (theNode != NULL)
{ {
wxMenuItem* theItem = theNode->GetData(); wxMenuItem* theItem = theNode->GetData();
m_pMenu->Append(new wxMenuItem(m_pMenu, // parent menu m_pMenu->Append(
theItem->GetId(), // id new wxMenuItem(
theItem->GetText(), // text label m_pMenu, // parent menu
theItem->GetHelp(), // status bar help string theItem->GetId(), // id
theItem->GetKind(), // menu flags - checkable, separator, etc. theItem->GetText(), // text label
wxDeepCopyMenu(theItem->GetSubMenu()) // submenu theItem->GetHelp(), // status bar help string
)); theItem->GetKind(), // menu flags - checkable, separator, etc.
wxDeepCopyMenu(theItem->GetSubMenu()) // submenu
));
theNode = theNode->GetNext(); theNode = theNode->GetNext();
} }
return m_pMenu; return m_pMenu;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDockTaskBarIcon Constructor // wxDockTaskBarIcon ctor
// //
// Initializes the dock implementation of wxTaskBarIcon. // Initializes the dock implementation of wxTaskBarIcon.
// //
@@ -352,12 +349,15 @@ wxDockTaskBarIcon::wxDockTaskBarIcon(wxTaskBarIcon* parent)
m_theLastMenu(GetApplicationDockTileMenu()), m_iconAdded(false) m_theLastMenu(GetApplicationDockTileMenu()), m_iconAdded(false)
{ {
// register the events that will return the dock menu // register the events that will return the dock menu
EventTypeSpec tbEventList[] = { { kEventClassCommand, kEventProcessCommand }, EventTypeSpec tbEventList[] =
{ kEventClassApplication, kEventAppGetDockTileMenu } }; {
{ kEventClassCommand, kEventProcessCommand },
{ kEventClassApplication, kEventAppGetDockTileMenu }
};
m_eventupp = NewEventHandlerUPP(wxDockEventHandler); m_eventupp = NewEventHandlerUPP(wxDockEventHandler);
wxASSERT(m_eventupp != NULL); wxASSERT(m_eventupp != NULL);
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
OSStatus err = OSStatus err =
#endif #endif
@@ -365,7 +365,7 @@ wxDockTaskBarIcon::wxDockTaskBarIcon(wxTaskBarIcon* parent)
m_eventupp, m_eventupp,
GetEventTypeCount(tbEventList), tbEventList, GetEventTypeCount(tbEventList), tbEventList,
this, &m_eventHandlerRef); this, &m_eventHandlerRef);
wxASSERT(err == noErr); wxASSERT( err == noErr );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -393,7 +393,7 @@ wxMenu* wxDockTaskBarIcon::DoCreatePopupMenu()
{ {
// get the menu from the parent // get the menu from the parent
wxMenu* theNewMenu = CreatePopupMenu(); wxMenu* theNewMenu = CreatePopupMenu();
if (theNewMenu) if (theNewMenu)
{ {
if (m_pMenu) if (m_pMenu)
@@ -401,7 +401,7 @@ wxMenu* wxDockTaskBarIcon::DoCreatePopupMenu()
m_pMenu = theNewMenu; m_pMenu = theNewMenu;
m_pMenu->SetInvokingWindow(m_menuEventWindow); m_pMenu->SetInvokingWindow(m_menuEventWindow);
} }
// the return here can be one of three things // the return here can be one of three things
// (in order of priority): // (in order of priority):
// 1) User passed a menu from CreatePopupMenu override // 1) User passed a menu from CreatePopupMenu override
@@ -428,51 +428,27 @@ bool wxDockTaskBarIcon::IsIconInstalled() const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool wxDockTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) bool wxDockTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
{ {
// convert the wxIcon into a wxBitmap so we can perform some
// wxBitmap operations with it
wxBitmap bmp( icon ) ; wxBitmap bmp( icon ) ;
OSStatus err = noErr ; wxASSERT( bmp.IsOK() );
CGImageRef pImage; // get the CGImageRef for the wxBitmap:
// OSX builds only, but then the dock only exists in OSX
#if 0 // is always available under OSX now -- crashes on 10.2 in CFRetain() - RN CGImageRef pImage = (CGImageRef) bmp.CGImageCreate();
pImage = (CGImageRef) bmp.CGImageCreate() ; wxASSERT( pImage != NULL );
#else
WXHBITMAP iconport ;
WXHBITMAP maskport ;
iconport = bmp.GetHBITMAP( &maskport ) ;
if (!maskport) // actually set the dock image
{ OSStatus err = SetApplicationDockTileImage( pImage );
// Make a mask with no transparent pixels wxASSERT( err == noErr );
wxBitmap mbmp(icon.GetWidth(), icon.GetHeight());
wxMemoryDC dc;
dc.SelectObject(mbmp);
dc.SetBackground(*wxBLACK_BRUSH);
dc.Clear();
dc.SelectObject(wxNullBitmap);
bmp.SetMask( new wxMask(mbmp, *wxWHITE) ) ;
iconport = bmp.GetHBITMAP( &maskport ) ;
}
//create the icon from the bitmap and mask bitmap contained within
err = CreateCGImageFromPixMaps(
GetGWorldPixMap(MAC_WXHBITMAP(iconport)),
GetGWorldPixMap(MAC_WXHBITMAP(maskport)),
&pImage
);
wxASSERT(err == 0);
#endif
wxASSERT(pImage != NULL); // free the CGImage, now that it's referenced by the dock
err = SetApplicationDockTileImage(pImage);
wxASSERT(err == 0);
if (pImage != NULL) if (pImage != NULL)
CGImageRelease(pImage); CGImageRelease( pImage );
return m_iconAdded = err == noErr; return m_iconAdded = (err == noErr);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDockTaskBarIcon::RemoveIcon // wxDockTaskBarIcon::RemoveIcon
// //
@@ -485,11 +461,11 @@ bool wxDockTaskBarIcon::RemoveIcon()
delete m_pMenu; delete m_pMenu;
m_pMenu = NULL; m_pMenu = NULL;
} }
// restore old icon to the dock // restore old icon to the dock
OSStatus err = RestoreApplicationDockTileImage(); OSStatus err = RestoreApplicationDockTileImage();
wxASSERT(err == noErr); wxASSERT(err == noErr);
// restore the old menu to the dock // restore the old menu to the dock
SetApplicationDockTileMenu(m_theLastMenu); SetApplicationDockTileMenu(m_theLastMenu);