dwindows: mac/dw.m comparison

comparison mac/dw.m @ 685:314a12dccd20

Cleanups for conflicts with "id" which is a keyword in Objective-C. Also attempt to make sure the id tag is set for all controls that accept it.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 03 Mar 2011 13:48:07 +0000
parents	014b02436c1f
children	218d676baf7f

comparison

equal deleted inserted replaced

-:014b02436c1f
+:314a12dccd20
 	/* Free the old data */
 if(thisbox->count)
 free(thisitem);
 }
-HWND _button_new(char *text, ULONG id)
+HWND _button_new(char *text, ULONG cid)
 {
 	DWButton *button = [[DWButton alloc] init];
 	if(text && *text)
 	{
 		[button setTitle:[ NSString stringWithUTF8String:text ]];
 	}
 	[button setTarget:button];
 	[button setAction:@selector(buttonClicked:)];
-	[button setTag:id];
+	[button setTag:cid];
 	[button setButtonType:NSMomentaryPushInButton];
 	[button setBezelStyle:NSThickerSquareBezelStyle];
 return button;
 }
 * Create a new button window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_button_new(char *text, ULONG id)
+HWND API dw_button_new(char *text, ULONG cid)
 {
-DWButton *button = _button_new(text, id);
+DWButton *button = _button_new(text, cid);
 [button setButtonType:NSMomentaryPushInButton];
 [button setBezelStyle:NSRoundedBezelStyle];
 [button setImagePosition:NSNoImage];
 [button setAlignment:NSCenterTextAlignment];
 [[button cell] setControlTint:NSBlueControlTint];
 * Create a new Entryfield window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_entryfield_new(char *text, ULONG id)
+HWND API dw_entryfield_new(char *text, ULONG cid)
 {
 	DWEntryField *entry = [[DWEntryField alloc] init];
 	[entry setStringValue:[ NSString stringWithUTF8String:text ]];
-	[entry setTag:id];
+	[entry setTag:cid];
 	return entry;
 }
 /*
 * Create a new Entryfield (password) window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_entryfield_password_new(char *text, ULONG id)
+HWND API dw_entryfield_password_new(char *text, ULONG cid)
 {
 	DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
 	[entry setStringValue:[ NSString stringWithUTF8String:text ]];
-	[entry setTag:id];
+	[entry setTag:cid];
 	return entry;
 }
 /*
 * Sets the entryfield character limit.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 *       filename: Name of the file, omit extention to have
 *                 DW pick the appropriate file extension.
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 */
-HWND API dw_bitmapbutton_new_from_file(char *text, unsigned long id, char *filename)
+HWND API dw_bitmapbutton_new_from_file(char *text, unsigned long cid, char *filename)
 {
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
 if(!image)
 {
 nstr = [nstr stringByAppendingString:@".png"];
 image = [[NSImage alloc] initWithContentsOfFile:nstr];
 }
 [nstr release];
-	DWButton *button = _button_new("", id);
+	DWButton *button = _button_new("", cid);
 	[button setImage:image];
 	return button;
 }
 /*
 *       id: An ID to be used with dw_window_from_id() or 0L.
 *       data: The contents of the image
 *            (BMP or ICO on OS/2 or Windows, XPM on Unix)
 *       len: length of str
 */
-HWND API dw_bitmapbutton_new_from_data(char *text, unsigned long id, char *data, int len)
+HWND API dw_bitmapbutton_new_from_data(char *text, unsigned long cid, char *data, int len)
 {
 	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
 	NSImage *image = [[NSImage alloc] initWithData:thisdata];
-	DWButton *button = _button_new("", id);
+	DWButton *button = _button_new("", cid);
 	[button setImage:image];
 	return button;
 }
 /*
 * Create a new spinbutton window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_spinbutton_new(char *text, ULONG id)
+HWND API dw_spinbutton_new(char *text, ULONG cid)
 {
 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
 	NSStepper *stepper = [spinbutton stepper];
 [stepper setIncrement:1];
+[stepper setTag:cid];
 return spinbutton;
 }
 /*
 * Sets the spinbutton value.
 * Create a new radiobutton window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_radiobutton_new(char *text, ULONG id)
+HWND API dw_radiobutton_new(char *text, ULONG cid)
 {
-	DWButton *button = _button_new(text, id);
+	DWButton *button = _button_new(text, cid);
 	[button setButtonType:NSRadioButton];
 	return button;
 }
 /*
 * Parameters:
 *       vertical: TRUE or FALSE if slider is vertical.
 *       increments: Number of increments available.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_slider_new(int vertical, int increments, ULONG id)
+HWND API dw_slider_new(int vertical, int increments, ULONG cid)
 {
 	DWSlider *slider = [[DWSlider alloc] init];
 	[slider setMaxValue:(double)increments];
 	[slider setMinValue:0];
+[slider setTag:cid];
 	return slider;
 }
 /*
 * Returns the position of the slider.
 * Parameters:
 *       vertical: TRUE or FALSE if scrollbar is vertical.
 *       increments: Number of increments available.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_scrollbar_new(int vertical, ULONG id)
+HWND API dw_scrollbar_new(int vertical, ULONG cid)
 {
 	DWScrollbar *scrollbar = [[DWScrollbar alloc] init];
+[scrollbar setArrowsPosition: NSScrollerArrowsDefaultSetting];
 	[scrollbar setTarget:scrollbar];
 	[scrollbar setAction:@selector(changed:)];
 	[scrollbar setRange:0.0 andVisible:0.0];
 	[scrollbar setKnobProportion:1.0];
+[scrollbar setTag:cid];
 	return scrollbar;
 }
 /*
 * Returns the position of the scrollbar.
 /*
 * Create a new percent bar window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_percent_new(ULONG id)
+HWND API dw_percent_new(ULONG cid)
 {
 	DWPercent *percent = [[DWPercent alloc] init];
 	[percent setBezeled:YES];
 	[percent setMaxValue:100];
 	[percent setMinValue:0];
-	/*[percent setTag:id]; Why doesn't this work? */
+	/*[percent setTag:cid]; Why doesn't this work? */
 	return percent;
 }
 /*
 * Sets the percent bar position.
 * Create a new checkbox window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_checkbox_new(char *text, ULONG id)
+HWND API dw_checkbox_new(char *text, ULONG cid)
 {
-	DWButton *button = _button_new(text, id);
+	DWButton *button = _button_new(text, cid);
 	[button setButtonType:NSSwitchButton];
 	[button setBezelStyle:NSRegularSquareBezelStyle];
 	return button;
 }
 	}
 }
 /* Common code for containers and listboxes */
-HWND _cont_new(ULONG id, int multi)
+HWND _cont_new(ULONG cid, int multi)
 {
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
 	DWContainer *cont = [[DWContainer alloc] init];
 [cont setScrollview:scrollview];
 	{
 		[cont setAllowsMultipleSelection:NO];
 	}
 	[cont setDataSource:cont];
 [scrollview setDocumentView:cont];
+[cont setTag:cid];
 	return cont;
 }
 /*
 * Create a new listbox window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 *       multi: Multiple select TRUE or FALSE.
 */
-HWND API dw_listbox_new(ULONG id, int multi)
+HWND API dw_listbox_new(ULONG cid, int multi)
 {
-	DWContainer *cont = _cont_new(id, multi);
+	DWContainer *cont = _cont_new(cid, multi);
 	[cont setHeaderView:nil];
 	int type = DW_CFA_STRING;
 	[cont setup];
 	NSTableColumn *column = [[NSTableColumn alloc] init];
 	[cont addTableColumn:column];
 * Create a new Combobox window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the combpbox widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_combobox_new(char *text, ULONG id)
+HWND API dw_combobox_new(char *text, ULONG cid)
 {
 	DWComboBox *combo = [[DWComboBox alloc] init];
+[combo setTag:cid];
 	return combo;
 }
 /*
 * Create a new Multiline Editbox window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_mle_new(ULONG id)
+HWND API dw_mle_new(ULONG cid)
 {
 	DWMLE *mle = [[DWMLE alloc] init];
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
 //[mle setScrollview:scrollview];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 [scrollview setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
 [scrollview setDocumentView:mle];
 [mle setAutoresizingMask:NSViewWidthSizable];
+/* [mle setTag:cid]; Why doesn't this work? */
 	return scrollview;
 }
 /*
 * Adds text to an MLE box and returns the current point.
 * Create a new status text window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_status_text_new(char *text, ULONG id)
+HWND API dw_status_text_new(char *text, ULONG cid)
 {
-	NSTextField *textfield = dw_text_new(text, id);
+	NSTextField *textfield = dw_text_new(text, cid);
 	[textfield setBordered:YES];
 	[textfield setBezeled:YES];
 	[textfield setBezelStyle:NSTextFieldSquareBezel];
 [textfield setBackgroundColor:[NSColor colorWithDeviceRed:1 green:1 blue:1 alpha: 0]];
 [textfield setDrawsBackground:NO];
 * Create a new static text window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_text_new(char *text, ULONG id)
+HWND API dw_text_new(char *text, ULONG cid)
 {
 	NSTextField *textfield = [[NSTextField alloc] init];
 	[textfield setEditable:NO];
 	[textfield setSelectable:NO];
 	[textfield setBordered:NO];
 	[textfield setDrawsBackground:NO];
 	[textfield setStringValue:[ NSString stringWithUTF8String:text ]];
+[textfield setTag:cid];
 	return textfield;
 }
 /*
 * Creates a rendering context widget (window) to be packed.
 * Parameters:
 *       id: An id to be used with dw_window_from_id.
 * Returns:
 *       A handle to the widget or NULL on failure.
 */
-HWND API dw_render_new(unsigned long id)
+HWND API dw_render_new(unsigned long cid)
 {
 	DWRender *render = [[DWRender alloc] init];
+/* [render setTag:cid]; Why doesn't this work? */
 	return render;
 }
 /* Sets the current foreground drawing color.
 * Parameters:
 * Create a tree object to be packed.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
-HWND API dw_tree_new(ULONG id)
+HWND API dw_tree_new(ULONG cid)
 {
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
 	DWTree *tree = [[DWTree alloc] init];
 [tree setScrollview:scrollview];
 [tree setAllowsMultipleSelection:NO];
 	[tree setDataSource:tree];
 [scrollview setDocumentView:tree];
 [tree setHeaderView:nil];
+[tree setTag:cid];
 return tree;
 }
 /*
 * Inserts an item into a tree window (widget) after another item.
 * Create a container object to be packed.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
-HWND API dw_container_new(ULONG id, int multi)
+HWND API dw_container_new(ULONG cid, int multi)
 {
-	DWContainer *cont = _cont_new(id, multi);
+	DWContainer *cont = _cont_new(cid, multi);
 NSScrollView *scrollview = [cont scrollview];
 [scrollview setHasHorizontalScroller:YES];
 	NSTableHeaderView *header = [[NSTableHeaderView alloc] init];
 	[cont setHeaderView:header];
 	return cont;
 /*
 * Create a new MDI Frame to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id or 0L.
 */
-HWND API dw_mdi_new(unsigned long id)
+HWND API dw_mdi_new(unsigned long cid)
 {
 /* There isn't anything like quite like MDI on MacOS...
 * However we will make floating windows that hide
 * when the application is deactivated to simulate
 * similar behavior.
 */
 DWMDI *mdi = [[DWMDI alloc] init];
+/* [mdi setTag:cid]; Why doesn't this work? */
 return mdi;
 }
 /*
 * Creates a splitbar window (widget) with given parameters.
 *       topleft: Handle to the window to be top or left.
 *       bottomright:  Handle to the window to be bottom or right.
 * Returns:
 *       A handle to a splitbar window or NULL on failure.
 */
-HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id)
+HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long cid)
 {
 	DWSplitBar *split = [[DWSplitBar alloc] init];
 HWND tmpbox = dw_box_new(DW_VERT, 0);
 [split setDelegate:split];
 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
 	}
 else
 {
 [split setVertical:YES];
 }
+/* [split setTag:cid]; Why doesn't this work? */
 	return split;
 }
 /*
 * Sets the position of a splitbar (pecentage).
 /*
 * Create a bitmap object to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_bitmap_new(ULONG id)
+HWND API dw_bitmap_new(ULONG cid)
 {
 	NSImageView *bitmap = [[NSImageView alloc] init];
 	[bitmap setImageFrameStyle:NSImageFrameNone];
 	[bitmap setEditable:NO];
+[bitmap setTag:cid];
 	return bitmap;
 }
 /*
 * Creates a pixmap with given parameters.
 * Not available under OS/2, eCS
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_calendar_new(ULONG id)
+HWND API dw_calendar_new(ULONG cid)
 {
 	DWCalendar *calendar = [[DWCalendar alloc] init];
 	/*[calendar setDatePickerMode:UIDatePickerModeDate];*/
+[calendar setTag:cid];
 	return calendar;
 }
 /*
 * Sets the current date of a calendar
 * Not available under OS/2, eCS
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
-HWND API dw_html_new(unsigned long id)
+HWND API dw_html_new(unsigned long cid)
 {
 	WebView *web = [[WebView alloc] init];
+/* [web setTag:cid]; Why doesn't this work? */
 	return web;
 }
 /*
 * Returns the current X and Y coordinates of the mouse pointer.
 * Create a menu object to be popped up.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
-HMENUI API dw_menu_new(ULONG id)
+HMENUI API dw_menu_new(ULONG cid)
 {
 	NSMenu *menu = [[[NSMenu alloc] init] autorelease];
 	[menu setAutoenablesItems:NO];
+/* [menu setTag:cid]; Why doesn't this work? */
 	return menu;
 }
 /*
 * Create a menubar on a window.
 * Create a notebook object to be packed.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
-HWND API dw_notebook_new(ULONG id, int top)
+HWND API dw_notebook_new(ULONG cid, int top)
 {
 	DWNotebook *notebook = [[DWNotebook alloc] init];
 	[notebook setDelegate:notebook];
+/* [notebook setTag:cid]; Why doesn't this work? */
 	return notebook;
 }
 /*
 * Adds a new page to specified notebook.
 *           (pass 0 if you use the filename param)
 *       filename: a path to a file (Bitmap on OS/2 or
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
 */
-void API dw_window_set_bitmap_from_data(HWND handle, unsigned long id, char *data, int len)
+void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, char *data, int len)
 {
 	NSObject *object = handle;
 	if([ object isKindOfClass:[ NSImageView class ] ])
 	{
 		NSImageView *iv = handle;
 * Gets the child window handle with specified ID.
 * Parameters:
 *       handle: Handle to the parent window.
 *       id: Integer ID of the child.
 */
-HWND API dw_window_from_id(HWND handle, int id)
+HWND API dw_window_from_id(HWND handle, int cid)
 {
 	NSObject *object = handle;
 	NSView *view = handle;
 	if([ object isKindOfClass:[ NSWindow class ] ])
 	{
 		NSWindow *window = handle;
 		view = [window contentView];
 	}
-	return [view viewWithTag:id];
+	return [view viewWithTag:cid];
 }
 /*
 * Minimizes or Iconifies a top-level window.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 685:314a12dccd20