* GormCore/GormFilePrefsManager.m: Update version

* GormInfo.plist: Update version
	* Palettes/2Controls/GormPopUpButtonEditor.m: Override
	method to prevent changes to appearance during editing.
	* Version: Change to 1.2.13 for SVN version of Gorm.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@30432 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,11 @@
+2010-05-20 04:04-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* GormCore/GormFilePrefsManager.m: Update version
+	* GormInfo.plist: Update version
+	* Palettes/2Controls/GormPopUpButtonEditor.m: Override
+	method to prevent changes to appearance during editing.
+	* Version: Change to 1.2.13 for SVN version of Gorm.
+
 2010-05-18 21:55-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Version: 1.2.12

GormCore/GormFilePrefsManager.m

@@ -85,7 +85,7 @@ NSString *formatVersion(int version)
 
 + (int) currentVersion
 {
-  return appVersion(1,2,12); 
+  return appVersion(1,2,13); 
 }
 
 - (void) awakeFromNib

GormInfo.plist

@@ -34,9 +34,9 @@
     ApplicationDescription = "[GNUstep | Graphical] Object Relationship Modeller";
     ApplicationIcon = "Gorm.tiff";
     ApplicationName = "Gorm";
-    ApplicationRelease = "Gorm 1.2.12 (Release)";
+    ApplicationRelease = "Gorm 1.2.13 (SVN)";
     Authors = ("Gregory John Casamento <greg_casamento@yahoo.com>","Richard Frith-Macdonald <rfm@gnu.org>","Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>");
     Copyright = "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 FSF";
     CopyrightDescription = "Released under the GNU General Public License 3.0";
-    NSBuildVersion = "1.2.12 May 18 2010";
+    NSBuildVersion = "1.2.13 May 19 2010";
 }

Palettes/2Controls/GormPopUpButtonEditor.m

@@ -76,6 +76,56 @@ Class _gormnspopupbuttonCellClass = 0;
 {
   return @"NSPopUpButtonCell";
 }
+
+/**
+ * Override this here, since themes may override it.
+ * Always want to show the menu view since it's editable. 
+ */
+- (void) attachPopUpWithFrame: (NSRect)cellFrame
+                       inView: (NSView *)controlView
+{
+  NSNotificationCenter  *nc = [NSNotificationCenter defaultCenter];
+  NSWindow              *cvWin = [controlView window];
+  NSMenuView            *mr = [[self menu] menuRepresentation];
+  int                   selectedItem;
+
+  [nc postNotificationName: NSPopUpButtonCellWillPopUpNotification
+                    object: self];
+
+  [nc postNotificationName: NSPopUpButtonWillPopUpNotification
+                    object: controlView];
+
+  // Convert to Screen Coordinates
+  cellFrame = [controlView convertRect: cellFrame toView: nil];
+  cellFrame.origin = [cvWin convertBaseToScreen: cellFrame.origin];
+
+  if (_pbcFlags.pullsDown)
+    selectedItem = -1;
+  else 
+    selectedItem = [self indexOfSelectedItem];
+
+  if (selectedItem > 0)
+    {
+      [mr setHighlightedItemIndex: selectedItem];
+    }
+
+  // Ask the MenuView to attach the menu to this rect
+  [mr setWindowFrameForAttachingToRect: cellFrame
+      onScreen: [cvWin screen]
+      preferredEdge: _pbcFlags.preferredEdge
+      popUpSelectedItem: selectedItem];
+
+  // Set to be above the main window
+  [cvWin addChildWindow: [mr window] ordered: NSWindowAbove];
+
+  // Last, display the window
+  [[mr window] orderFrontRegardless];
+
+  [nc addObserver: self
+      selector: @selector(_handleNotification:)
+      name: NSMenuDidSendActionNotification
+      object: _menu];
+}
 @end
 
 @interface GormPopUpButtonEditor : GormControlEditor

Version

@@ -11,5 +11,5 @@ GNUSTEP_CORE_VERSION=0.18.0
 # The version number of this release.
 MAJOR_VERSION=1
 MINOR_VERSION=2
-SUBMINOR_VERSION=12
+SUBMINOR_VERSION=13
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}