On Sat, Nov 21, 2015 at 8:25 PM, SiegeLord <[email protected]> wrote:
> Err... were those commits in a position to be merged? Do we need to revert
> them and remerge with the fixes?
>
>
I suppose just re-merging (without reverting) will work, the branch in the
pull request seems to be synched with current master already:
~/prog/allegro/git$ git diff 5.1 peterhull90-osx-fixes
diff --git a/addons/native_dialog/osx_dialog.m
b/addons/native_dialog/osx_dialog.m
index 9cd39f3..20fd4f3 100644
--- a/addons/native_dialog/osx_dialog.m
+++ b/addons/native_dialog/osx_dialog.m
@@ -369,8 +369,9 @@ void _al_append_native_text_log(ALLEGRO_NATIVE_DIALOG
*textlog)
NSLock* lock;
ALLEGRO_MENU* amenu;
BOOL _hasAppMenu;
+ NSMenu* _menu;
}
-@property (readonly) NSMenu* menu;
+-(NSMenu*) menu;
-(instancetype) initWithMenu:(ALLEGRO_MENU*) amenu; // Designated
initializer
-(NSMenu*) menu;
-(void) show;
@@ -549,7 +550,6 @@ bool _al_show_popup_menu(ALLEGRO_DISPLAY *display,
ALLEGRO_MENU *amenu)
{
/* This isn't a valid initializer */
return nil;
-// return [self initWithMenu:nil];
}
// Manage the enabled and checked state (done dynamically by the framework)
-(BOOL) validateMenuItem:(NSMenuItem *)menuItem {
@@ -567,6 +567,11 @@ bool _al_show_popup_menu(ALLEGRO_DISPLAY *display,
ALLEGRO_MENU *amenu)
[self->_menu release];
[super dealloc];
}
+// Get the menu
+-(NSMenu*) menu
+{
+ return self->_menu;
+}
// Action event when the menu is selected
-(void) activated:(id)sender {
NSMenuItem* mitem = (NSMenuItem*) sender;
_______________________________________________
Allegro-developers mailing list
[email protected]
https://mail.gna.org/listinfo/allegro-developers
