[Scopeapp-cvs]scopeapp/src ScopeView.m,1.11.2.2,1.11.2.3

[<sco...@li...>]

Update of /cvsroot/scopeapp/scopeapp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv561

Modified Files:
      Tag: scopeapp-gnustep
	ScopeView.m 
Log Message:
Fixed the problem with badly initialized views in TabViewItems.



Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -d -r1.11.2.2 -r1.11.2.3
*** ScopeView.m	12 Nov 2002 23:33:42 -0000	1.11.2.2
--- ScopeView.m	6 Dec 2002 15:05:12 -0000	1.11.2.3
***************
*** 28,38 ****
  #import "ScopeAppGlobals.h"
  
- //#ifdef __APPLE__
- //#import "GSVbox.h"
- //#import "GSHbox.h"
- //#endif
- #import <AppKit/GSHbox.h>
- #import <AppKit/GSVbox.h>
- 
  static double gTimeScales[10] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
  static double gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
--- 28,31 ----
***************
*** 366,375 ****
  	NSSlider* slider;
  	NSTextField* text;
- 	NSTextField* genericText;
- 	NSTextField* genericSmallText;
- 	NSTextFieldCell* genericTextCell;
  	NSMatrix* matrix;
- 	NSButtonCell* genericRadio;
- 	NSButton* genericCheckbox;
  	NSControl* previousControl;
  	GSVbox* bigVbox;
--- 359,363 ----
***************
*** 378,412 ****
  	GSHbox* smallHbox;
  	
- 	/* first create our "generic" controls; these are
- 	 * duplicated with -[NSObject copy] to create
- 	 * real ones */
- 	genericText = [[NSTextField alloc] init];
- 	[genericText setSelectable: NO];
- 	[genericText setEditable: NO];
- 	
- 	genericSmallText = [genericText copy];
- 	[genericSmallText setControlSize: NSSmallControlSize];
- 	[genericSmallText setFont:
- 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
- 	
- 	genericTextCell = [[NSTextFieldCell alloc] init];
- 	[genericTextCell setSelectable: NO];
- 	[genericTextCell setEditable: NO];
- 	[genericSmallText setControlSize: NSSmallControlSize];
- 	[genericTextCell setFont:
- 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
- 	
- 	genericRadio = [[NSButtonCell alloc] init];
- 	[genericRadio setButtonType: NSRadioButton];
- 	[genericRadio setControlSize: NSSmallControlSize];
- 	[genericRadio setFont:
- 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
- 	
- 	genericCheckbox = [[NSButton alloc] init];
- 	[genericCheckbox setButtonType: NSSwitchButton];
- 	[genericCheckbox setControlSize: NSSmallControlSize];
- 	[genericCheckbox setFont:
- 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
- 	
  	/* the "big" boxes are the top-level ones */
  	/* bigVbox is the highest-level box */
--- 366,369 ----
***************
*** 416,420 ****
  	/* bigHbox is the current row in bigVbox */
  	bigHbox = [GSHbox new];
! 	[bigHbox setHBorder: 20];
  	
  	/* smallVbox is the current column in bigHbox */
--- 373,377 ----
  	/* bigHbox is the current row in bigVbox */
  	bigHbox = [GSHbox new];
! 	//[bigHbox setHBorder: 20];
  	
  	/* smallVbox is the current column in bigHbox */
***************
*** 422,437 ****
  	
  	/* Offset controls */
! 	text = [genericText copy];
! 	[text setTitle: _(@"Offsets")];
  	[smallVbox addView: text withMinYMargin: 12];
  	
  	smallHbox = [GSHbox new];
  	
! 	text = [genericSmallText copy];
! 	[text setTitle: _(@"A")];
  	[smallHbox addView: text];
  
! 	text = [genericSmallText copy];
! 	[text setTitle: _(@"B")];
  	[smallHbox addView: text];
  	
--- 379,403 ----
  	
  	/* Offset controls */
! 	text = [[NSTextField alloc] init];
! 	[text setSelectable: NO];
! 	[text setEditable: NO];
! 	[text setTitleWithMnemonic: _(@"Offsets")];
! 	[text sizeToFit]; 
  	[smallVbox addView: text withMinYMargin: 12];
  	
  	smallHbox = [GSHbox new];
  	
! 	text = [[NSTextField alloc] init];
! 	[text setSelectable: NO];
! 	[text setEditable: NO];
! 	[text setTitleWithMnemonic: _(@"A")];
! 	[text sizeToFit];
  	[smallHbox addView: text];
  
! 	text = [[NSTextField alloc] init];
! 	[text setSelectable: NO];
! 	[text setEditable: NO];
! 	[text setTitleWithMnemonic: _(@"B")];
! 	[text sizeToFit];
  	[smallHbox addView: text];
  	
***************
*** 443,453 ****
  	
  	[parentView addSubview: bigVbox];
! 	
! 	[genericCheckbox release];
! 	[genericRadio release];
! 	[genericText release];
! 	[genericTextCell release];
! 	[genericSmallText release];
! 	
  	return self;
  }
--- 409,413 ----
  	
  	[parentView addSubview: bigVbox];
! 
  	return self;
  }