disable new event code unconditionally for now

[wxWidgets.git] / src / osx / cocoa / taskbar.mm

diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index af4717a47efd4d9bf16f7c8a6325c9416cf4f4a7..b6d327b863f991d1e14d5e71fc240b1bcbd7b354 100644 (file)
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

-// File:        src/cocoa/taskbar.mm
+// File:        src/osx/cocoa/taskbar.mm

 // Purpose:     Implements wxTaskBarIcon class
 // Author:      David Elliott
 // Modified by:
 // Purpose:     Implements wxTaskBarIcon class
 // Author:      David Elliott
 // Modified by:


@@ -21,22 +21,7 @@
 
 #include "wx/taskbar.h"
 
 
 #include "wx/taskbar.h"
 

-#import <AppKit/NSApplication.h>
-#import <AppKit/NSImage.h>
-#import <AppKit/NSMenu.h>
-#import <AppKit/NSMenuItem.h>
-#import <AppKit/NSStatusBar.h>
-#import <AppKit/NSStatusItem.h>
-#import <AppKit/NSView.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-
-#import <AppKit/NSEvent.h>
-#import <AppKit/NSWindow.h>
-#import <AppKit/NSGraphicsContext.h>
-
-#include "wx/cocoa/NSApplication.h"
-#include "wx/cocoa/autorelease.h"
+#include "wx/osx/private.h"

 
 // A category for methods that are only present in Panther's SDK
 @interface NSStatusItem(wxNSStatusItemPrePantherCompatibility)
 
 // A category for methods that are only present in Panther's SDK
 @interface NSStatusItem(wxNSStatusItemPrePantherCompatibility)


@@ -248,7 +233,7 @@ WX_NSMenu wxTaskBarIconDockImpl::CocoaDoGetDockNSMenu()
 
 bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
 
 bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {

-    wxAutoNSAutoreleasePool pool;
+    wxMacAutoreleasePool pool;

     m_originalDockIcon = [[[NSApplication sharedApplication] applicationIconImage] retain];
     //[[NSApplication sharedApplication] setApplicationIconImage:icon.GetNSImage()];
     return true;
     m_originalDockIcon = [[[NSApplication sharedApplication] applicationIconImage] retain];
     //[[NSApplication sharedApplication] setApplicationIconImage:icon.GetNSImage()];
     return true;


@@ -283,7 +268,7 @@ wxTaskBarIconCustomStatusItemImpl::~wxTaskBarIconCustomStatusItemImpl()
 
 bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
 
 bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {

-    wxAutoNSAutoreleasePool pool;
+    wxMacAutoreleasePool pool;

     if(!m_cocoaNSStatusItem)
     {
         m_cocoaNSStatusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
     if(!m_cocoaNSStatusItem)
     {
         m_cocoaNSStatusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];


@@ -383,24 +368,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