From b138e32d7046c7bb38b43d59f91af6de3c7c7f09 Mon Sep 17 00:00:00 2001
From: gcasa <gcasa@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 4 Jun 2005 19:52:40 +0000
Subject: [PATCH] Minor updates.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@21285 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                                     |  7 +++++++
 Headers/Additions/GNUstepGUI/GSNibTemplates.h |  2 +-
 Source/GSNibTemplates.m                       | 10 +++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46fdfbbe4..2dbcdf4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-04 08:11 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Headers/Additions/GNUstepGUI/GSNibTemplates.h: Minor update to
+	constant name.
+	* Source/GSNibTemplates.m: Use new constant name, and move call
+	to autoPositionWindow: outside of class name check.
+
 2005-06-04 07:36 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Headers/Additions/GNUstepGUI/GSNibTemplates.h: Constants for new
diff --git a/Headers/Additions/GNUstepGUI/GSNibTemplates.h b/Headers/Additions/GNUstepGUI/GSNibTemplates.h
index 6cf730d96..7caa5f6db 100644
--- a/Headers/Additions/GNUstepGUI/GSNibTemplates.h
+++ b/Headers/Additions/GNUstepGUI/GSNibTemplates.h
@@ -52,7 +52,7 @@
 
 /** Window template autopositioning constants */
 enum {
-  GSWindowAutosizeNone = 0,
+  GSWindowAutoPositionNone = 0,
   GSWindowMinXMargin = 1,
   GSWindowMaxXMargin = 2,
   GSWindowMinYMargin = 4,
diff --git a/Source/GSNibTemplates.m b/Source/GSNibTemplates.m
index 0c1e843ed..1a4b97aa4 100644
--- a/Source/GSNibTemplates.m
+++ b/Source/GSNibTemplates.m
@@ -746,7 +746,7 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
   BOOL		changedOrigin = NO;
 
   // reposition the window on the screen.
-  if (_autoPositionMask == GSWindowAutosizeNone)
+  if (_autoPositionMask == GSWindowAutoPositionNone)
     return;
 
   /*
@@ -827,7 +827,7 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
 	{
 	  // decode the defer flag...
 	  [coder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];      
-	  _autoPositionMask = GSWindowAutosizeNone;
+	  _autoPositionMask = GSWindowAutoPositionNone;
 	  _screenRect = [[_object screen] frame];
 	}
 
@@ -847,10 +847,10 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
 	      
 	      // set the content view back
 	      [obj setContentView: contentView];
-
-	      // autoposition window
-	      [self autoPositionWindow: obj];
 	    }
+
+	  // autoposition window
+	  [self autoPositionWindow: obj];
 	}
       else
 	{