dwindows: mac/dw.m comparison

comparison mac/dw.m @ 792:fc6a626a96cc

Initial groupbox support. Sizing of the content frame is not quite right yet.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 22 Mar 2011 21:03:35 +0000
parents	7a236fdcf4ba
children	e328c7746cda

comparison

equal deleted inserted replaced

-:4eb337e18caf
+:fc6a626a96cc
 NSColor *bgcolor;
 }
 -(id)init;
 -(void)dealloc;
 -(Box *)box;
+-(id)contentView;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)drawRect:(NSRect)rect;
 -(BOOL)isFlipped;
 -(void)mouseDown:(NSEvent *)theEvent;
 free(box);
 _remove_userdata(&root, NULL, TRUE);
 [super dealloc];
 }
 -(Box *)box { return box; }
+-(id)contentView { return self; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)drawRect:(NSRect)rect
 {
 if(bgcolor)
 {
 bgcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(input)/255.0 green: DW_GREEN_VALUE(input)/255.0 blue: DW_BLUE_VALUE(input)/255.0 alpha: 1] retain];
 }
 [orig release];
 }
+@end
+/* Subclass for a group box type */
+@interface DWGroupBox : NSBox
+{
+void *userdata;
+NSColor *bgcolor;
+}
+-(Box *)box;
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
+@end
+@implementation DWGroupBox
+-(Box *)box { return [[self contentView] box]; }
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
 @end
 /* Subclass for a top-level window */
 @interface DWView : DWBox
 {
 for(z=0;z<thisbox->count;z++)
 {
 if(thisbox->items[z].type == TYPEBOX)
 {
 int initialx, initialy;
-DWBox *box = thisbox->items[z].hwnd;
+id box = thisbox->items[z].hwnd;
 Box *tmp = [box box];
 initialx = x - (*usedx);
 initialy = y - (*usedy);
 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
 }
 if(thisbox->items[z].type == TYPEBOX)
 {
-DWBox *box = thisbox->items[z].hwnd;
+id box = thisbox->items[z].hwnd;
 Box *tmp = [box box];
 if(tmp)
 {
 tmp->parentxratio = thisbox->items[z].xratio;
 if(thisbox->items[z].vsize == SIZEEXPAND && thisbox->type == DW_HORZ)
 thisbox->items[z].height = uymax-(thisbox->items[z].pad*2);
 /* Run this code segment again to finalize the sized after setting uxmax/uymax values. */
 if(thisbox->items[z].type == TYPEBOX)
 {
-DWBox *box = thisbox->items[z].hwnd;
+id box = thisbox->items[z].hwnd;
 Box *tmp = [box box];
 if(tmp)
 {
 if(*depth > 0)
 /* Special handling for notebook controls */
 if([handle isMemberOfClass:[DWNotebook class]])
 {
 DWNotebook *notebook = (DWNotebook *)handle;
 DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
-DWBox *view = [notepage view];
+id view = [notepage view];
 if(view != nil)
 {
 Box *box = [view box];
 NSSize size = [view frame].size;
 [textfield setFrameOrigin:NSMakePoint(0,0)];
 [textfield setFrameSize:NSMakeSize(size.width-20,size.height)];
 [stepper setFrameOrigin:NSMakePoint(size.width-20,0)];
 [stepper setFrameSize:NSMakeSize(20,size.height)];
 }
+else if([handle isMemberOfClass:[DWGroupBox class]])
+{
+DWGroupBox *groupbox = thisbox->items[z].hwnd;
+[groupbox sizeToFit];
+}
 else if([handle isMemberOfClass:[DWRender class]])
 {
 _event_handler(handle, nil, 1);
 }
 else if([handle isMemberOfClass:[DWSplitBar class]] && size.width > 20 && size.height > 20)
 *       pad: Number of pixels to pad around the box.
 *       title: Text to be displayined in the group outline.
 */
 HWND API dw_groupbox_new(int type, int pad, char *title)
 {
+NSBox *groupbox = [[DWGroupBox alloc] init];
 DWBox *box = dw_box_new(type, pad);
-[box setFocusRingType:NSFocusRingTypeExterior];
+[groupbox setBorderType:NSBezelBorder];
-return box;
+[groupbox setTitle:[NSString stringWithUTF8String:title]];
+[groupbox setContentView:box];
+return groupbox;
 }
 #ifndef INCOMPLETE
 /*
 * Create a new scrollable Box to be packed.
 height = 1;
 if(hsize && !width)
 width = 1;
 /* Fill in the item data appropriately */
-if([ object isKindOfClass:[ DWBox class ] ])
+if([object isKindOfClass:[DWBox class]] || [object isMemberOfClass:[DWGroupBox class]])
 tmpitem[0].type = TYPEBOX;
 else
 tmpitem[0].type = TYPEITEM;
 tmpitem[0].hwnd = item;
 height = 1;
 if(hsize && !width)
 width = 1;
 /* Fill in the item data appropriately */
-if([ object isKindOfClass:[ DWBox class ] ])
+if([object isKindOfClass:[DWBox class]] || [object isMemberOfClass:[DWGroupBox class]])
 tmpitem[thisbox->count].type = TYPEBOX;
 else
 tmpitem[thisbox->count].type = TYPEITEM;
 tmpitem[thisbox->count].hwnd = item;
 void API dw_window_click_default(HWND handle, HWND next)
 {
 id object = handle;
 id control = next;
-if([object isMemberOfClass:[NSWindow class]] && [control isMemberOfClass:[DWButton class]])
+if([object isMemberOfClass:[NSWindow class]])
 {
-NSWindow *window = object;
+if([control isMemberOfClass:[DWButton class]])
+{
+NSWindow *window = object;
 [window setDefaultButtonCell:control];
+}
 }
 else
 {
 if([control isMemberOfClass:[DWSpinButton class]])
 {

Mercurial > dwindows

comparison mac/dw.m @ 792:fc6a626a96cc