theme reorganisation/tidy up

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23586 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-09-22 11:53:40 +00:00
parent f5a8f2e9aa
commit 8bf3cdc94e
24 changed files with 116 additions and 182 deletions

View file

@ -42,7 +42,7 @@
#include "AppKit/NSMenuItemCell.h"
#include "AppKit/NSMenuView.h"
#include "AppKit/NSParagraphStyle.h"
#include "GNUstepGUI/GSDrawFunctions.h"
#include "GNUstepGUI/GSTheme.h"
@implementation NSMenuItemCell
@ -446,11 +446,11 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
if (_cell.is_highlighted && (_highlightsByMask & NSPushInCellMask))
{
[GSDrawFunctions drawGrayBezel: cellFrame : NSZeroRect];
[[GSTheme theme] drawGrayBezel: cellFrame withClip: NSZeroRect];
}
else
{
[GSDrawFunctions drawButton: cellFrame : NSZeroRect];
[[GSTheme theme] drawButton: cellFrame withClip: NSZeroRect];
}
}
@ -710,7 +710,8 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */
// pushed in buttons contents are displaced to the bottom right 1px
if (_cell.is_bordered && (mask & NSPushInCellMask))
{
cellFrame = NSOffsetRect(cellFrame, 1., [controlView isFlipped] ? 1. : -1.);
cellFrame
= NSOffsetRect(cellFrame, 1., [controlView isFlipped] ? 1. : -1.);
}
/*