Applied #10639 (Not all previewed fonts are displayed with the correct nameface)

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 34cd2079e2e5daabe7bbcfd51e61e72542b9f60d..34ea162c4df9c5e42db597dcf50320a9d9264402 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -55,7 +55,10 @@
 
 @end
 
-@interface wxNSMenuController : NSObject <NSMenuDelegate>
+@interface wxNSMenuController : NSObject 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    <NSMenuDelegate>
+#endif
 {
 }
 
@@ -117,11 +120,11 @@
 
 @end
 
-@interface NSApplication(MissingAppleMenuCall) 
-- (void)setAppleMenu:(NSMenu *)menu; 
-@end 
+@interface NSApplication(MissingAppleMenuCall)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
 
-class wxMenuCocoaImpl : public wxMenuImpl 
+class wxMenuCocoaImpl : public wxMenuImpl
 {
 public :
     wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
@@ -138,22 +141,22 @@ public :
             CFRetain(m_osxMenu);
         [m_osxMenu release];
     }
-    
+
     virtual ~wxMenuCocoaImpl();
-        
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) 
+
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
         if ( pos == (size_t) -1 )
             [m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
         else
             [m_osxMenu insertItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() atIndex:pos];
     }
-        
-    virtual void Remove( wxMenuItem *pItem ) 
+
+    virtual void Remove( wxMenuItem *pItem )
     {
         [m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
     }
-    
+
     virtual void MakeRoot()
     {
         [NSApp setMainMenu:m_osxMenu];
@@ -163,7 +166,7 @@ public :
     virtual void Enable( bool WXUNUSED(enable) )
     {
     }
-    
+
     virtual void SetTitle( const wxString& text )
     {
         wxCFStringRef cfText(text);