Author: mlytwyn
Date: Mon Aug 3 22:18:58 2015
New Revision: 38852
URL: http://svn.gna.org/viewcvs/gnustep?rev=38852&view=rev
Log:
Fix menuItem and popUpButton drawing issues from merge
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSMenuItemCell.m
libs/gui/branches/gnustep_testplant_branch/Source/NSPopUpButtonCell.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSMenuItemCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSMenuItemCell.m?rev=38852&r1=38851&r2=38852&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSMenuItemCell.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSMenuItemCell.m Mon Aug
3 22:18:58 2015
@@ -182,6 +182,11 @@
}
return color;
+}
+
+- (NSInteger) state
+{
+ return [_menuItem state];
}
- (void) setMenuItem: (NSMenuItem *)item
@@ -759,6 +764,7 @@
// Testplant-MAL-2015-06-22: While merging found was [_menuItem state] but
// I think it should be using [self state] for popups to show properly...
+ // Added 'state' method to NSMenuItemCell to return [_menuItem state]
value...
switch ([self state])
{
case NSOnState:
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSPopUpButtonCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSPopUpButtonCell.m?rev=38852&r1=38851&r2=38852&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSPopUpButtonCell.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSPopUpButtonCell.m
Mon Aug 3 22:18:58 2015
@@ -1081,6 +1081,7 @@
[self attachPopUpWithFrame: frame inView: controlView];
}
+#if 0
/*
* Override the implementation in NSMenuItemCell to behave the same
* as superclass NSButtonCell's implementation, since our direct
@@ -1095,7 +1096,7 @@
style: _bezel_style
state: [self themeControlState]];
}
-
+#endif
/*
* This drawing uses the same code that is used to draw cells in the menu.
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
