diff --git a/ChangeLog b/ChangeLog index bd5747801..3f43029f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-03-15 20:28-EDT Gregory John Casamento + + * Source/NSScrollView.m: Added more flags for nib loading. + 2009-03-15 15:09-EDT Gregory John Casamento * Source/NSScrollView.m: Remove FIXME comment and provided an diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m index f64eebe5f..ac784ab00 100644 --- a/Source/NSScrollView.m +++ b/Source/NSScrollView.m @@ -61,9 +61,18 @@ typedef struct _scrollViewFlags { #ifdef WORDS_BIGENDIAN - unsigned int __unused4:22; + unsigned int __unused6:14; + unsigned int __unused5:1; unsigned int autohidesScrollers:1; - unsigned int __unused1:2; + unsigned int __unused4:1; + unsigned int __unused3:1; + unsigned int __unused2:1; + unsigned int doesNotDrawBackground:1; + unsigned int __unused1:1; + unsigned int hasVRuler:1; + unsigned int hasHRuler:1; + unsigned int showRulers:1; + unsigned int oldRulerInstalled:1; unsigned int nonDynamic:1; unsigned int hasHScroller:1; unsigned int hasVScroller:1; @@ -77,9 +86,18 @@ typedef struct _scrollViewFlags unsigned int hasVScroller:1; unsigned int hasHScroller:1; unsigned int nonDynamic:1; - unsigned int __unused1:2; + unsigned int oldRulerInstalled:1; + unsigned int showRulers:1; + unsigned int hasHRuler:1; + unsigned int hasVRuler:1; + unsigned int __unused1:1; + unsigned int doesNotDrawBackground:1; + unsigned int __unused2:1; + unsigned int __unused3:1; + unsigned int __unused4:1; unsigned int autohidesScrollers:1; - unsigned int __unused4:22; + unsigned int __unused5:1; + unsigned int __unused6:14; #endif } GSScrollViewFlags; @@ -1530,8 +1548,8 @@ static float scrollerWidth; _autohidesScrollers = scrollViewFlags.autohidesScrollers; _scrollsDynamically = (!scrollViewFlags.nonDynamic); // _rulersVisible = scrollViewFlags.rulersVisible; - // _hasHorizRuler = scrollViewFlags.hasHRuler; - // _hasVertRuler = scrollViewFlags.hasVRuler; + _hasHorizRuler = scrollViewFlags.hasHRuler; + _hasVertRuler = scrollViewFlags.hasVRuler; // [self setDrawsBackground: (!scrollViewFlags.doesNotDrawBack)]; _borderType = scrollViewFlags.border; }