Prefixed all ivars with underscore

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14970 72102866-910b-0410-8b05-ffd578937521

Source/NSComboBoxCell.m

@@ -26,15 +26,45 @@
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSRunLoop.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSAutoreleasePool.h>
 #include <AppKit/NSApplication.h>
+#include <AppKit/NSBox.h>
+#include <AppKit/NSBrowser.h>
+#include <AppKit/NSBrowserCell.h>
 #include <AppKit/NSButtonCell.h>
 #include <AppKit/NSComboBox.h>
 #include <AppKit/NSComboBoxCell.h>
 #include <AppKit/NSGraphicsContext.h>
 #include <AppKit/NSImage.h>
+#include <AppKit/NSMatrix.h>
 #include <AppKit/NSScreen.h>
+#include <AppKit/NSScroller.h>
+#include <AppKit/NSWindow.h>
+
+@interface GSComboWindow : NSWindow
+{
+   NSBrowser	*browser;
+
+@private;
+   NSArray	*list;
+   NSComboBoxCell *_cell;
+   BOOL		_stopped;
+}
+
++ (GSComboWindow *)defaultPopUp;
+
+- (NSMatrix *)matrix;
+- (NSSize)popUpCellSizeForPopUp:(NSComboBoxCell *)aCell;
+- (void)popUpCell:(NSComboBoxCell *)aCell
+	  popUpAt:(NSPoint)aPoint
+	    width:(float)aWidth;
+- (void)runModalPopUp;
+- (void)runLoop;
+
+@end
 
-#include "GSComboSupport.h"
 
 static NSNotificationCenter *nc;
 
@@ -46,6 +76,267 @@ static NSNotificationCenter *nc;
 - (GSComboWindow *) _popUp;
 @end
 
+
+@implementation GSComboWindow
+
++ (GSComboWindow *) defaultPopUp
+{
+  static GSComboWindow *gsWindow = nil;
+
+  if (!gsWindow)
+    gsWindow = [[self alloc] initWithContentRect: NSMakeRect(0,0,100,100)
+			     styleMask: NSBorderlessWindowMask
+			     backing: NSBackingStoreNonretained //NSBackingStoreBuffered
+			     defer: YES];
+  return gsWindow;
+}
+
+- (id) initWithContentRect: (NSRect)contentRect
+		 styleMask: (unsigned int)aStyle
+		   backing: (NSBackingStoreType)bufferingType
+		     defer: (BOOL)flag
+{
+  NSBox *box;
+   
+  self = [super initWithContentRect: contentRect
+		styleMask: aStyle
+		backing: bufferingType
+		defer: flag];
+  box = [[NSBox alloc] initWithFrame: contentRect];
+  [box setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+  [box setBorderType: NSLineBorder];
+  [box setTitlePosition: NSNoTitle];
+  [box setContentViewMargins: NSMakeSize(1,1)];
+  [box sizeToFit];
+  [self setContentView:box];
+  RELEASE(box);
+  browser = [[NSBrowser alloc] initWithFrame: contentRect];
+  [browser setMaxVisibleColumns: 1];
+  [browser setTitled: NO];
+  [browser setHasHorizontalScroller: NO];
+  [browser setTarget: self];
+  [browser setAction: @selector(selectItem:)];
+  [browser setDelegate: self];
+//    [browser setRefusesFirstResponder: YES];
+  [browser setAutoresizingMask: NSViewWidthSizable | NSViewWidthSizable];
+  [browser setAllowsEmptySelection: NO];
+  [browser setAllowsMultipleSelection: NO];
+  [box setContentView: browser];
+  RELEASE(browser);
+  
+  return self;
+}
+
+- (void)dealloc
+{
+  // Browser was not retained so don't release it
+  [super dealloc];
+}
+
+- (NSMatrix *) matrix { return [browser matrixInColumn:0]; }
+
+- (NSSize) popUpCellSizeForPopUp: (NSComboBoxCell *)aCell
+{
+  NSSize size;
+  float itemHeight;
+  float cellSpacing;
+
+  itemHeight = [aCell itemHeight];
+  cellSpacing = [aCell intercellSpacing].height;
+  
+  if (itemHeight <= 0)
+    itemHeight = [[self matrix] cellSize].height;
+
+  if (cellSpacing <= 0)
+    cellSpacing = [[self matrix] intercellSpacing].height;
+
+  size = NSMakeSize(2.0 + [NSScroller scrollerWidth] + 100.0,
+		    2.0 + (itemHeight * [aCell numberOfVisibleItems]) +
+		    (cellSpacing * [aCell numberOfVisibleItems]));
+  size.height += 4.0;
+  size.width += 4.0;
+
+  return size;
+}
+
+- (void) popUpCell: (NSComboBoxCell *)aCell
+	   popUpAt: (NSPoint)aPoint
+	     width: (float)aWidth
+{
+  NSRect rect;
+   
+  rect.size = [self popUpCellSizeForPopUp: aCell];
+  _cell = aCell;
+
+  rect.size.width = aWidth;
+  rect.origin.x = aPoint.x;
+  rect.origin.y = aPoint.y;
+  [self setFrame: rect display: NO];
+
+  [browser loadColumnZero];
+  
+//    [self enableKeyEquivalentForDefaultButtonCell];
+  [self runModalPopUp];
+
+  _cell = nil;
+}
+
+- (void) runModalPopUp
+{
+  NSWindow	*onWindow;
+  NSEvent	*event;
+  NSException	*exception = nil;
+  
+  onWindow = [[_cell controlView] window];
+  [self setLevel: [onWindow level]];
+  [self orderWindow: NSWindowAbove relativeTo: [onWindow windowNumber]];
+
+  while ((event = [NSApp nextEventMatchingMask: NSAnyEventMask
+			 untilDate: [NSDate dateWithTimeIntervalSinceNow: 0]
+			 inMode: NSDefaultRunLoopMode
+			 dequeue: NO]))
+    {
+      if ([event type] == NSAppKitDefined ||
+	  [event type] == NSSystemDefined ||
+	  [event type] == NSApplicationDefined ||
+	  [event windowNumber] == [self windowNumber])
+	break;
+      [NSApp nextEventMatchingMask: NSAnyEventMask
+	     untilDate: [NSDate distantFuture]
+	     inMode: NSDefaultRunLoopMode
+	     dequeue: YES];
+    }
+
+  [self makeKeyAndOrderFront: nil];
+
+  NS_DURING
+    [self runLoop];
+  NS_HANDLER
+    exception = localException;
+  NS_ENDHANDLER;
+
+  if (onWindow)
+    {
+      [onWindow makeKeyWindow];
+      [onWindow orderFrontRegardless];
+    }
+
+  if ([self isVisible])
+      [self orderOut:nil];
+
+  if (exception)
+    [exception raise];
+}
+
+- (void) runLoop
+{
+  NSEvent		*event;
+  int			cnt = 0;
+  BOOL			kDown;
+  CREATE_AUTORELEASE_POOL (pool);
+  
+  _stopped = NO;
+  while (!_stopped)
+    {
+      kDown = NO;
+      cnt++;
+      if (cnt >= 5)
+        {
+	  RELEASE(pool);
+	  IF_NO_GC(pool = [[NSAutoreleasePool alloc] init]);
+	  cnt = 0;
+	}
+      event = [NSApp nextEventMatchingMask: NSAnyEventMask
+		     untilDate: [NSDate distantFuture]
+		     inMode: NSDefaultRunLoopMode
+		     dequeue: NO];
+      if (event)
+        {
+	  if ([event type] == NSAppKitDefined ||
+	      [event type] == NSSystemDefined ||
+	      [event type] == NSApplicationDefined ||
+	      [event windowNumber] == [self windowNumber])
+	    {
+	      event = [NSApp nextEventMatchingMask: NSAnyEventMask
+			     untilDate: [NSDate distantFuture]
+			     inMode: NSDefaultRunLoopMode
+			     dequeue: YES];
+	      [NSApp sendEvent: event];
+	      if ([event type] == NSKeyDown)
+		  kDown = YES;
+	    }
+	  else if ([event type] == NSMouseMoved ||
+		   [event type] == NSLeftMouseDragged ||
+		   [event type] == NSOtherMouseDragged ||
+		   [event type] == NSRightMouseDragged ||
+		   [event type] == NSMouseEntered ||
+		   [event type] == NSMouseExited ||
+		   [event type] == NSCursorUpdate)
+	    {
+	      event = [NSApp nextEventMatchingMask:NSAnyEventMask
+			     untilDate:[NSDate distantFuture]
+			     inMode:NSDefaultRunLoopMode
+			     dequeue:YES];
+	      [NSApp sendEvent:event];
+	    }
+	  else
+	    _stopped = YES;
+	}
+    }
+  if (kDown)
+    while ((event = [NSApp nextEventMatchingMask: NSAnyEventMask
+			   untilDate: [NSDate distantFuture]
+			   inMode: NSDefaultRunLoopMode
+			   dequeue: NO]))
+      {
+	if ([event windowNumber] != [self windowNumber])
+	  break;
+	event = [NSApp nextEventMatchingMask:NSAnyEventMask
+		       untilDate:[NSDate distantFuture]
+		       inMode:NSDefaultRunLoopMode
+		       dequeue:YES];
+	[NSApp sendEvent:event];
+	if ([event type] == NSKeyUp)
+	  break;
+      }
+  RELEASE(pool);
+}
+
+- (BOOL) canBecomeKeyWindow { return YES; }
+- (BOOL) worksWhenModal { return NO; }
+
+// Target/Action of Browser
+- (void) selectItem: (id)sender
+{
+  if (_cell)
+    {
+      [_cell setStringValue: [[sender selectedCell] stringValue]];
+      _stopped = YES;
+    }
+}
+
+// Browser Delegate Methods
+- (int) browser: (NSBrowser *)sender 
+numberOfRowsInColumn: (int)column
+{
+  if (!_cell)
+    return 0;
+
+  ASSIGN(list, [_cell objectValues]);
+  return [_cell numberOfItems];
+}
+
+- (void)browser: (NSBrowser *)sender 
+willDisplayCell: (id)aCell
+	  atRow: (int)row 
+	 column:(int)column
+{
+  [aCell setStringValue: [list objectAtIndex:row]];
+  [aCell setLeaf: YES];
+}
+
+@end
+
 @implementation NSComboBoxCell
 
 //