support underlined text in wxCairoContext (Marcin's patch) (closes #9846)

[wxWidgets.git] / src / osx / carbon / uma.cpp

diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp
index 7601f161a4824930b7e1d4891b92e137e76dbbe1..3009393821d0d48ac349650f62ffa76b630f1d72 100644 (file)
--- a/src/osx/carbon/uma.cpp
+++ b/src/osx/carbon/uma.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/uma.cpp
+// Name:        src/osx/carbon/uma.cpp

 // Purpose:     UMA support
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     UMA support
 // Author:      Stefan Csomor
 // Modified by:


@@ -20,17 +20,6 @@
 
 #include "wx/osx/uma.h"
 
 
 #include "wx/osx/uma.h"
 

-static SInt32 sUMASystemVersion = 0 ;
-
-long UMAGetSystemVersion() 
-{ 
-    if ( sUMASystemVersion == 0 )
-    {
-        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
-    }
-    return sUMASystemVersion ; 
-}
-

 // menu manager
 
 #if wxOSX_USE_CARBON
 // menu manager
 
 #if wxOSX_USE_CARBON


@@ -69,12 +58,13 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
         DisableMenuItem( inMenu , inItem ) ;
 }
 
         DisableMenuItem( inMenu , inItem ) ;
 }
 

-void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuRef submenu )

 {
     AppendMenuItemTextWithCFString( menu,
                                 CFSTR("A"), 0, 0,NULL);
     UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );
 {
     AppendMenuItemTextWithCFString( menu,
                                 CFSTR("A"), 0, 0,NULL);
     UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );

-    SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
+    SetMenuItemHierarchicalMenu( menu , CountMenuItems( menu ) , submenu ) ;
+    SetMenuTitleWithCFString(submenu , wxCFStringRef(title , encoding) );

 }
 
 void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )
 }
 
 void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )