From 042b670b4098ba2565821a7a6294ea9fde98e8eb Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Tue, 3 Aug 2004 03:16:28 +0000 Subject: [PATCH] Minor fixes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@19821 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ GormViewEditor.m | 9 ++++++++- Palettes/2Controls/GormButtonEditor.m | 12 ++++++------ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca2d29a7..ec067034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-08-02 23 Gregory John Casamento + + * GormViewEditor.m: Added stub for initWithCoder just for + completeness. + * Palettes/2Controls/GormButtonEditor.m: Change references + to xDist and yDist to new names from NSCell.h + 2004-08-02 08:54 Gregory John Casamento * GormPalettesManager.m: Clarified error message when diff --git a/GormViewEditor.m b/GormViewEditor.m index d6f971a7..8fb7b77c 100644 --- a/GormViewEditor.m +++ b/GormViewEditor.m @@ -136,7 +136,14 @@ static BOOL currently_displaying = NO; - (void) encodeWithCoder: (NSCoder*)aCoder { [NSException raise: NSInternalInconsistencyException - format: @"Cannot encode a GormViewEditor"]; + format: @"Cannot encode a GormViewEditor."]; +} + +- (id) initWithCoder: (NSCoder*)aCoder +{ + [NSException raise: NSInternalInconsistencyException + format: @"Cannot decode a GormViewEditor."]; + return nil; } - (id) document diff --git a/Palettes/2Controls/GormButtonEditor.m b/Palettes/2Controls/GormButtonEditor.m index b6b42bd2..f9a2a9a1 100644 --- a/Palettes/2Controls/GormButtonEditor.m +++ b/Palettes/2Controls/GormButtonEditor.m @@ -175,8 +175,8 @@ imageRect.origin.y += 1; } titleRect = imageRect; - titleRect.origin.x += imageSize.width + xDist; - titleRect.size.width = cellFrame.size.width - imageSize.width - xDist; + titleRect.origin.x += imageSize.width + GSCellTextImageXDist; + titleRect.size.width = cellFrame.size.width - imageSize.width - GSCellTextImageXDist; if (_cell.is_bordered || _cell.is_bezeled) { titleRect.size.width -= 3; @@ -200,7 +200,7 @@ imageRect.origin.y += 1; } titleRect.origin = cellFrame.origin; - titleRect.size.width = cellFrame.size.width - imageSize.width - xDist; + titleRect.size.width = cellFrame.size.width - imageSize.width - GSCellTextImageXDist; titleRect.size.height = cellFrame.size.height; if (_cell.is_bordered || _cell.is_bezeled) { @@ -227,10 +227,10 @@ imageRect.origin.x = cellFrame.origin.x; imageRect.origin.y = cellFrame.origin.y; - imageRect.origin.y += titleRect.size.height + yDist; + imageRect.origin.y += titleRect.size.height + GSCellTextImageYDist; imageRect.size.width = cellFrame.size.width; imageRect.size.height = cellFrame.size.height; - imageRect.size.height -= titleSize.height + yDist; + imageRect.size.height -= titleSize.height + GSCellTextImageYDist; if (_cell.is_bordered || _cell.is_bezeled) { @@ -259,7 +259,7 @@ imageRect.origin.y = cellFrame.origin.y; imageRect.size.width = cellFrame.size.width; imageRect.size.height = cellFrame.size.height; - imageRect.size.height -= titleSize.height + yDist; + imageRect.size.height -= titleSize.height + GSCellTextImageYDist; if (_cell.is_bordered || _cell.is_bezeled) {