Remove some wxCocoa stuff that isn't in OS X Cocoa.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,7 +35,6 @@
|
|||||||
#import <AppKit/NSWindow.h>
|
#import <AppKit/NSWindow.h>
|
||||||
#import <AppKit/NSGraphicsContext.h>
|
#import <AppKit/NSGraphicsContext.h>
|
||||||
|
|
||||||
#include "wx/cocoa/NSApplication.h"
|
|
||||||
#include "wx/cocoa/autorelease.h"
|
#include "wx/cocoa/autorelease.h"
|
||||||
|
|
||||||
// A category for methods that are only present in Panther's SDK
|
// A category for methods that are only present in Panther's SDK
|
||||||
@@ -383,24 +382,4 @@ void wxTaskBarIconWindowCustom::OnPaint(wxPaintEvent &event)
|
|||||||
dc.DrawIcon(m_icon,0,0);
|
dc.DrawIcon(m_icon,0,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// wxTaskBarIconNSApplicationDelegateCategory
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
// This neatly solves the problem of DLL separation. If the wxAdvanced
|
|
||||||
// library (which this file is part of) is loaded then this category is
|
|
||||||
// defined and we get dock menu behavior without app.mm ever having to
|
|
||||||
// know we exist. C++ did sucketh so. :-)
|
|
||||||
|
|
||||||
@interface wxNSApplicationDelegate(wxTaskBarIconNSApplicationDelegateCategory)
|
|
||||||
- (NSMenu*)applicationDockMenu:(NSApplication *)sender;
|
|
||||||
@end
|
|
||||||
|
|
||||||
@implementation wxNSApplicationDelegate(wxTaskBarIconNSApplicationDelegateCategory)
|
|
||||||
- (NSMenu*)applicationDockMenu:(NSApplication *)sender
|
|
||||||
{
|
|
||||||
return wxTaskBarIconDockImpl::CocoaGetDockNSMenu();
|
|
||||||
}
|
|
||||||
@end
|
|
||||||
|
|
||||||
#endif //def wxHAS_TASK_BAR_ICON
|
#endif //def wxHAS_TASK_BAR_ICON
|
||||||
|
Reference in New Issue
Block a user