Author: mlytwyn
Date: Thu Dec 10 10:17:48 2015
New Revision: 39225
URL: http://svn.gna.org/viewcvs/gnustep?rev=39225&view=rev
Log:
Remove dead code
Modified:
plugins/themes/WinUXTheme/WinNSButton.m
Modified: plugins/themes/WinUXTheme/WinNSButton.m
URL:
http://svn.gna.org/viewcvs/gnustep/plugins/themes/WinUXTheme/WinNSButton.m?rev=39225&r1=39224&r2=39225&view=diff
==============================================================================
--- plugins/themes/WinUXTheme/WinNSButton.m (original)
+++ plugins/themes/WinUXTheme/WinNSButton.m Thu Dec 10 10:17:48 2015
@@ -75,18 +75,10 @@
HTHEME hTheme = [self themeWithClassName: @"button"];
int drawState = _ButtonStateForThemeControlState(state);
- GSThemeMargins margins = [self buttonMarginsForCell: cell style: style
state: state];
- NSRect drawFrame = [self insetFrame:frame withMargins:margins];
- drawFrame = frame;
-#if 0
- NSLog(@"%s:title: %@ frame: %@ drawFrame: %@", __PRETTY_FUNCTION__, [cell
title],
- NSStringFromRect(frame), NSStringFromRect(drawFrame));
-#endif
-
if (![self drawThemeBackground: hTheme
- inRect: drawFrame
+ inRect: frame
part: BP_PUSHBUTTON
state: drawState])
{
@@ -100,96 +92,4 @@
[self releaseTheme: hTheme];
}
-- (GSThemeMargins) buttonMarginsForCell: (NSCell*)cell
- style: (int)style
- state: (GSThemeControlState)state
-{
- GSThemeMargins margins = { 0 };
-
- switch (style)
- {
- case NSRoundRectBezelStyle:
- break;
-
- case NSTexturedRoundedBezelStyle:
- {
- if ([cell controlSize] == NSRegularControlSize)
- {
- margins.left = 10; margins.top = 7; margins.right = 10;
margins.bottom = 7;
- }
- else if ([cell controlSize] == NSSmallControlSize)
- {
- margins.left = 8; margins.top = 6; margins.right = 8; margins.bottom
= 6;
- }
- }
- break;
-
- case NSRoundedBezelStyle:
- {
- if ([cell controlSize] == NSRegularControlSize)
- {
- margins.left = 10; margins.top = 7; margins.right = 10;
margins.bottom = 7;
- }
- else if ([cell controlSize] == NSSmallControlSize)
- {
- margins.left = 8; margins.top = 6; margins.right = 8; margins.bottom
= 6;
- }
- }
- break;
-
- case NSTexturedSquareBezelStyle:
- margins.left = 3; margins.top = 1; margins.right = 3; margins.bottom = 1;
- break;
-
- case NSRegularSquareBezelStyle:
- margins.left = 2; margins.top = 2; margins.right = 2; margins.bottom = 2;
- break;
-
- case NSShadowlessSquareBezelStyle:
- break;
-
- case NSThickSquareBezelStyle:
- margins.left = 3; margins.top = 3; margins.right = 3; margins.bottom = 3;
- break;
-
- case NSThickerSquareBezelStyle:
- margins.left = 4; margins.top = 4; margins.right = 4; margins.bottom = 4;
- break;
-
- case NSCircularBezelStyle:
- {
- if ([cell controlSize] == NSRegularControlSize)
- {
- margins.left = 10; margins.top = 9; margins.right = 10;
margins.bottom = 9;
- }
- else if ([cell controlSize] == NSSmallControlSize)
- {
- margins.left = 8; margins.top = 7; margins.right = 8; margins.bottom
= 7;
- }
- else if ([cell controlSize] == NSMiniControlSize)
- {
- margins.left = 7; margins.top = 6; margins.right = 7; margins.bottom
= 6;
- }
- }
- break;
-
- case NSHelpButtonBezelStyle:
- margins.left = 2; margins.top = 3; margins.right = 2; margins.bottom = 3;
- break;
-
- case NSDisclosureBezelStyle:
- case NSRoundedDisclosureBezelStyle:
- case NSRecessedBezelStyle:
- // FIXME
- margins.left = 3; margins.top = 3; margins.right = 3; margins.bottom = 3;
- break;
-
- default:
- margins.left = 3; margins.top = 3; margins.right = 3; margins.bottom = 3;
- break;
- }
- return margins;
-}
-
-
@end
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
