Include missing.h to find O_* flags.

[wxWidgets.git] / src / mac / carbon / taskbar.cpp

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index 0eeca244c57429ab9aa7c143deb7b32de4db9c38..523bd6252466476fe73b9bdb56554b21954f9737 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -21,13 +21,6 @@
 #include "wx/menu.h"
 #include "wx/icon.h"
 
 #include "wx/menu.h"
 #include "wx/icon.h"
 

-#if 0
-
-#include "wx/frame.h"
-#include "wx/dialog.h"
-
-#endif
-

 //
 //TODO:  Implement  Apple Software Guidelines - show the top window it it's not shown,
 //and force it to be unminimized - and all unminimized windows should be brought to 
 //
 //TODO:  Implement  Apple Software Guidelines - show the top window it it's not shown,
 //and force it to be unminimized - and all unminimized windows should be brought to 


@@ -97,24 +90,40 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
     }
     
     wxASSERT(eventClass == kEventClassApplication && eventKind == kEventAppGetDockTileMenu);
     }
     
     wxASSERT(eventClass == kEventClassApplication && eventKind == kEventAppGetDockTileMenu);

-       
-       //set the internal event
-       pTB->SetInternalEvent(inEvent);
-       
+                       

        //process the right click event
        wxTaskBarIconEvent evt(wxEVT_TASKBAR_RIGHT_UP,NULL);
        pTB->ProcessEvent(evt);
                
        //process the right click event
        wxTaskBarIconEvent evt(wxEVT_TASKBAR_RIGHT_UP,NULL);
        pTB->ProcessEvent(evt);
                

-       //set the internal event
-       pTB->SetInternalEvent(NULL);
+    //create popup menu
+    wxMenu* menu = pTB->DoCreatePopupMenu();
+    
+    OSStatus err = noErr;
+
+    if(menu)
+    {
+        //note to self - a MenuRef IS A MenuHandle
+        MenuRef hMenu = MAC_WXHMENU(menu->GetHMenu());
+
+        //When we call SetEventParameter it will decrement
+        //the reference count of the menu - we need to make
+        //sure it stays around in the wxMenu class here
+        RetainMenu(hMenu);

 
 

-       return noErr;
+        //set the actual dock menu
+        err = SetEventParameter((EventRef) inEvent, kEventParamMenuRef, 
+                                       typeMenuRef, sizeof(MenuRef), 
+                                        &hMenu);
+        wxASSERT(err == 0);
+    }
+
+       return err;

 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxDockEventHandler );
 
 wxTaskBarIcon::wxTaskBarIcon(const wxTaskBarIconType& nType)
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxDockEventHandler );
 
 wxTaskBarIcon::wxTaskBarIcon(const wxTaskBarIconType& nType)

-    : m_nType(nType), m_pEvent(NULL), m_pEventHandlerRef(NULL), m_pMenu(NULL), m_iconAdded(false)
+    : m_nType(nType), m_pEventHandlerRef(NULL), m_pMenu(NULL), m_iconAdded(false)

 {
     //Register the events that will return the dock menu
        EventTypeSpec tbEventList[] = { { kEventClassCommand, kEventProcessCommand },
 {
     //Register the events that will return the dock menu
        EventTypeSpec tbEventList[] = { { kEventClassCommand, kEventProcessCommand },


@@ -136,35 +145,27 @@ wxTaskBarIcon::~wxTaskBarIcon()
     RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);
 }
 
     RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);
 }
 

-void wxTaskBarIcon::SetInternalEvent(void* pEvent)
+wxMenu* wxTaskBarIcon::GetCurrentMenu()

 {
 {

-       m_pEvent = pEvent;
+    return m_pMenu;

 }
 
 }
 

-wxMenu* wxTaskBarIcon::GetCurrentMenu()
+wxMenu* wxTaskBarIcon::DoCreatePopupMenu()

 {
 {

+    if (m_pMenu)
+        delete m_pMenu;
+
+    m_pMenu = CreatePopupMenu();
+    
+    if (m_pMenu)
+        m_pMenu->SetEventHandler(this);
+    

     return m_pMenu;
 }
 
 // Operations:
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
     return m_pMenu;
 }
 
 // Operations:
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {

-    #if 0
-    wxASSERT(wxTheApp);
-    wxWindow* pTopWindow = wxTheApp->GetTopWindow();
-    
-    wxASSERT(pTopWindow);
-    
-    if(pTopWindow->IsKindOf(CLASSINFO(wxDialog)))
-        ((wxDialog*)pTopWindow)->SetIcon(icon);
-    else
-    {
-        wxASSERT(pTopWindow->IsKindOf(CLASSINFO(wxFrame)));
-        ((wxFrame*)pTopWindow)->SetIcon(icon);
-    }
-    
-    return true;
-    #else

     //TODO: (IT WORKS!)  Make work without mask - mayby by using a wxDC?
     
     wxASSERT(icon.GetMask() != NULL);
     //TODO: (IT WORKS!)  Make work without mask - mayby by using a wxDC?
     
     wxASSERT(icon.GetMask() != NULL);


@@ -187,7 +188,6 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         CGImageRelease(pImage);
 
        return m_iconAdded = err == noErr;
         CGImageRelease(pImage);
 
        return m_iconAdded = err == noErr;

-    #endif

 }
        
 bool wxTaskBarIcon::RemoveIcon()
 }
        
 bool wxTaskBarIcon::RemoveIcon()


@@ -200,29 +200,15 @@ bool wxTaskBarIcon::RemoveIcon()
        
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
        
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {

-       wxASSERT(m_pEvent != NULL);
-    

     if (m_pMenu)
         delete m_pMenu;
     if (m_pMenu)
         delete m_pMenu;

-        
+    

     m_pMenu = menu;
     m_pMenu = menu;

-    menu->SetEventHandler(this);
-
-       //note to self - a MenuRef IS A MenuHandle
-       MenuRef hMenu = MAC_WXHMENU(menu->GetHMenu());
-
-       //When we call SetEventParameter it will decrement
-       //the reference count of the menu - we need to make
-       //sure it stays around in the wxMenu class here
-       RetainMenu(hMenu);
-
-       //set the actual dock menu
-       OSStatus err = SetEventParameter((EventRef) m_pEvent, kEventParamMenuRef, 
-                                       typeMenuRef, sizeof(MenuRef), 
-                                        &hMenu);
-       wxASSERT(err == 0);
-       
-       return err == noErr;
+    
+    wxASSERT(menu);
+    m_pMenu->SetEventHandler(this);
+    
+    return SetApplicationDockTileMenu(MAC_WXHMENU(menu->GetHMenu()));

 }
 
 #endif //wxHAS_TASK_BAR_ICON
 }
 
 #endif //wxHAS_TASK_BAR_ICON