// Author: David Elliott
// Modified by:
// Created: 2002/12/15
-// RCS-ID: $Id:
-// Copyright: 2002 David Elliott
+// RCS-ID: $Id$
+// Copyright: 2002-2004 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#include "wx/cocoa/ObjcPose.h"
#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
#import <AppKit/NSMenuItem.h>
#import <AppKit/NSMenu.h>
#import <Foundation/NSString.h>
+#import <AppKit/NSCell.h> // NSOnState, NSOffState
#if wxUSE_MENUS
- (void)wxMenuItemAction: (id)sender
{
- wxLogDebug("wxMenuItemAction");
+ wxLogTrace(wxTRACE_COCOA,wxT("wxMenuItemAction"));
wxMenuItem *item = wxMenuItem::GetFromCocoa(sender);
- wxCHECK_RET(item,"wxMenuItemAction received but no wxMenuItem exists!");
+ wxCHECK_RET(item,wxT("wxMenuItemAction received but no wxMenuItem exists!"));
wxMenu *menu = item->GetMenu();
- wxCHECK_RET(menu,"wxMenuItemAction received but wxMenuItem is not in a wxMenu");
+ wxCHECK_RET(menu,wxT("wxMenuItemAction received but wxMenuItem is not in a wxMenu"));
wxMenuBar *menubar = menu->GetMenuBar();
if(menubar)
{
wxFrame *frame = menubar->GetFrame();
- wxCHECK_RET(frame, "wxMenuBar MUST be attached to a wxFrame!");
+ wxCHECK_RET(frame, wxT("wxMenuBar MUST be attached to a wxFrame!"));
frame->ProcessCommand(item->GetId());
}
}
- (BOOL)validateMenuItem: (id)menuItem
{
- // TODO: Do wxWindows validation here and avoid sending during idle time
- wxLogDebug("wxMenuItemAction");
+ // TODO: Do wxWidgets validation here and avoid sending during idle time
+ wxLogTrace(wxTRACE_COCOA,wxT("wxMenuItemAction"));
wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
- wxCHECK_MSG(item,NO,"validateMenuItem received but no wxMenuItem exists!");
+ wxCHECK_MSG(item,NO,wxT("validateMenuItem received but no wxMenuItem exists!"));
return item->IsEnabled();
}
@end //implementation wxNSMenuItemTarget
-// ============================================================================
-// @class wxPoserNSMenuItem
-// ============================================================================
-@interface wxPoserNSMenuItem : NSMenuItem
-{
-}
-
-@end // wxPoserNSMenuItem
-
-WX_IMPLEMENT_POSER(wxPoserNSMenuItem);
-@implementation wxPoserNSMenuItem : NSMenuItem
-
-@end // wxPoseRNSMenuItem
-
// ============================================================================
// wxMenuItemCocoa implementation
// ============================================================================
: wxMenuItemBase(pParentMenu, itemid, strName, strHelp, kind, pSubMenu)
{
wxAutoNSAutoreleasePool pool;
- NSString *menuTitle = [[NSString alloc] initWithCString: wxStripMenuCodes(strName).c_str()];
- m_cocoaNSMenuItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:@selector(wxMenuItemAction:) keyEquivalent:@""];
- sm_cocoaHash.insert(wxMenuItemCocoaHash::value_type(m_cocoaNSMenuItem,this));
- [m_cocoaNSMenuItem setTarget:sm_cocoaTarget];
- if(pSubMenu)
+ if(m_kind == wxITEM_SEPARATOR)
+ m_cocoaNSMenuItem = [[NSMenuItem separatorItem] retain];
+ else
{
- wxASSERT(pSubMenu->GetNSMenu());
- [pSubMenu->GetNSMenu() setTitle:menuTitle];
- [m_cocoaNSMenuItem setSubmenu:pSubMenu->GetNSMenu()];
+ NSString *menuTitle = wxInitNSStringWithWxString([NSString alloc],wxStripMenuCodes(strName));
+ m_cocoaNSMenuItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:@selector(wxMenuItemAction:) keyEquivalent:@""];
+ sm_cocoaHash.insert(wxMenuItemCocoaHash::value_type(m_cocoaNSMenuItem,this));
+ [m_cocoaNSMenuItem setTarget:sm_cocoaTarget];
+ if(pSubMenu)
+ {
+ wxASSERT(pSubMenu->GetNSMenu());
+ [pSubMenu->GetNSMenu() setTitle:menuTitle];
+ [m_cocoaNSMenuItem setSubmenu:pSubMenu->GetNSMenu()];
+ }
+ [menuTitle release];
}
- [menuTitle release];
}
wxMenuItem::~wxMenuItem()
// misc
// ----------------------------------------------------------------------------
+void wxMenuItem::SetBitmaps(const wxBitmap& bmpChecked,
+ const wxBitmap& bmpUnchecked)
+{
+ wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items do not have bitmaps."));
+ wxAutoNSAutoreleasePool pool;
+ m_bmpChecked = bmpChecked;
+ m_bmpUnchecked = bmpUnchecked;
+ if(IsCheckable())
+ {
+ [m_cocoaNSMenuItem setOnStateImage: bmpChecked.GetNSImage(true)];
+ [m_cocoaNSMenuItem setOffStateImage: bmpUnchecked.GetNSImage(true)];
+ }
+ else
+ {
+ wxASSERT_MSG(!bmpUnchecked.Ok(),wxT("Normal menu items should only have one bitmap"));
+ [m_cocoaNSMenuItem setImage: bmpChecked.GetNSImage(true)];
+ }
+}
+
// change item state
// -----------------
void wxMenuItem::Enable(bool bDoEnable)
{
wxMenuItemBase::Enable(bDoEnable);
+ // NOTE: Nothing to do, we respond to validateMenuItem instead
}
-void wxMenuItem::Check(bool bDoCheck)
+void wxMenuItem::Check(bool check)
{
- wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
- wxMenuItemBase::Check(bDoCheck);
+ wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
+ if(m_isChecked == check)
+ return;
+ wxAutoNSAutoreleasePool pool;
+ if(GetKind() == wxITEM_RADIO)
+ {
+ // it doesn't make sense to uncheck a radio item - what would this do?
+ if(!check)
+ return;
+ const wxMenuItemList& items = m_parentMenu->GetMenuItems();
+ // First search backwards for other radio items
+ wxMenuItemList::compatibility_iterator radioStart = items.Find(this);
+ for(wxMenuItemList::compatibility_iterator prevNode = radioStart;
+ prevNode && (prevNode->GetData()->GetKind() == wxITEM_RADIO);
+ prevNode = prevNode->GetPrevious())
+ {
+ radioStart = prevNode;
+ }
+ // Now starting there set the state of every item until we're
+ // out of radio items to set.
+ for(wxMenuItemList::compatibility_iterator node = radioStart;
+ node && (node->GetData()->GetKind() == wxITEM_RADIO);
+ node = node->GetNext())
+ {
+ wxMenuItem *item = node->GetData();
+ bool checkItem = (item == this);
+ item->wxMenuItemBase::Check(checkItem);
+ [item->m_cocoaNSMenuItem setState: checkItem?NSOnState:NSOffState];
+ }
+ }
+ else // normal check (non-radio) item
+ {
+ wxMenuItemBase::Check(check);
+ [m_cocoaNSMenuItem setState: check?NSOnState:NSOffState];
+ }
}
void wxMenuItem::SetText(const wxString& label)
{
wxMenuItemBase::SetText(label);
+ wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items do not have titles."));
+ [m_cocoaNSMenuItem setTitle: wxNSStringWithWxString(wxStripMenuCodes(label))];
}
void wxMenuItem::SetCheckable(bool checkable)
{
+ wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items cannot be turned into normal menu items."));
wxMenuItemBase::SetCheckable(checkable);
+ // NOTE: Cocoa does not discern between unchecked and normal items
}
#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff