don't let MacIsReallyShown climb over toplevel windows, otherwise tlws with invisible...

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 22b07f575d83e385089483cb25107422a66b9e17..c48bf24a819278966f7f5c313f7f4f08a7d29ab7 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        menuitem.cpp
 // Purpose:     wxMenuItem implementation
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        menuitem.cpp
 // Purpose:     wxMenuItem implementation

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by: 
 // Modified by: 

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -13,10 +13,11 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

+#include "wx/app.h"

 #include "wx/menu.h"
 #include "wx/menuitem.h"
 
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -25,147 +26,205 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

+#if !USE_SHARED_LIBRARY

   IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
   IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

-
-void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
-
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
+#endif  //USE_SHARED_LIBRARY

 
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
 

+//

 // ctor & dtor
 // -----------
 
 // ctor & dtor
 // -----------
 

-wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
-                       const wxString& text, const wxString& strHelp,
-                       bool bCheckable,
+wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& strHelp,
+                       wxItemKind kind,

                        wxMenu *pSubMenu) 
                        wxMenu *pSubMenu) 

+          : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)

 {
 {

-    wxASSERT( pParentMenu != NULL );
-
-    m_parentMenu  = pParentMenu;
-    m_subMenu     = pSubMenu;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
-    m_id          = id;
-    m_text        = text;
-    m_isCheckable = bCheckable;
-    m_help        = strHelp;
-
-
-    if ( m_text ==  "E&xit"  ||m_text == "Exit" )
+    // TO DISCUSS on dev : whether we can veto id 0
+    // wxASSERT_MSG( id != 0 || pSubMenu != NULL , wxT("A MenuItem ID of Zero does not work under Mac") ) ;
+    
+    // In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
+    // therefore these item must not be translated
+    if ( wxStripMenuCodes(m_text).Upper() ==  wxT("EXIT") )

     {
     {

-        m_text = "Quit\tCtrl+Q" ;
+        m_text =wxT("Quit\tCtrl+Q") ;

     }
     }

+
+    m_radioGroup.start = -1;
+    m_isRadioGroupStart = FALSE;

 }
 
 wxMenuItem::~wxMenuItem() 
 {
 }
 
 }
 
 wxMenuItem::~wxMenuItem() 
 {
 }
 

-bool wxMenuItem::IsChecked() const
-{
-    return wxMenuItemBase::IsChecked() ;
+// change item state
+// -----------------
+
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap) 
+{ 
+      m_bitmap = bitmap; 
+      UpdateItemBitmap() ;

 }
 
 }
 

-wxString wxMenuItem::GetLabel() const
+void wxMenuItem::UpdateItemBitmap() 

 {
 {

-    return wxStripMenuCodes(m_text);
+    if ( !m_parentMenu )
+        return ;
+        
+    MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+    MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+    if( mhandle == NULL || index == 0)
+        return ;
+        
+    if ( m_bitmap.Ok() )
+    {
+        ControlButtonContentInfo info ;
+        wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+        if ( info.contentType != kControlNoContent )
+        {
+            if ( info.contentType == kControlContentCIconHandle )
+                SetMenuItemIconHandle( mhandle , index , 
+                    kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+        }
+            
+    }

 }
 
 }
 

-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::UpdateItemStatus() 

 {
 {

-    return wxGetAccelFromString(GetText());
+    if ( !m_parentMenu )
+        return ;
+        
+#if TARGET_CARBON
+    if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macPreferencesMenuItemId)
+    {
+        if ( !IsEnabled() )
+            DisableMenuCommand( NULL , kHICommandPreferences ) ;
+        else
+            EnableMenuCommand( NULL , kHICommandPreferences ) ;
+    }
+    if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macExitMenuItemId)
+    {
+        if ( !IsEnabled() )
+            DisableMenuCommand( NULL , kHICommandQuit ) ;
+        else
+            EnableMenuCommand( NULL , kHICommandQuit ) ;
+    }
+#endif
+    { 
+        MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+        MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+        if( mhandle == NULL || index == 0)
+            return ;
+
+          UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
+          if ( IsCheckable() && IsChecked() )
+            ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
+        else
+            ::SetItemMark( mhandle , index , 0 ) ; // no mark
+
+           UMASetMenuItemText( mhandle , index , m_text ) ; 
+           wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+        UMASetMenuItemShortcut( mhandle , index , entry ) ;
+        delete entry ;
+    }

 }
 
 }
 

-#endif // wxUSE_ACCEL
-
-// misc
-// ----
-
-/*
-
-// delete the sub menu
-void wxMenuItem::DeleteSubMenu()
+void wxMenuItem::UpdateItemText() 

 {
 {

-  wxASSERT( m_subMenu != NULL );
-
-  delete m_subMenu;
-  m_subMenu = NULL;
+    if ( !m_parentMenu )
+        return ;
+        
+    MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+    MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+    if( mhandle == NULL || index == 0)
+        return ;
+
+       UMASetMenuItemText( mhandle , index , m_text ) ; 
+       wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+    UMASetMenuItemShortcut( mhandle , index , entry ) ;
+    delete entry ;

 }
 
 }
 

-*/
-
-// change item state
-// -----------------

 
 void wxMenuItem::Enable(bool bDoEnable)
 {
 
 void wxMenuItem::Enable(bool bDoEnable)
 {

-  if ( m_isEnabled != bDoEnable ) {
-    if ( m_subMenu == NULL ) 
-    {     
-       // normal menu item
-           if ( m_parentMenu->GetHMenu() )
-           {
-                       int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-                       if ( index >= 1 )
-                       {
-                               if ( bDoEnable )
-                                       UMAEnableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                               else
-                                       UMADisableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                       }
-           }
+    if ( m_isEnabled != bDoEnable ) 
+    {
+        wxMenuItemBase::Enable( bDoEnable ) ;
+        UpdateItemStatus() ;

     }
     }

-    else                            
+}
+void wxMenuItem::UncheckRadio()
+{
+    if ( m_isChecked ) 

     {
     {

-               // submenu
-           if ( m_parentMenu->GetHMenu() )
-           {
-                       int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-                       if ( index >= 1 )
-                       {
-                               if ( bDoEnable )
-                                       UMAEnableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                               else
-                                       UMADisableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                       }
-           }
+        wxMenuItemBase::Check( false ) ;
+        UpdateItemStatus() ;

     }
     }

-
-    m_isEnabled = bDoEnable;
-  }

 }
 
 void wxMenuItem::Check(bool bDoCheck)
 {
 }
 
 void wxMenuItem::Check(bool bDoCheck)
 {

-  wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
+    wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );

 
 

-  if ( m_isChecked != bDoCheck ) 
-  {
-    m_isChecked = bDoCheck;
-       if ( m_parentMenu->GetHMenu() )
+    if ( m_isChecked != bDoCheck ) 

     {
     {

-               int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-               if ( index >= 1 )
-               {
-                       if ( bDoCheck )
-                                       ::SetItemMark( m_parentMenu->GetHMenu() , index , 0x12 ) ; // checkmark
-                               else
-                                       ::SetItemMark( m_parentMenu->GetHMenu() , index , 0 ) ; // no mark
-               }
-       }
-  }
+        if ( GetKind() == wxITEM_RADIO )
+        {
+            if ( bDoCheck )
+            {
+                wxMenuItemBase::Check( bDoCheck ) ;
+                UpdateItemStatus() ;
+                
+                // get the index of this item in the menu
+                const wxMenuItemList& items = m_parentMenu->GetMenuItems();
+                int pos = items.IndexOf(this);
+                wxCHECK_RET( pos != wxNOT_FOUND,
+                             _T("menuitem not found in the menu items list?") );
+
+                // get the radio group range
+                int start,
+                    end;
+
+                if ( m_isRadioGroupStart )
+                {
+                    // we already have all information we need
+                    start = pos;
+                    end = m_radioGroup.end;
+                }
+                else // next radio group item
+                {
+                    // get the radio group end from the start item
+                    start = m_radioGroup.start;
+                    end = items.Item(start)->GetData()->m_radioGroup.end;
+                }
+
+                // also uncheck all the other items in this radio group
+                wxMenuItemList::Node *node = items.Item(start);
+                for ( int n = start; n <= end && node; n++ )
+                {
+                    if ( n != pos )
+                    {
+                        ((wxMenuItem*)node->GetData())->UncheckRadio();
+                    }
+                    node = node->GetNext();
+                }
+            }
+        }
+        else
+        {
+            wxMenuItemBase::Check( bDoCheck ) ;
+            UpdateItemStatus() ;
+        }
+    }

 }
 
 void wxMenuItem::SetText(const wxString& text)
 }
 
 void wxMenuItem::SetText(const wxString& text)


@@ -175,41 +234,50 @@ void wxMenuItem::SetText(const wxString& text)
         return;
 
     wxMenuItemBase::SetText(text);
         return;
 
     wxMenuItemBase::SetText(text);

-//    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+    
+    UpdateItemText() ;
+}

 
 

-    wxCHECK_RET( m_parentMenu && m_parentMenu->GetHMenu(), wxT("menuitem without menu") );
-       if ( m_parentMenu->GetHMenu() )
-    {
-               int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-               if ( index >= 1 )
-               {
-                       Str255 label;
-                       wxMacBuildMenuString( label , NULL , NULL , text ,false);
-                       ::SetMenuItemText( m_parentMenu->GetHMenu() , index , label ) ; // checkmark
-               }
-       }
-
-#if wxUSE_ACCEL
-    m_parentMenu->UpdateAccel(this);
-#endif // wxUSE_ACCEL
+// radio group stuff
+// -----------------

 
 

+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_isRadioGroupStart = TRUE;
+}
+
+void wxMenuItem::SetRadioGroupStart(int start)
+{
+    wxASSERT_MSG( !m_isRadioGroupStart,
+                  _T("should only be called for the next radio items") );
+
+    m_radioGroup.start = start;

 }
 }

-void wxMenuItem::SetCheckable(bool checkable)
+
+void wxMenuItem::SetRadioGroupEnd(int end)

 {
 {

-    wxMenuItemBase::SetCheckable(checkable);
-   // OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+    wxASSERT_MSG( m_isRadioGroupStart,
+                  _T("should only be called for the first radio item") );
+
+    m_radioGroup.end = end;

 }
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
 

+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);
+}
+

 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,

-                                bool isCheckable,
+                                wxItemKind kind,

                                 wxMenu *subMenu)
 {
                                 wxMenu *subMenu)
 {

-    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);

 }
 }