dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2035:ea303d356419

Mac: Const changes to match the Windows changes.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 17 Nov 2019 04:07:39 +0000
parents	5ca399fb2d6f
children	a00e73284c97

comparison

equal deleted inserted replaced

-:89d62197124b
+:ea303d356419
 ".jpeg",
 ".tiff",
 ".bmp"
 };
-char *_dw_get_image_extension( char *filename )
+char *_dw_get_image_extension(const char *filename)
 {
 char *file = alloca(strlen(filename) + 6);
 int found_ext = 0,i;
 /* Try various extentions */
 SignalHandler *Root = NULL;
 /* Some internal prototypes */
 static void _do_resize(Box *thisbox, int x, int y);
 void _handle_resize_events(Box *thisbox);
-int _remove_userdata(UserData **root, char *varname, int all);
+int _remove_userdata(UserData **root, const char *varname, int all);
 int _dw_main_iteration(NSDate *date);
 NSGraphicsContext *_dw_draw_context(NSBitmapImageRep *image);
 typedef id (*DWIMP)(id, SEL, ...);
 /* Internal function to queue a window redraw */
 -(int)addRow:(NSArray *)input;
 -(int)addRows:(int)number;
 -(void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
 -(void)editCell:(id)input at:(int)row and:(int)col;
 -(void)removeRow:(int)row;
--(void)setRow:(int)row title:(void *)input;
+-(void)setRow:(int)row title:(const char *)input;
 -(void *)getRowTitle:(int)row;
 -(id)getRow:(int)row and:(int)col;
 -(int)cellType:(int)col;
 -(int)lastAddPoint;
 -(int)lastQueryPoint;
 }
 if(oldtitle)
 free(oldtitle);
 }
 }
--(void)setRow:(int)row title:(void *)input
+-(void)setRow:(int)row title:(const char *)input
 {
 if(titles && input)
 {
 void *oldtitle = [titles pointerAtIndex:row];
-void *newtitle = input ? (void *)strdup((char *)input) : NULL;
+void *newtitle = input ? (void *)strdup(input) : NULL;
 [titles replacePointerAtIndex:row withPointer:newtitle];
 if(oldtitle)
 free(oldtitle);
 }
 }
 Root = new;
 }
 }
 /* Finds the message number for a given signal name */
-ULONG _findsigmessage(char *signame)
+ULONG _findsigmessage(const char *signame)
 {
 int z;
 for(z=0;z<SIGNALMAX;z++)
 {
 * Displays a debug message on the console...
 * Parameters:
 *           format: printf style format string.
 *           ...: Additional variables for use in the format.
 */
-void API dw_debug(char *format, ...)
+void API dw_debug(const char *format, ...)
 {
 va_list args;
 char outbuf[1025] = {0};
 va_start(args, format);
 *           title: The title of the message box.
 *           flags: flags to indicate buttons and icon
 *           format: printf style format string.
 *           ...: Additional variables for use in the format.
 */
-int API dw_messagebox(char *title, int flags, char *format, ...)
+int API dw_messagebox(const char *title, int flags, const char *format, ...)
 {
 NSInteger iResponse;
 NSString *button1 = @"OK";
 NSString *button2 = nil;
 NSString *button3 = nil;
 * Returns:
 *       NULL on error. A malloced buffer containing
 *       the file path on success.
 *
 */
-char * API dw_file_browse(char *title, char *defpath, char *ext, int flags)
+char * API dw_file_browse(const char *title, const char *defpath, const char *ext, int flags)
 {
 char temp[PATH_MAX+1];
 char *file = NULL, *path = NULL;
 DW_LOCAL_POOL_IN;
 /*
 * Sets the contents of the default clipboard to the supplied text.
 * Parameters:
 *       Text.
 */
-void dw_clipboard_set_text( char *str, int len)
+void dw_clipboard_set_text(const char *str, int len)
 {
 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 SEL scc = NSSelectorFromString(@"clearContents");
 if([pasteboard respondsToSelector:scc])
 * Parameters:
 *       type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
 *       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)
+HWND API dw_groupbox_new(int type, int pad, const char *title)
 {
 NSBox *groupbox = [[DWGroupBox alloc] init];
 DWBox *thisbox = dw_box_new(type, pad);
 Box *box = [thisbox box];
 * 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 cid)
+HWND API dw_entryfield_password_new(const char *text, ULONG cid)
 {
 DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
 [entry setTag:cid];
 [[entry cell] setScrollable:YES];
 * Create a new bitmap button window (widget) to be packed.
 * Parameters:
 *       text: Bubble help text to be displayed.
 *       id: An ID of a bitmap in the resource file.
 */
-HWND API dw_bitmapbutton_new(char *text, ULONG resid)
+HWND API dw_bitmapbutton_new(const char *text, ULONG resid)
 {
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
 *       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 cid, char *filename)
+HWND API dw_bitmapbutton_new_from_file(const char *text, unsigned long cid, const char *filename)
 {
-char *ext = _dw_get_image_extension( filename );
+char *ext = _dw_get_image_extension(filename);
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
 if(!image && ext)
 *       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 cid, char *data, int len)
+HWND API dw_bitmapbutton_new_from_data(const char *text, unsigned long cid, const char *data, int len)
 {
 NSData *thisdata = [NSData dataWithBytes:data length:len];
 NSImage *image = [[NSImage alloc] initWithData:thisdata];
 DWButton *button = _button_new("", cid);
 if(image)
 * 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 cid)
+HWND API dw_spinbutton_new(const char *text, ULONG cid)
 {
 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
 NSStepper *stepper = [spinbutton stepper];
 NSTextField *textfield = [spinbutton textfield];
 [stepper setIncrement:1];
 * Appends the specified text to the listbox's (or combobox) entry list.
 * Parameters:
 *          handle: Handle to the listbox to be appended to.
 *          text: Text to append into listbox.
 */
-DW_FUNCTION_DEFINITION(dw_listbox_append, void, HWND handle, char *text)
+DW_FUNCTION_DEFINITION(dw_listbox_append, void, HWND handle, const char *text)
 DW_FUNCTION_ADD_PARAM2(handle, text)
 DW_FUNCTION_NO_RETURN(dw_listbox_append)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
 {
 DW_FUNCTION_INIT;
 * Parameters:
 *          handle: Handle to the listbox to be queried.
 *          index: Index into the list to be queried.
 *          buffer: Buffer where text will be copied.
 */
-DW_FUNCTION_DEFINITION(dw_listbox_set_text, void, HWND handle, unsigned int index, char *buffer)
+DW_FUNCTION_DEFINITION(dw_listbox_set_text, void, HWND handle, unsigned int index, const char *buffer)
 DW_FUNCTION_ADD_PARAM3(handle, index, buffer)
 DW_FUNCTION_NO_RETURN(dw_listbox_set_text)
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, unsigned int, buffer, char *)
 {
 DW_FUNCTION_INIT;
 * 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 cid)
+HWND API dw_status_text_new(const char *text, ULONG cid)
 {
 NSBox *border = [[NSBox alloc] init];
 NSTextField *textfield = dw_text_new(text, cid);
 [border setBorderType:NSGrooveBorder];
 * 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 cid)
+HWND API dw_text_new(const char *text, ULONG cid)
 {
 DWText *textfield = [[DWText alloc] init];
 [textfield setEditable:NO];
 [textfield setSelectable:NO];
 [textfield setBordered:NO];
 *       pixmap: Handle to the pixmap. (choose only one of these)
 *       x: X coordinate.
 *       y: Y coordinate.
 *       text: Text to be displayed.
 */
-DW_FUNCTION_DEFINITION(dw_draw_text, void, HWND handle, HPIXMAP pixmap, int x, int y, char *text)
+DW_FUNCTION_DEFINITION(dw_draw_text, void, HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
 DW_FUNCTION_ADD_PARAM5(handle, pixmap, x, y, text)
 DW_FUNCTION_NO_RETURN(dw_draw_text)
-DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, x, int, y, int, text, char *)
+DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, x, int, y, int, text, const char *)
 {
 DW_FUNCTION_INIT;
 DW_LOCAL_POOL_IN;
 id image = handle;
 NSString *nstr = [ NSString stringWithUTF8String:text ];
 *       pixmap: Handle to the pixmap. (choose only one of these)
 *       text: Text to be queried.
 *       width: Pointer to a variable to be filled in with the width.
 *       height Pointer to a variable to be filled in with the height.
 */
-void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
+void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, const char *text, int *width, int *height)
 {
 id object = handle;
 NSString *nstr;
 NSFont *font = nil;
 DW_LOCAL_POOL_IN;
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 *          parent: Parent handle or 0 if root.
 *          itemdata: Item specific data.
 */
-DW_FUNCTION_DEFINITION(dw_tree_insert_after, HTREEITEM, HWND handle, HTREEITEM item, char *title, HICN icon, HTREEITEM parent, void *itemdata)
+DW_FUNCTION_DEFINITION(dw_tree_insert_after, HTREEITEM, HWND handle, HTREEITEM item, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
 DW_FUNCTION_ADD_PARAM6(handle, item, title, icon, parent, itemdata)
 DW_FUNCTION_RETURN(dw_tree_insert_after, HTREEITEM)
 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, item, HTREEITEM, title, char *, icon, HICN, parent, HTREEITEM, itemdata, void *)
 {
 DW_FUNCTION_INIT;
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 *          parent: Parent handle or 0 if root.
 *          itemdata: Item specific data.
 */
-HTREEITEM API dw_tree_insert(HWND handle, char *title, HICN icon, HTREEITEM parent, void *itemdata)
+HTREEITEM API dw_tree_insert(HWND handle, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
 return dw_tree_insert_after(handle, NULL, title, icon, parent, itemdata);
 }
 /*
 *          handle: Handle to the tree containing the item.
 *          item: Handle of the item to be modified.
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 */
-DW_FUNCTION_DEFINITION(dw_tree_item_change, void, HWND handle, HTREEITEM item, char *title, HICN icon)
+DW_FUNCTION_DEFINITION(dw_tree_item_change, void, HWND handle, HTREEITEM item, const char *title, HICN icon)
 DW_FUNCTION_ADD_PARAM4(handle, item, title, icon)
 DW_FUNCTION_NO_RETURN(dw_tree_item_change)
 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, item, HTREEITEM, title, char *, icon, HICN)
 {
 DW_FUNCTION_INIT;
 * Configures the main filesystem columnn title for localization.
 * Parameters:
 *          handle: Handle to the container to be configured.
 *          title: The title to be displayed in the main column.
 */
-void API dw_filesystem_set_column_title(HWND handle, char *title)
+void API dw_filesystem_set_column_title(HWND handle, const char *title)
 {
 	char *newtitle = strdup(title ? title : "");
 	dw_window_set_data(handle, "_dw_coltitle", newtitle);
 }
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          column: Zero based column of data being set.
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
-void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon)
+void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
 {
 dw_filesystem_set_file(handle, NULL, row, filename, icon);
 }
 /*
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          column: Zero based column of data being set.
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
-DW_FUNCTION_DEFINITION(dw_filesystem_set_file, void, HWND handle, void *pointer, int row, char *filename, HICN icon)
+DW_FUNCTION_DEFINITION(dw_filesystem_set_file, void, HWND handle, void *pointer, int row, const char *filename, HICN icon)
 DW_FUNCTION_ADD_PARAM5(handle, pointer, row, filename, icon)
 DW_FUNCTION_NO_RETURN(dw_filesystem_set_file)
 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void *, row, int, filename, char *, icon, HICN)
 {
 DW_FUNCTION_INIT;
 * Parameters:
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          row: Zero based row of data being set.
 *          title: String title of the item.
 */
-DW_FUNCTION_DEFINITION(dw_container_set_row_title, void, void *pointer, int row, char *title)
+DW_FUNCTION_DEFINITION(dw_container_set_row_title, void, void *pointer, int row, const char *title)
 DW_FUNCTION_ADD_PARAM3(pointer, row, title)
 DW_FUNCTION_NO_RETURN(dw_container_set_row_title)
 DW_FUNCTION_RESTORE_PARAM3(pointer, void *, row, int, title, char *)
 {
 DW_FUNCTION_INIT;
 * Parameters:
 *          handle: Handle to window (widget) of container.
 *          row: Zero based row of data being set.
 *          title: String title of the item.
 */
-DW_FUNCTION_DEFINITION(dw_container_change_row_title, void, HWND handle, int row, char *title)
+DW_FUNCTION_DEFINITION(dw_container_change_row_title, void, HWND handle, int row, const char *title)
 DW_FUNCTION_ADD_PARAM3(handle, row, title)
 DW_FUNCTION_NO_RETURN(dw_container_change_row_title)
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, title, char *)
 {
 DW_FUNCTION_INIT;
 * Cursors the item with the text speficied, and scrolls to that item.
 * Parameters:
 *       handle: Handle to the window (widget) to be queried.
 *       text:  Text usually returned by dw_container_query().
 */
-DW_FUNCTION_DEFINITION(dw_container_cursor, void, HWND handle, char *text)
+DW_FUNCTION_DEFINITION(dw_container_cursor, void, HWND handle, const char *text)
 DW_FUNCTION_ADD_PARAM2(handle, text)
 DW_FUNCTION_NO_RETURN(dw_container_cursor)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
 {
 DW_FUNCTION_INIT;
 * Deletes the item with the text speficied.
 * Parameters:
 *       handle: Handle to the window (widget).
 *       text:  Text usually returned by dw_container_query().
 */
-DW_FUNCTION_DEFINITION(dw_container_delete_row, void, HWND handle, char *text)
+DW_FUNCTION_DEFINITION(dw_container_delete_row, void, HWND handle, const char *text)
 DW_FUNCTION_ADD_PARAM2(handle, text)
 DW_FUNCTION_NO_RETURN(dw_container_delete_row)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
 {
 DW_FUNCTION_INIT;
 * Parameters:
 *       handle: Window handle that will handle taskbar icon messages.
 *       icon: Icon handle to display in the taskbar.
 *       bubbletext: Text to show when the mouse is above the icon.
 */
-void API dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
+void API dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext)
 {
 #ifdef BUILDING_FOR_YOSEMITE
 NSStatusItem *item = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength] retain];
 NSStatusBarButton *button = [item button];
 NSImage *image = icon;
 * Parameters:
 *       filename: Name of the file, omit extention to have
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
-HICN API dw_icon_load_from_file(char *filename)
+HICN API dw_icon_load_from_file(const char *filename)
 {
 char *ext = _dw_get_image_extension( filename );
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
 * Parameters:
 *       filename: Name of the file, omit extention to have
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
-HICN API dw_icon_load_from_data(char *data, int len)
+HICN API dw_icon_load_from_data(const char *data, int len)
 {
 NSData *thisdata = [NSData dataWithBytes:data length:len];
 NSImage *image = [[NSImage alloc] initWithData:thisdata];
 _icon_resize(image);
 return image;
 }
 return retval;
 }
 /* Internal function to convert fontname to NSFont */
-NSFont *_dw_font_by_name(char *fontname)
+NSFont *_dw_font_by_name(const char *fontname)
 {
 char *fontcopy = strdup(fontname);
 char *name = strchr(fontcopy, '.');
 NSFont *font = nil;
 *                 DW pick the appropriate file extension.
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
-HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
+HPIXMAP API dw_pixmap_new_from_file(HWND handle, const char *filename)
 {
 HPIXMAP pixmap;
 DW_LOCAL_POOL_IN;
 char *ext = _dw_get_image_extension( filename );
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 *       le: length of data
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
-HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
+HPIXMAP API dw_pixmap_new_from_data(HWND handle, const char *data, int len)
 {
 HPIXMAP pixmap;
 DW_LOCAL_POOL_IN;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 *                  passed to the application via a callback.
 *          fontname: Name and size of the font in the form "size.fontname"
 * Returns:
 *       DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
 */
-int API dw_pixmap_set_font(HPIXMAP pixmap, char *fontname)
+int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname)
 {
 if(pixmap)
 {
 NSFont *font = _dw_font_by_name(fontname);
 *       string: String buffer containt HTML code to
 *               be rendered.
 * Returns:
 *       0 on success.
 */
-int API dw_html_raw(HWND handle, char *string)
+int API dw_html_raw(HWND handle, const char *string)
 {
 DWWebView *html = handle;
 #if WK_API_ENABLED
 [html loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
 #else
 *       url: Universal Resource Locator of the web or
 *               file object to be rendered.
 * Returns:
 *       0 on success.
 */
-int API dw_html_url(HWND handle, char *url)
+int API dw_html_url(HWND handle, const char *url)
 {
 DWWebView *html = handle;
 #if WK_API_ENABLED
 [html loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
 #else
 *       scriptdata: Data passed to the signal handler.
 * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata.
 * Returns:
 *       DW_ERROR_NONE (0) on success.
 */
-int dw_html_javascript_run(HWND handle, char *script, void *scriptdata)
+int dw_html_javascript_run(HWND handle, const char *script, void *scriptdata)
 {
 DWWebView *html = handle;
 DW_LOCAL_POOL_IN;
 #if WK_API_ENABLED
 * Parameters:
 *          handle: Notebook handle.
 *          pageid: Page ID of the tab to set.
 *          text: Pointer to the text to set.
 */
-void API dw_notebook_page_set_text(HWND handle, ULONG pageid, char *text)
+void API dw_notebook_page_set_text(HWND handle, ULONG pageid, const char *text)
 {
 DWNotebook *notebook = handle;
 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
 if(notepage != nil)
 * Parameters:
 *          handle: Notebook handle.
 *          pageid: Page ID of the tab to set.
 *          text: Pointer to the text to set.
 */
-void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, char *text)
+void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, const char *text)
 {
 /* Note supported here... do nothing */
 }
 /*
 * Parameters:
 *       owner: The Owner's window handle or HWND_DESKTOP.
 *       title: The Window title.
 *       flStyle: Style flags, see the PM reference.
 */
-DW_FUNCTION_DEFINITION(dw_window_new, HWND, HWND hwndOwner, char *title, ULONG flStyle)
+DW_FUNCTION_DEFINITION(dw_window_new, HWND, HWND hwndOwner, const char *title, ULONG flStyle)
 DW_FUNCTION_ADD_PARAM3(hwndOwner, title, flStyle)
 DW_FUNCTION_RETURN(dw_window_new, HWND)
 DW_FUNCTION_RESTORE_PARAM3(hwndOwner, HWND, title, char *, flStyle, ULONG)
 {
 DW_FUNCTION_INIT;
 * Parameters:
 *       currfont: current font
 * Returns:
 *       A malloced buffer with the selected font or NULL on error.
 */
-char * API dw_font_choose(char *currfont)
+char * API dw_font_choose(const char *currfont)
 {
 /* Create the Color Chooser Dialog class. */
 static DWFontChoose *fontDlg = nil;
 static NSFontManager *fontManager = nil;
 DWDialog *dialog;
 * Sets the font used by a specified window (widget) handle.
 * Parameters:
 *          handle: The window (widget) handle.
 *          fontname: Name and size of the font in the form "size.fontname"
 */
-int API dw_window_set_font(HWND handle, char *fontname)
+int API dw_window_set_font(HWND handle, const char *fontname)
 {
 NSFont *font = _dw_font_by_name(fontname);
 if(font)
 {
 * Sets the text used for a given window.
 * Parameters:
 *       handle: Handle to the window.
 *       text: The text associsated with a given window.
 */
-DW_FUNCTION_DEFINITION(dw_window_set_text, void, HWND handle, char *text)
+DW_FUNCTION_DEFINITION(dw_window_set_text, void, HWND handle, const char *text)
 DW_FUNCTION_ADD_PARAM2(handle, text)
 DW_FUNCTION_NO_RETURN(dw_window_set_text)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
 {
 DW_FUNCTION_INIT;
 * Sets the text used for a given window's floating bubble help.
 * Parameters:
 *       handle: Handle to the window (widget).
 *       bubbletext: The text in the floating bubble tooltip.
 */
-DW_FUNCTION_DEFINITION(dw_window_set_tooltip, void, HWND handle, char *bubbletext)
+DW_FUNCTION_DEFINITION(dw_window_set_tooltip, void, HWND handle, const char *bubbletext)
 DW_FUNCTION_ADD_PARAM2(handle, bubbletext)
 DW_FUNCTION_NO_RETURN(dw_window_set_tooltip)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, bubbletext, char *)
 {
 DW_FUNCTION_INIT;
 *           (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 cid, char *data, int len)
+void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, const char *data, int len)
 {
 id object = handle;
 if([ object isKindOfClass:[ NSImageView class ] ] || [ object isKindOfClass:[ NSButton class ]])
 {
 *           (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(HWND handle, unsigned long resid, char *filename)
+void API dw_window_set_bitmap(HWND handle, unsigned long resid, const char *filename)
 {
 id object = handle;
 DW_LOCAL_POOL_IN;
 if([ object isKindOfClass:[ NSImageView class ] ] || [ object isKindOfClass:[ NSButton class ]])
 /* Functions for managing the user data lists that are associated with
 * a given window handle.  Used in dw_window_set_data() and
 * dw_window_get_data().
 */
-UserData *_find_userdata(UserData **root, char *varname)
+UserData *_find_userdata(UserData **root, const char *varname)
 {
 UserData *tmp = *root;
 while(tmp)
 {
 tmp = tmp->next;
 }
 return NULL;
 }
-int _new_userdata(UserData **root, char *varname, void *data)
+int _new_userdata(UserData **root, const char *varname, void *data)
 {
 UserData *new = _find_userdata(root, varname);
 if(new)
 {
 }
 }
 return FALSE;
 }
-int _remove_userdata(UserData **root, char *varname, int all)
+int _remove_userdata(UserData **root, const char *varname, int all)
 {
 UserData *prev = NULL, *tmp = *root;
 while(tmp)
 {
 * Parameters:
 *       window: Window handle of signal to be called back.
 *       dataname: A string pointer identifying which signal to be hooked.
 *       data: User data to be passed to the handler function.
 */
-void dw_window_set_data(HWND window, char *dataname, void *data)
+void dw_window_set_data(HWND window, const char *dataname, void *data)
 {
 id object = window;
 if([object isMemberOfClass:[DWWindow class]])
 {
 NSWindow *win = window;
 * Parameters:
 *       window: Window handle of signal to be called back.
 *       dataname: A string pointer identifying which signal to be hooked.
 *       data: User data to be passed to the handler function.
 */
-void *dw_window_get_data(HWND window, char *dataname)
+void *dw_window_get_data(HWND window, const char *dataname)
 {
 id object = window;
 if([object isMemberOfClass:[DWWindow class]])
 {
 NSWindow *win = window;
 *       window: Window handle of signal to be called back.
 *       signame: A string pointer identifying which signal to be hooked.
 *       sigfunc: The pointer to the function to be used as the callback.
 *       data: User data to be passed to the handler function.
 */
-void API dw_signal_connect(HWND window, char *signame, void *sigfunc, void *data)
+void API dw_signal_connect(HWND window, const char *signame, void *sigfunc, void *data)
 {
 dw_signal_connect_data(window, signame, sigfunc, NULL, data);
 }
 /*
 *       signame: A string pointer identifying which signal to be hooked.
 *       sigfunc: The pointer to the function to be used as the callback.
 *       discfunc: The pointer to the function called when this handler is removed.
 *       data: User data to be passed to the handler function.
 */
-void API dw_signal_connect_data(HWND window, char *signame, void *sigfunc, void *discfunc, void *data)
+void API dw_signal_connect_data(HWND window, const char *signame, void *sigfunc, void *discfunc, void *data)
 {
 ULONG message = 0, msgid = 0;
 /* Handle special case of application delete signal */
 if(!window && signame && strcmp(signame, DW_SIGNAL_DELETE) == 0)
 /*
 * Removes callbacks for a given window with given name.
 * Parameters:
 *       window: Window handle of callback to be removed.
 */
-void API dw_signal_disconnect_by_name(HWND window, char *signame)
+void API dw_signal_disconnect_by_name(HWND window, const char *signame)
 {
 SignalHandler *prev = NULL, *tmp = Root;
 ULONG message;
 if(!window || !signame || (message = _findsigmessage(signame)) == 0)
 *         handle: Module handle returned by dw_module_load()
 *         name: Name of the symbol you want the address of.
 *         func: A pointer to a function pointer, to obtain
 *               the address.
 */
-int dw_module_symbol(HMOD handle, char *name, void**func)
+int dw_module_symbol(HMOD handle, const char *name, void**func)
 {
 if(!func || !name)
 return   -1;
 if(strlen(name) == 0)
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
-HEV dw_named_event_new(char *name)
+HEV dw_named_event_new(const char *name)
 {
 struct sockaddr_un un;
 int ev, *tmpsock = (int *)malloc(sizeof(int)*2);
 HEV eve;
 DWTID dwthread;
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
-HEV dw_named_event_get(char *name)
+HEV dw_named_event_get(const char *name)
 {
 struct sockaddr_un un;
 HEV eve;
 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
 if(ev < 0)
 /*
 * Sets the default font used on text based widgets.
 * Parameters:
 *           fontname: Font name in Dynamic Windows format.
 */
-void API dw_font_set_default(char *fontname)
+void API dw_font_set_default(const char *fontname)
 {
 NSFont *oldfont = DWDefaultFont;
 DWDefaultFont = _dw_font_by_name(fontname);
 [DWDefaultFont retain];
 [oldfont release];
 *         handle: A pointer to receive a SHM identifier.
 *         dest: A pointer to a pointer to receive the memory address.
 *         size: Size in bytes of the shared memory region to allocate.
 *         name: A string pointer to a unique memory name.
 */
-HSHM dw_named_memory_new(void **dest, int size, char *name)
+HSHM dw_named_memory_new(void **dest, int size, const char *name)
 {
 char namebuf[1025] = {0};
 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 * Parameters:
 *         dest: A pointer to a pointer to receive the memory address.
 *         size: Size in bytes of the shared memory region to requested.
 *         name: A string pointer to a unique memory name.
 */
-HSHM dw_named_memory_get(void **dest, int size, char *name)
+HSHM dw_named_memory_get(void **dest, int size, const char *name)
 {
 char namebuf[1025];
 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 *       type: Either DW_EXEC_CON or DW_EXEC_GUI.
 *       params: An array of pointers to string arguements.
 * Returns:
 *       -1 on error.
 */
-int dw_exec(char *program, int type, char **params)
+int dw_exec(const char *program, int type, char **params)
 {
 int ret = -1;
 if(type == DW_EXEC_GUI)
 {
 *       utf8string: UTF-8 encoded source string.
 * Returns:
 *       Wide string that needs to be freed with dw_free()
 *       or NULL on failure.
 */
-wchar_t * API dw_utf8_to_wchar(char *utf8string)
+wchar_t * API dw_utf8_to_wchar(const char *utf8string)
 {
 size_t buflen = strlen(utf8string) + 1;
 wchar_t *temp = malloc(buflen * sizeof(wchar_t));
 if(temp)
 mbstowcs(temp, utf8string, buflen);
 *       wstring: Wide source string.
 * Returns:
 *       UTF-8 encoded string that needs to be freed with dw_free()
 *       or NULL on failure.
 */
-char * API dw_wchar_to_utf8(wchar_t *wstring)
+char * API dw_wchar_to_utf8(const wchar_t *wstring)
 {
 size_t bufflen = 8 * wcslen(wstring) + 1;
 char *temp = malloc(bufflen);
 if(temp)
 wcstombs(temp, wstring, bufflen);

Mercurial > dwindows

comparison mac/dw.m @ 2035:ea303d356419