this, (&(EventHandlerRef&)m_pEventHandlerRef));
wxASSERT(err == noErr);
+
+ Connect(wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEventHandler(wxTaskBarIcon::OnRightDown));
}
wxTaskBarIcon::~wxTaskBarIcon()
CGImageRef pImage;
-#if 1 // is always available under OSX now
+#if 0 // is always available under OSX now -- crashes on 10.2 in CFRetain() - RN
pImage = (CGImageRef) bmp.CGImageCreate() ;
#else
WXHBITMAP iconport ;
theItem->GetId(), //id
theItem->GetText(), //text label
theItem->GetHelp(), //status bar help string
- theItem->GetKind(), //menu flags - checkable, seperator, etc.
+ theItem->GetKind(), //menu flags - checkable, separator, etc.
theItem->GetSubMenu() //submenu
));
theNode = theNode->GetNext();
return true;
}
+//Skip the event so that popupmenu isn't called in parent, avoiding double-creation of the menus
+void wxTaskBarIcon::OnRightDown(wxTaskBarIconEvent& evt)
+{
+ evt.Skip();
+}
+
#endif //wxHAS_TASK_BAR_ICON