Wed, 21 Jan 2015 20:38:21 +0100
fixed memory allocation bug
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2014 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #import "../ui/menu.h" #import "toolkit.h" #import "../../ucx/list.h" typedef struct UiAbstractMenuItem { int (*update)(id window, void *item); void *item_data; } UiAbstractMenuItem; typedef struct UiMenuItem { NSMenuItem *item; int state; } UiMenuItem; typedef struct UiStateItem { NSMenuItem *item; char *var; } UiStateItem; typedef struct UiMenuItemList { NSMenu *menu; NSMenuItem *first; UiList *list; int index; int oldcount; ui_callback callback; void *data; } UiMenuItemList; @interface UiMenuDelegate : NSObject <NSMenuDelegate> { UcxList *items; // UiStateItem* UcxList *itemlists; // UiMenuItemList* } - (void) menuNeedsUpdate:(NSMenu*) menu; - (void) addItem:(NSMenuItem*) item var: (char*)name; - (void) addList:(UiList*) list menu:(NSMenu*)menu index: (int)i callback: (ui_callback)f data:(void*) data; - (UcxList*) items; - (UcxList*) lists; @end @interface UiGroupMenuItem : NSMenuItem { NSMutableArray *groups; } - (id)initWithTitle:(NSString*)title action:(SEL)action keyEquivalent:(NSString*)s; - (void) addGroup:(int)group; - (void) checkGroups:(int*)g count:(int)n; @end void ui_menu_init(); UiMenuDelegate* ui_menu_delegate(); int ui_menuitem_get(UiInteger *i); void ui_menuitem_set(UiInteger *i, int value); int ui_update_item(id window, void *data); int ui_update_item_list(id window, void *data);