dwindows: os2/dw.c comparison

comparison os2/dw.c @ 2039:7f2fb0c602f0

OS/2: Last set of const changes, this time for OS/2.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 17 Nov 2019 06:55:05 +0000
parents	c30f4354966e
children	ade83a05a7d8

comparison

equal deleted inserted replaced

-:133f29e9f488
+:7f2fb0c602f0
 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, ...)
 {
 va_list args;
 char outbuf[1025] = { 0 };
 int rc;
 * 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)
 {
 FONTDLG fd = { 0 };
 char *buf = calloc(1,100);
 int size = 9;
 /*
 * 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)
 {
 char *oldfont = DefaultFont;
 DefaultFont = strdup(fontname);
 free(oldfont);
 * 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)
 {
 HWND group = (HWND)dw_window_get_data(handle, "_dw_buddy");
 /* If we changed the font... */
-if(!WinSetPresParam(group ? group : handle, PP_FONTNAMESIZE, strlen(fontname)+1, fontname))
+if(!WinSetPresParam(group ? group : handle, PP_FONTNAMESIZE, strlen(fontname)+1, (void *)fontname))
 {
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 * Parameters:
 *       owner: The Owner's window handle or HWND_DESKTOP.
 *       title: The Window title.
 *       flStyle: Style flags, see the PM reference.
 */
-HWND API dw_window_new(HWND hwndOwner, char *title, ULONG flStyle)
+HWND API dw_window_new(HWND hwndOwner, const char *title, ULONG flStyle)
 {
 HWND hwndframe;
 Box *newbox = calloc(1, sizeof(Box));
 WindowData *blah = calloc(1, sizeof(WindowData));
 ULONG winStyle = 0L;
 * 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)
 {
 Box *newbox = calloc(1, sizeof(Box));
 newbox->pad = pad;
 newbox->type = type;
 newbox->count = 0;
 *       end: If TRUE memu is positioned at the end of the menu.
 *       check: If TRUE menu is "check"able.
 *       flags: Extended attributes to set on the menu.
 *       submenu: Handle to an existing menu to be a submenu or NULL.
 */
-HWND API dw_menu_append_item(HMENUI menux, char *title, ULONG id, ULONG flags, int end, int check, HMENUI submenu)
+HWND API dw_menu_append_item(HMENUI menux, const char *title, ULONG id, ULONG flags, int end, int check, HMENUI submenu)
 {
 MENUITEM miSubMenu;
 char buffer[30];
 int is_checked, is_disabled;
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(sizeof(WindowData), 1);
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_STATIC,
 (PSZ)text,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(sizeof(WindowData), 1);
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_STATIC,
 (PSZ)text,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(1, sizeof(WindowData));
 ENTRYFDATA efd = { sizeof(ENTRYFDATA), 32000, 0, 0 };
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(1, sizeof(WindowData));
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_ENTRYFIELD,
 (PSZ)text,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(1, sizeof(WindowData));
 HWND frame = dw_box_new(DW_HORZ, 0);
 HWND tmp = WinCreateWindow(frame,
 WC_COMBOBOX,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(1, sizeof(WindowData));
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_BUTTON,
 (PSZ)text,
 * 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 id)
+HWND API dw_bitmapbutton_new(const char *text, ULONG id)
 {
 char idbuf[256], *name = NULL;
 HWND tmp;
 WindowData *blah = calloc(1, sizeof(WindowData));
 HPOINTER icon = WinLoadPointer(HWND_DESKTOP, 0L, id);
 *       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(const char *text, unsigned long id, const char *filename)
 {
 WindowData *blah = calloc(1, sizeof(WindowData));
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_BUTTON,
 NULL,
 *       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(const char *text, unsigned long id, const char *data, int len)
 {
 FILE *fp;
 WindowData *blah = calloc(1, sizeof(WindowData));
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(sizeof(WindowData), 1);
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_SPINBUTTON,
 (PSZ)text,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(sizeof(WindowData), 1);
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_BUTTON,
 (PSZ)text,
 * 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(const char *text, ULONG id)
 {
 WindowData *blah = calloc(1, sizeof(WindowData));
 HWND tmp = WinCreateWindow(HWND_OBJECT,
 WC_BUTTON,
 (PSZ)text,
 *           (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 id, char *filename)
+void API dw_window_set_bitmap(HWND handle, unsigned long id, const char *filename)
 {
 HBITMAP hbm = 0;
 HPS     hps = 0;
 HDC     hdc = 0;
 HPOINTER icon = 0;
 *           (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 id, const char *data, int len)
 {
 HBITMAP hbm;
 HPS     hps;
 HDC hdc;
 unsigned long width, height;
 * Sets the text used for a given window.
 * Parameters:
 *       handle: Handle to the window.
 *       text: The text associsated with a given window.
 */
-void API dw_window_set_text(HWND handle, char *text)
+void API dw_window_set_text(HWND handle, const char *text)
 {
 HWND entryfield = (HWND)dw_window_get_data(handle, "_dw_buddy");
 WinSetWindowText(entryfield ? entryfield : handle, (PSZ)text);
 /* If we changed the text... */
 {
 * 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.
 */
-void API dw_window_set_tooltip(HWND handle, char *bubbletext)
+void API dw_window_set_tooltip(HWND handle, const char *bubbletext)
 {
 HWND buddy = (HWND)dw_window_get_data(handle, "_dw_comboentry");
 WindowData *blah = (WindowData *)WinQueryWindowPtr(buddy ? buddy : handle, QWP_USER);
-char *text = bubbletext ? bubbletext : "";
+const char *text = bubbletext ? bubbletext : "";
 buddy = (HWND)dw_window_get_data(handle, "_dw_buddy");
 if(blah)
 strncpy(blah->bubbletext, text, BUBBLE_HELP_MAX - 1);
 * 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)
 {
 WinSendMsg(handle, BKM_SETTABTEXT,
 MPFROMLONG(pageid),  MPFROMP(text));
 }
 * 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)
 {
 WinSendMsg(handle, BKM_SETSTATUSLINETEXT,
 MPFROMLONG(pageid),  MPFROMP(text));
 }
 * 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.
 */
-void API dw_listbox_append(HWND handle, char *text)
+void API dw_listbox_append(HWND handle, const char *text)
 {
 WinSendMsg(handle,
 LM_INSERTITEM,
 MPFROMSHORT(LIT_END),
 MPFROMP(text));
 * Parameters:
 *          handle: Handle to the listbox to be inserted into.
 *          text: Text to insert into listbox.
 *          pos: 0-based position to insert text
 */
-void API dw_listbox_insert(HWND handle, char *text, int pos)
+void API dw_listbox_insert(HWND handle, const char *text, int pos)
 {
 WinSendMsg(handle,
 LM_INSERTITEM,
 MPFROMSHORT(pos),
 MPFROMP(text));
 * Parameters:
 *          handle: Handle to the listbox to be queried.
 *          index: Index into the list to be queried.
 *          buffer: Buffer where text will be copied.
 */
-void API dw_listbox_set_text(HWND handle, unsigned int index, char *buffer)
+void API dw_listbox_set_text(HWND handle, unsigned int index, const char *buffer)
 {
 WinSendMsg(handle, LM_SETITEMTEXT, MPFROMSHORT(index), (MPARAM)buffer);
 }
 /*
 * Parameters:
 *          handle: Handle to the MLE to be queried.
 *          buffer: Text buffer to be imported.
 *          startpoint: Point to start entering text.
 */
-unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
+unsigned int API dw_mle_import(HWND handle, const char *buffer, int startpoint)
 {
 long point = startpoint < 0 ? 0 : startpoint;
 PBYTE mlebuf;
 /* Work around 64K limit */
 *          handle: Handle to the MLE to be cleared.
 *          text: Text to search for.
 *          point: Start point of search.
 *          flags: Search specific flags.
 */
-int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags)
+int API dw_mle_search(HWND handle, const char *text, int point, unsigned long flags)
 {
 MLE_SEARCHDATA msd;
 /* This code breaks with structure packing set to 1 (/Sp1 in VAC)
 * if this is needed we need to add a pragma here.
 */
 msd.cb = sizeof(msd);
-msd.pchFind = text;
+msd.pchFind = (char *)text;
 msd.pchReplace = NULL;
 msd.cchFind = strlen(text);
 msd.cchReplace = 0;
 msd.iptStart = point;
 msd.iptStop = -1;
 *          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_after(HWND handle, HTREEITEM item, char *title, HICN icon, HTREEITEM parent, void *itemdata)
+HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
 ULONG        cbExtra;
 PCNRITEM     pci;
 RECORDINSERT ri;
 *          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, (HTREEITEM)CMA_END, 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.
 */
-void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, HICN icon)
+void API dw_tree_item_change(HWND handle, HTREEITEM item, const char *title, HICN icon)
 {
 PCNRITEM pci = (PCNRITEM)item;
 if(!pci)
 return;
 * 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);
 }
 * 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 *file = alloca(strlen(filename) + 6);
 HPIXMAP src = alloca(sizeof(struct _hpixmap));
 HICN icon = 0;
 unsigned long defcol = DW_RGB(204, 204, 204);
 * 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)
 {
 HICN icon=0;
 char *file;
 FILE *fp;
 *          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_container_change_item(handle, 0, row, (void *)&icon);
 dw_container_change_item(handle, 1, row, (void *)&filename);
 }
 *          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_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon)
+void API dw_filesystem_set_file(HWND handle, void *pointer, int row, const char *filename, HICN icon)
 {
 dw_container_set_item(handle, pointer, 0, row, (void *)&icon);
 dw_container_set_item(handle, pointer, 1, row, (void *)&filename);
 }
 * 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.
 */
-void API dw_container_set_row_title(void *pointer, int row, char *title)
+void API dw_container_set_row_title(void *pointer, int row, const char *title)
 {
 ContainerInfo *ci = (ContainerInfo *)pointer;
 PRECORDCORE temp;
 int z, currentcount;
 CNRINFO cnr;
 * Parameters:
 *          handle: Handle to the container window (widget).
 *          row: Zero based row of data being set.
 *          title: String title of the item.
 */
-void API dw_container_change_row_title(HWND handle, int row, char *title)
+void API dw_container_change_row_title(HWND handle, int row, const char *title)
 {
 PRECORDCORE pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 int count = 0;
 while(pCore)
 * 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().
 */
-void API dw_container_cursor(HWND handle, char *text)
+void API dw_container_cursor(HWND handle, const char *text)
 {
 RECTL viewport, item;
 PRECORDCORE pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 while(pCore)
 * Deletes the item with the text speficied.
 * Parameters:
 *       handle: Handle to the window (widget).
 *       text:  Text usually returned by dw_container_query().
 */
-void API dw_container_delete_row(HWND handle, char *text)
+void API dw_container_delete_row(HWND handle, const char *text)
 {
 PRECORDCORE pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 while(pCore)
 {
 * 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)
 {
 /* Make sure we have our server */
 if(!hwndTrayServer)
 return;
 *       pixmap: Handle to the pixmap. (choose only one of these)
 *       x: X coordinate.
 *       y: Y coordinate.
 *       text: Text to be displayed.
 */
-void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
+void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
 {
 HPS hps;
 int z, height;
 RECTL rcl;
 char fontname[128];
 *       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)
 {
 HPS hps;
 POINTL aptl[TXTBOX_COUNT];
 if(handle)
 *                 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;
 char *file = alloca(strlen(filename) + 5);
 if ( !file || !(pixmap = calloc(1,sizeof(struct _hpixmap))) )
 *                 (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;
 char *file;
 FILE *fp;
 *                  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 && fontname && *fontname)
 {
 if(!pixmap->font)
 pixmap->font = WinCreateWindow(HWND_OBJECT, WC_FRAME, NULL, 0,0,0,1,1, NULLHANDLE, HWND_TOP,0, NULL, NULL);
-WinSetPresParam(pixmap->font, PP_FONTNAMESIZE, strlen(fontname)+1, fontname);
+WinSetPresParam(pixmap->font, PP_FONTNAMESIZE, strlen(fontname)+1, (void *)fontname);
 return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 * Parameters:
 *         name: Base name of the shared library.
 *         handle: Pointer to a module handle,
 *                 will be filled in with the handle.
 */
-int API dw_module_load(char *name, HMOD *handle)
+int API dw_module_load(const char *name, HMOD *handle)
 {
 char objnamebuf[300] = "";
 return DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)name, handle);
 }
 *         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 API dw_module_symbol(HMOD handle, char *name, void**func)
+int API dw_module_symbol(HMOD handle, const char *name, void**func)
 {
 return DosQueryProcAddr(handle, 0, (PSZ)name, (PFN*)func);
 }
 /* Frees the shared library previously opened.
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
-HEV API dw_named_event_new(char *name)
+HEV API dw_named_event_new(const char *name)
 {
 char *semname = malloc(strlen(name)+8);
 HEV ev = 0;
 if(!semname)
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
-HEV API dw_named_event_get(char *name)
+HEV API dw_named_event_get(const char *name)
 {
 char *semname = malloc(strlen(name)+8);
 HEV ev;
 if(!semname)
 *         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 API dw_named_memory_new(void **dest, int size, char *name)
+HSHM API dw_named_memory_new(void **dest, int size, const char *name)
 {
 char namebuf[1024];
 sprintf(namebuf, "\\sharemem\\%s", name);
 * 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 API dw_named_memory_get(void **dest, int size, char *name)
+HSHM API dw_named_memory_get(void **dest, int size, const char *name)
 {
 char namebuf[1024];
 size = size;
 sprintf(namebuf, "\\sharemem\\%s", name);
 /*
 * Sets the contents of the default clipboard to the supplied text.
 * Parameters:
 *       Text.
 */
-void API dw_clipboard_set_text( char *str, int len )
+void API dw_clipboard_set_text(const char *str, int len)
 {
 static PVOID shared;
-PVOID old = shared, src = str;
+PVOID old = shared, src = (PVOID)str;
 int buflen = len + 1;
 WinOpenClipbrd(dwhab); /* Open clipboard */
 WinEmptyClipbrd(dwhab); /* Empty clipboard */
 * 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)
 {
 if(flags == DW_DIRECTORY_OPEN)
 {
 HWND window, hbox, vbox, tree, button;
 DWDialog *dwwait;
 *       type: Either DW_EXEC_CON or DW_EXEC_GUI.
 *       params: An array of pointers to string arguements.
 * Returns:
 *       -1 on error.
 */
-int API dw_exec(char *program, int type, char **params)
+int API dw_exec(const char *program, int type, char **params)
 {
 type = type; /* keep compiler happy */
 #ifdef __EMX__
 return spawnvp(P_NOWAIT, program, (char * const *)params);
 #else
 /*
 * Loads a web browser pointed at the given URL.
 * Parameters:
 *       url: Uniform resource locator.
 */
-int API dw_browse(char *url)
+int API dw_browse(const char *url)
 {
 char *execargs[3], browser[1024], *olddir, *newurl = NULL;
 int len, ret;
 olddir = _getcwd(NULL, 1024);
 (PSZ)"DefaultBrowserExe", NULL, (PSZ)browser, 1024);
 len = strlen(browser) - strlen("explore.exe");
 execargs[0] = browser;
-execargs[1] = url;
+execargs[1] = (char *)url;
 execargs[2] = NULL;
 /* Special case for Web Explorer, it requires file:/// instead
 * of file:// so I am handling it here.
 */
 *       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)
 {
 handle = handle;
 string = string;
-return -1;
+return DW_ERROR_UNKNOWN;
 }
 /*
 * Render file or web page in the embedded HTML widget..
 * Parameters:
 *       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)
 {
 handle = handle;
 url = url;
-return -1;
+return DW_ERROR_UNKNOWN;
 }
 /*
 * Executes the javascript contained in "script" in the HTML window.
 * Parameters:
 *       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)
 {
 handle = handle;
 script = script;
 scriptdata = scriptdata;
 return DW_ERROR_UNKNOWN;
 *       drawfunc: The pointer to the function to be used as the callback.
 *       drawdata: User data to be passed to the handler function.
 * Returns:
 *       A handle to the print object or NULL on failure.
 */
-HPRINT API dw_print_new(char *jobname, unsigned long flags, unsigned int pages, void *drawfunc, void *drawdata)
+HPRINT API dw_print_new(const char *jobname, unsigned long flags, unsigned int pages, void *drawfunc, void *drawdata)
 {
 char printername[32], tmpbuf[20];
 HWND window, hbox, vbox, printerlist, button, text;
 DWDialog *dwwait;
 DWPrint *print;
 if(!drawfunc || !(print = calloc(1, sizeof(DWPrint))))
 return NULL;
 print->drawfunc = (int (API_FUNC)(HPRINT, HPIXMAP, int, void *))drawfunc;
 print->drawdata = drawdata;
-print->jobname = jobname ? jobname : "Dynamic Windows Print Job";
+print->jobname = strdup(jobname ? jobname : "Dynamic Windows Print Job");
 print->startpage = 1;
 print->endpage = pages;
 print->flags = flags;
 /* Check to see how much space we need for the printer list */
 }
 else
 DevEscape(p->hdc, DEVESC_ABORTDOC, 0, NULL, NULL, NULL);
 /* Free memory */
 dw_pixmap_destroy(pixmap);
+if(p->jobname)
+free(p->jobname);
 if(p->printername)
 free(p->printername);
 free(p);
 return result;
 }
 /* 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 API dw_window_set_data(HWND window, char *dataname, void *data)
+void API dw_window_set_data(HWND window, const char *dataname, void *data)
 {
 WindowData *blah = (WindowData *)WinQueryWindowPtr(window, QWP_USER);
 if(!blah)
 {
 * 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 * API dw_window_get_data(HWND window, char *dataname)
+void * API dw_window_get_data(HWND window, const char *dataname)
 {
 WindowData *blah = (WindowData *)WinQueryWindowPtr(window, QWP_USER);
 if(blah && blah->root && dataname)
 {
 *       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, id = 0;
 if(window && signame && sigfunc)
 {
 /*
 * 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)
 *       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)
 {
 #ifdef UNICODE
-return _UTF8toWide(utf8string);
+return _UTF8toWide((char *)utf8string);
 #else
 return NULL;
 #endif
 }
 *       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)
 {
 #ifdef UNICODE
-return _WideToUTF8(wstring);
+return _WideToUTF8((wchar_t *)wstring);
 #else
 return NULL;
 #endif
 }

Mercurial > dwindows

comparison os2/dw.c @ 2039:7f2fb0c602f0