- fix build for gnustep-gui > 0.13

4 files changed, 79 insertions, 0 deletions

diff --git a/x11-themes/etoile-etoilemenus/files/patch-NSMenu+Hackery.m b/x11-themes/etoile-etoilemenus/files/patch-NSMenu+Hackery.m
new file mode 100644
index 000000000000..7f415f75b939
--- /dev/null
+++ b/x11-themes/etoile-etoilemenus/files/patch-NSMenu+Hackery.m
@@ -0,0 +1,35 @@
+--- Bundles/EtoileWildMenus/NSMenu+Hackery.m.orig	2008-01-04 00:44:24.000000000 +0100
++++ Bundles/EtoileWildMenus/NSMenu+Hackery.m	2008-01-04 00:46:07.000000000 +0100
+@@ -27,6 +27,8 @@
+ #include <AppKit/NSMenuView.h>
+ #include <AppKit/NSWindow.h>
+ 
++#include <GNUstepGUI/GSVersion.h>
++
+ #include "NSMenu+Hackery.h"
+ 
+ #import "MenuBarHeight.h"
+@@ -47,7 +49,11 @@
+ 
+ - (void) shiftOnScreen
+ {
++#if (GNUSTEP_GUI_MINOR_VERSION < 13)
+   NSWindow *theWindow = _transient ? _bWindow : _aWindow;
++#else
++  NSWindow *theWindow = _menu.transient ? _bWindow : _aWindow;
++#endif
+   NSRect    frameRect = [theWindow frame];
+   NSRect    screenRect = [[NSScreen mainScreen] frame];
+   NSPoint   vector    = {0.0, 0.0};
+@@ -103,7 +109,11 @@
+ - (void) _rightMouseDisplay: (NSEvent*)theEvent 
+ {
+   // enable context menus to function
++#if (GNUSTEP_GUI_MINOR_VERSION < 13)
+   if (_horizontal == NO && [(NSMenuView *) _view isHorizontal] == NO)
++#else
++  if (_menu.horizontal == NO && [(NSMenuView *) _view isHorizontal] == NO)
++#endif
+     {
+       [self displayTransient];
+       [_view mouseDown: theEvent];
diff --git a/x11-themes/etoile-etoilemenus/files/patch-NSMenuView+Hackery.m b/x11-themes/etoile-etoilemenus/files/patch-NSMenuView+Hackery.m
new file mode 100644
index 000000000000..40ad0604a881
--- /dev/null
+++ b/x11-themes/etoile-etoilemenus/files/patch-NSMenuView+Hackery.m
@@ -0,0 +1,10 @@
+--- Bundles/EtoileWildMenus/NSMenuView+Hackery.m.orig	2007-08-03 16:46:33.000000000 +0200
++++ Bundles/EtoileWildMenus/NSMenuView+Hackery.m	2008-08-11 10:28:16.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "NSMenuView+Hackery.h"
+ 
+ #import <AppKit/NSApplication.h>
++#import <AppKit/NSEvent.h>
+ #import <AppKit/PSOperators.h>
+ 
+ #import "EtoileMenuTitleView.h"
diff --git a/x11-themes/etoile-wildmenus/files/patch-GSHorizontalMenuItemCell.m b/x11-themes/etoile-wildmenus/files/patch-GSHorizontalMenuItemCell.m
new file mode 100644
index 000000000000..91b689c32517
--- /dev/null
+++ b/x11-themes/etoile-wildmenus/files/patch-GSHorizontalMenuItemCell.m
@@ -0,0 +1,11 @@
+--- Bundles/WildMenus/GSHorizontalMenuItemCell.m.orig	2005-12-01 00:55:35.000000000 +0100
++++ Bundles/WildMenus/GSHorizontalMenuItemCell.m	2008-06-16 21:03:33.000000000 +0200
+@@ -20,6 +20,8 @@
+    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
++#include <AppKit/NSAttributedString.h>
++#include <AppKit/NSDictionary.h>
+ #include <AppKit/NSGraphics.h>
+ #include <AppKit/NSImage.h>
+ #include <AppKit/NSParagraphStyle.h>
diff --git a/x11-themes/etoile-wildmenus/files/patch-NSMenu+Hackery.m b/x11-themes/etoile-wildmenus/files/patch-NSMenu+Hackery.m
new file mode 100644
index 000000000000..29b0bcbcb68a
--- /dev/null
+++ b/x11-themes/etoile-wildmenus/files/patch-NSMenu+Hackery.m
@@ -0,0 +1,23 @@
+--- Bundles/WildMenus/NSMenu+Hackery.m.orig	2005-12-01 00:55:35.000000000 +0100
++++ Bundles/WildMenus/NSMenu+Hackery.m	2008-08-11 10:15:32.000000000 +0200
+@@ -27,6 +27,8 @@
+ #include <AppKit/NSMenuView.h>
+ #include <AppKit/NSWindow.h>
+ 
++#include <GNUstepGUI/GSVersion.h>
++
+ #include "NSMenu+Hackery.h"
+ 
+ @implementation NSMenu (HorizontalHackery)
+@@ -35,7 +37,11 @@
+ 
+ - (void) shiftOnScreen
+ {
++#if (GNUSTEP_GUI_MINOR_VERSION < 13)
+   NSWindow *theWindow = _transient ? _bWindow : _aWindow;
++#else
++  NSWindow *theWindow = _menu.transient ? _bWindow : _aWindow;
++#endif
+   NSRect    frameRect = [theWindow frame];
+   NSRect    screenRect = [[NSScreen mainScreen] frame];
+   NSPoint   vector    = {0.0, 0.0};