From 10c98c9b2f0f845d8be4418438672f9178ecc63d Mon Sep 17 00:00:00 2001 From: wlux Date: Sat, 29 May 2010 08:32:02 +0000 Subject: [PATCH] Correct serious nib loading bug on big endian machines. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30472 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 ++++++++++ Headers/Additions/GNUstepGUI/GSNibLoading.h | 2 +- Source/NSButtonCell.m | 2 +- Source/NSMatrix.m | 2 +- Source/NSScrollView.m | 2 +- Source/NSTableView.m | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49ff95d4e..978927c5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-05-29 Wolfgang Lux + + * Headers/Additions/GNUstepGUI/GSNibLoading.h: + * Source/NSButtonCell.m: + * Source/NSMatrix.m: + * Source/NSScrollView.m: + * Source/NSTableView.m: Correct serious nib loading bug on big + endian machines by testing GS_WORDS_BIGENDIAN instead of + WORDS_BIGENDIAN. + 2010-05-29 01:34-EDT Gregory John Casamento * Source/GSXibLoader.m: Took out interface definitions and moved them. diff --git a/Headers/Additions/GNUstepGUI/GSNibLoading.h b/Headers/Additions/GNUstepGUI/GSNibLoading.h index 041550c14..4546942c0 100644 --- a/Headers/Additions/GNUstepGUI/GSNibLoading.h +++ b/Headers/Additions/GNUstepGUI/GSNibLoading.h @@ -66,7 +66,7 @@ typedef struct _GSWindowTemplateFlags { -#ifdef WORDS_BIGENDIAN +#if GS_WORDS_BIGENDIAN == 1 unsigned int isHiddenOnDeactivate:1; unsigned int isNotReleasedOnClose:1; unsigned int isDeferred:1; diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index 0624210d0..a0115eecb 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -61,7 +61,7 @@ typedef struct _GSButtonCellFlags { -#ifdef WORDS_BIGENDIAN +#if GS_WORDS_BIGENDIAN == 1 unsigned int isPushin:1; unsigned int changeContents:1; unsigned int changeBackground:1; diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m index b1a2d1d59..f4f50e6c9 100644 --- a/Source/NSMatrix.m +++ b/Source/NSMatrix.m @@ -125,7 +125,7 @@ typedef struct { } MRect; typedef struct _GSMatrixFlags { -#ifdef WORDS_BIGENDIAN +#if GS_WORDS_BIGENDIAN == 1 unsigned int isHighlight:1; unsigned int isRadio:1; unsigned int isList:1; diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m index d5ced2619..ce4c0110e 100644 --- a/Source/NSScrollView.m +++ b/Source/NSScrollView.m @@ -61,7 +61,7 @@ // typedef struct _scrollViewFlags { -#ifdef WORDS_BIGENDIAN +#if GS_WORDS_BIGENDIAN == 1 unsigned int __unused6:14; unsigned int __unused5:1; unsigned int autohidesScrollers:1; diff --git a/Source/NSTableView.m b/Source/NSTableView.m index 1f3e06055..14102d326 100644 --- a/Source/NSTableView.m +++ b/Source/NSTableView.m @@ -86,7 +86,7 @@ static unsigned currentDragOperation; */ typedef struct _tableViewFlags { -#ifdef WORDS_BIGENDIAN +#if GS_WORDS_BIGENDIAN == 1 unsigned int columnOrdering:1; unsigned int columnResizing:1; unsigned int drawsGrid:1;