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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2004-10-22 15:42:16 +00:00
parent 02c3b4d92b
commit 4092a27504
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/cocoa/taskbar.h
View File

@ -22,11 +22,10 @@ class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenu;
class wxTaskBarIconCocoaImpl; 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) DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public: public:
//type of taskbar item to create (currently only DOCK is implemented) //type of taskbar item to create (currently only DOCK is implemented)

6
src/cocoa/taskbar.mm
View File

@ -61,6 +61,10 @@ public:
virtual ~wxTaskBarIconCocoaImpl(); virtual ~wxTaskBarIconCocoaImpl();
inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; } inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; }
protected: protected:
inline wxMenu* CreatePopupMenu()
{ wxASSERT(m_taskBarIcon);
m_taskBarIcon->CreatePopupMenu();
}
wxTaskBarIcon *m_taskBarIcon; wxTaskBarIcon *m_taskBarIcon;
wxTaskBarIconWindow *m_iconWindow; wxTaskBarIconWindow *m_iconWindow;
private: 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) if(!dockMenu)
return nil; return nil;
if(!m_iconWindow) if(!m_iconWindow)