Change friendship so that the base implementation class is the friend.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/taskbar.h b/include/wx/cocoa/taskbar.h
index 4316e92ebbe6bed4f2c597b8ae6f52897dcfdb4c..833cf83143502ce48b052af449f0af2828606a83 100644 (file)
--- a/include/wx/cocoa/taskbar.h
+++ b/include/wx/cocoa/taskbar.h
@@ -22,11 +22,10 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMenu;
 
 class wxTaskBarIconCocoaImpl;
 class WXDLLEXPORT wxMenu;
 
 class wxTaskBarIconCocoaImpl;

-class wxTaskBarIconDockImpl;

 
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {
 
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {

-    friend class wxTaskBarIconDockImpl;
+    friend class wxTaskBarIconCocoaImpl;

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
     //type of taskbar item to create (currently only DOCK is implemented)
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
     //type of taskbar item to create (currently only DOCK is implemented)

diff --git a/src/cocoa/taskbar.mm b/src/cocoa/taskbar.mm
index 5975e31c3d2539eee01ecdbfb0e689db8f42190d..1a5cd8e5006089e69e9ca2b52372aa430397d99e 100644 (file)
--- a/src/cocoa/taskbar.mm
+++ b/src/cocoa/taskbar.mm
@@ -61,6 +61,10 @@ public:
     virtual ~wxTaskBarIconCocoaImpl();
     inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; }
 protected:
     virtual ~wxTaskBarIconCocoaImpl();
     inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; }
 protected:

+    inline wxMenu* CreatePopupMenu()
+    {   wxASSERT(m_taskBarIcon);
+        m_taskBarIcon->CreatePopupMenu();
+    }

     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;
 private:
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;
 private:


@@ -231,7 +235,7 @@ WX_NSMenu wxTaskBarIconDockImpl::CocoaGetDockNSMenu()
 
 WX_NSMenu wxTaskBarIconDockImpl::CocoaDoGetDockNSMenu()
 {
 
 WX_NSMenu wxTaskBarIconDockImpl::CocoaDoGetDockNSMenu()
 {

-    wxMenu *dockMenu = m_taskBarIcon->CreatePopupMenu();
+    wxMenu *dockMenu = CreatePopupMenu();

     if(!dockMenu)
         return nil;
     if(!m_iconWindow)
     if(!dockMenu)
         return nil;
     if(!m_iconWindow)