// Superclass of wxTaskBarIcon implementations
//-----------------------------------------------------------------------------
-class wxTaskBarIconImpl
+class wxTaskBarIconImpl
{
public:
wxTaskBarIconImpl(wxTaskBarIcon* parent);
virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip) = 0;
virtual bool RemoveIcon() = 0;
virtual bool PopupMenu(wxMenu *menu) = 0;
-
+
wxMenu* CreatePopupMenu()
{ return m_parent->CreatePopupMenu(); }
-
+
wxTaskBarIcon* m_parent;
class wxTaskBarIconWindow* m_menuEventWindow;
+
+ DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl)
};
//-----------------------------------------------------------------------------
class wxTaskBarIconWindow : public wxTopLevelWindow
{
public:
- wxTaskBarIconWindow(wxTaskBarIconImpl* impl)
- : wxTopLevelWindow(NULL, -1, wxT("")), m_impl(impl)
+ wxTaskBarIconWindow(wxTaskBarIconImpl* impl)
+ : wxTopLevelWindow(NULL, -1, wxT("")), m_impl(impl)
{
- Connect(-1, wxEVT_COMMAND_MENU_SELECTED,
+ Connect(-1, wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(wxTaskBarIconWindow::OnMenuEvent)
);
}
- void OnMenuEvent(wxCommandEvent& event)
+ void OnMenuEvent(wxCommandEvent& event)
{
m_impl->m_parent->ProcessEvent(event);
}
pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
EventRef inEvent, void* pData);
wxMenu* wxDeepCopyMenu(wxMenu* menu);
-
+
//=============================================================================
//
//
// Initializes members and creates the event window
//-----------------------------------------------------------------------------
-wxTaskBarIconImpl::wxTaskBarIconImpl(wxTaskBarIcon* parent)
+wxTaskBarIconImpl::wxTaskBarIconImpl(wxTaskBarIcon* parent)
: m_parent(parent), m_menuEventWindow(new wxTaskBarIconWindow(this))
{
}
// This is the real reason why we need this. Normally menus
// get handled in wxMacAppEventHandler
//
- // pascal OSStatus wxMacAppEventHandler(EventHandlerCallRef handler,
+ // pascal OSStatus wxMacAppEventHandler(EventHandlerCallRef handler,
// EventRef event, void *data)
//
- // However, in the case of a taskbar menu call
+ // However, in the case of a taskbar menu call
// command.menu.menuRef IS NULL!
// Which causes the wxApp handler just to skip it.
//
MenuRef taskbarMenuRef = MAC_WXHMENU(pTB->m_pMenu->GetHMenu());
- OSStatus result = eventNotHandledErr;
OSErr err;
// get the HICommand from the event
HICommand command;
err = GetEventParameter(inEvent, kEventParamDirectObject,
- typeHICommand, NULL,
+ typeHICommand, NULL,
sizeof(HICommand), NULL, &command);
if (err == noErr)
- {
+ {
// Obtain the REAL menuRef and the menuItemIndex in the real menuRef
//
- // NOTE: menuRef is generally used here for submenus, as
- // GetMenuItemRefCon could give an incorrect wxMenuItem if we pass
+ // NOTE: menuRef is generally used here for submenus, as
+ // GetMenuItemRefCon could give an incorrect wxMenuItem if we pass
// just the top level wxTaskBar menu
//
MenuItemIndex menuItemIndex;
MenuRef menuRef;
- err = GetIndMenuItemWithCommandID(taskbarMenuRef,
- command.commandID,
+ err = GetIndMenuItemWithCommandID(taskbarMenuRef,
+ command.commandID,
1, &menuRef, &menuItemIndex);
if (err == noErr)
{
item->Check( !item->IsChecked() ) ;
// send the wxEvent to the wxMenu
- item->GetMenu()->SendEvent(id,
- item->IsCheckable() ?
- item->IsChecked() : -1
+ item->GetMenu()->SendEvent(id,
+ item->IsCheckable() ?
+ item->IsChecked() : -1
);
err = noErr; // successfully handled the event
}
}
- } //end if noErr on getting HICommand from event
+ } //end if noErr on getting HICommand from event
// return whether we handled the event or not
return err;
}
// We better have a kEventClassApplication/kEventAppGetDockTileMenu combo here,
- // otherwise something is truly funky
- wxASSERT(eventClass == kEventClassApplication &&
+ // otherwise something is truly funky
+ wxASSERT(eventClass == kEventClassApplication &&
eventKind == kEventAppGetDockTileMenu);
// process the right click events
RetainMenu(hMenu);
// set the actual dock menu
- err = SetEventParameter(inEvent, kEventParamMenuRef,
+ err = SetEventParameter(inEvent, kEventParamMenuRef,
typeMenuRef, sizeof(MenuRef), &hMenu);
wxASSERT(err == noErr);
}
//
// NB: Here we have to perform a deep copy of the menu,
// copying each and every menu item from menu to m_pMenu.
- // Other implementations use wxWindow::PopupMenu here,
+ // Other implementations use wxWindow::PopupMenu here,
// which idle execution until the user selects something,
- // but since the mac handles this internally, we can't -
+ // but since the mac handles this internally, we can't -
// and have no way at all to idle it while the dock menu
// is being shown before menu goes out of scope (it may
// not be on the heap, and may expire right after this function
- // is done - we need it to last until the carbon event is triggered -
+ // is done - we need it to last until the carbon event is triggered -
// that's when the user right clicks).
//
- // Also, since there is no equal (assignment) operator
+ // Also, since there is no equal (assignment) operator
// on either wxMenu or wxMenuItem, we have to do all the
// dirty work ourselves.
//
//
// Here we create some mac-specific event handlers and UPPs.
//-----------------------------------------------------------------------------
-wxDockTaskBarIcon::wxDockTaskBarIcon(wxTaskBarIcon* parent)
+wxDockTaskBarIcon::wxDockTaskBarIcon(wxTaskBarIcon* parent)
: wxTaskBarIconImpl(parent),
- m_eventHandlerRef(NULL), m_pMenu(NULL),
- m_theLastMenu(GetApplicationDockTileMenu()), m_iconAdded(false)
+ m_eventHandlerRef(NULL), m_pMenu(NULL),
+ m_theLastMenu(GetApplicationDockTileMenu()), m_iconAdded(false)
{
// register the events that will return the dock menu
EventTypeSpec tbEventList[] =
#endif
InstallApplicationEventHandler(
m_eventupp,
- GetEventTypeCount(tbEventList), tbEventList,
+ GetEventTypeCount(tbEventList), tbEventList,
this, &m_eventHandlerRef);
wxASSERT( err == noErr );
}
DisposeEventHandlerUPP(m_eventupp);
// restore old icon and menu to the dock
- RemoveIcon();
+ RemoveIcon();
}
//-----------------------------------------------------------------------------
// wxDockTaskBarIcon::DoCreatePopupMenu
//
-// Helper function that handles a request from the dock event handler
+// Helper function that handles a request from the dock event handler
// to get the menu for the dock
//-----------------------------------------------------------------------------
wxMenu* wxDockTaskBarIcon::DoCreatePopupMenu()
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):
// 1) User passed a menu from CreatePopupMenu override
// 2) menu sent to and copied from PopupMenu
// Returns whether or not the dock is not using the default image
//-----------------------------------------------------------------------------
bool wxDockTaskBarIcon::IsIconInstalled() const
-{
- return m_iconAdded;
+{
+ return m_iconAdded;
}
//-----------------------------------------------------------------------------
// convert the wxIcon into a wxBitmap so we can perform some
// wxBitmap operations with it
wxBitmap bmp( icon ) ;
- wxASSERT( bmp.IsOK() );
+ wxASSERT( bmp.Ok() );
// get the CGImageRef for the wxBitmap:
// OSX builds only, but then the dock only exists in OSX
- CGImageRef pImage = (CGImageRef) bmp.CGImageCreate();
+ CGImageRef pImage = (CGImageRef) bmp.CGImageCreate();
wxASSERT( pImage != NULL );
// actually set the dock image
if (pImage != NULL)
CGImageRelease( pImage );
- return m_iconAdded = (err == noErr);
+ bool success = (err == noErr);
+ m_iconAdded = success;
+
+ return success;
}
//-----------------------------------------------------------------------------
// restore the old menu to the dock
SetApplicationDockTileMenu(m_theLastMenu);
- return !(m_iconAdded = !(err == noErr));
+ bool success = (err == noErr);
+ m_iconAdded = !success;
+
+ return success;
}
-
+
//-----------------------------------------------------------------------------
// wxDockTaskBarIcon::PopupMenu
//
// 2.4 and wxPython method that "pops of the menu in the taskbar".
//
-// In reality because of the way the dock menu works in carbon
+// In reality because of the way the dock menu works in carbon
// we just save the menu, and if the user didn't override CreatePopupMenu
// return the menu passed here, thus sort of getting the same effect.
//-----------------------------------------------------------------------------
if (m_pMenu)
delete m_pMenu;
-
+
//start copy of menu
m_pMenu = wxDeepCopyMenu(menu);
-
+
//finish up
m_pMenu->SetInvokingWindow(m_menuEventWindow);
return true;
}
-
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// wxTaskBarIcon
//
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
+
IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
-
+
//-----------------------------------------------------------------------------
// wxTaskBarIcon Constructor
//
//
// Note that we only support DOCK currently as others require cocoa and
// also some require hacks and other such things. (MenuExtras are
-// actually seperate programs that also require a special undocumented id
+// actually seperate programs that also require a special undocumented id
// hack and other such fun stuff).
//-----------------------------------------------------------------------------
wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType nType)
{
- wxASSERT_MSG(nType == DOCK,
+ wxASSERT_MSG(nType == DOCK,
wxT("Only the DOCK implementation of wxTaskBarIcon")
wxT("on mac carbon is currently supported!"));
m_impl = new wxDockTaskBarIcon(this);
bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
{ return m_impl->SetIcon(icon, tooltip); }
bool wxTaskBarIcon::RemoveIcon()
-{ return m_impl->RemoveIcon(); }
+{ return m_impl->RemoveIcon(); }
bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
{ return m_impl->PopupMenu(menu); }
projects / wxWidgets.git / blobdiff