dwindows: win/dw.c comparison

comparison win/dw.c @ 2034:89d62197124b

Visual C in C++ mode complains about missing const declarations in paramaters. So adding const to any string parameters which are not written to. Probably going to require changes to the other platforms due to header changes.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 17 Nov 2019 03:13:37 +0000
parents	28809bf17957
children	ea303d356419

comparison

equal deleted inserted replaced

-:d81d2ea806c6
+:89d62197124b
 #endif
 LRESULT CALLBACK _colorwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2);
 void _resize_notebook_page(HWND handle, int pageid);
 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y);
 int _lookup_icon(HWND handle, HICON hicon, int type);
-HFONT _acquire_font(HWND handle, char *fontname);
+HFONT _acquire_font(HWND handle, const char *fontname);
 void _click_default(HWND handle);
 void _do_resize(Box *thisbox, int x, int y);
 /* Internal function to queue a window redraw */
 void _dw_redraw(HWND window, int skip)
 #endif
 #ifdef UNICODE
 /* Macro and internal function to convert UTF8 to Unicode wide characters */
 #define UTF8toWide(a) _myUTF8toWide(a, a ? _alloca(MultiByteToWideChar(CP_UTF8, 0, a, -1, NULL, 0) * sizeof(WCHAR)) : NULL)
-LPWSTR _myUTF8toWide(char *utf8string, void *outbuf)
+LPWSTR _myUTF8toWide(const char *utf8string, void *outbuf)
 {
 LPWSTR retbuf = outbuf;
 if(retbuf)
 MultiByteToWideChar(CP_UTF8, 0, utf8string, -1, retbuf, MultiByteToWideChar(CP_UTF8, 0, utf8string, -1, NULL, 0) * sizeof(WCHAR));
 return retbuf;
 }
 #define WideToUTF8(a) _myWideToUTF8(a, a ? _alloca(WideCharToMultiByte(CP_UTF8, 0, a, -1, NULL, 0, NULL, NULL)) : NULL)
-char *_myWideToUTF8(LPWSTR widestring, void *outbuf)
+char *_myWideToUTF8(LPCWSTR widestring, void *outbuf)
 {
 char *retbuf = outbuf;
 if(retbuf)
 WideCharToMultiByte(CP_UTF8, 0, widestring, -1, retbuf, WideCharToMultiByte(CP_UTF8, 0, widestring, -1, NULL, 0, NULL, NULL), NULL, NULL);
 ".tiff",
 ".bmp"
 };
 /* Section for loading files of types besides BMP and ICO and return HBITMAP or HICON */
-void *_dw_load_gpbitmap( char *filename )
+void *_dw_load_gpbitmap(const char *filename)
 {
 int i, wclen = (int)(strlen(filename) + 6) * sizeof(wchar_t);
 char *file = _alloca(strlen(filename) + 6);
 wchar_t *wfile = _alloca(wclen);
 void *image;
 }
 return NULL;
 }
 /* Try to load the appropriate image and return the HBITMAP handle */
-HBITMAP _dw_load_bitmap(char *filename, unsigned long *depth)
+HBITMAP _dw_load_bitmap(const char *filename, unsigned long *depth)
 {
 void *bitmap = _dw_load_gpbitmap(filename);
 if(bitmap)
 {
 HBITMAP hbm = NULL;
 }
 return NULL;
 }
 /* Try to load the appropriate image and return the HICON handle */
-HICON _dw_load_icon(char *filename)
+HICON _dw_load_icon(const char *filename)
 {
 void *bitmap = _dw_load_gpbitmap(filename);
 if(bitmap)
 {
 HICON hicon = NULL;
 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++)
 {
 ShowWindow(array[pageid]->hwnd, SW_SHOWNORMAL);
 }
 }
-void _create_tooltip(HWND handle, char *text)
+void _create_tooltip(HWND handle, const char *text)
 {
 TOOLINFO ti = { 0 };
 ti.cbSize = sizeof(TOOLINFO);
 ti.hwnd = handle;
 #ifdef BUILD_EDGE
 /* Check if Microsoft Edge (Chromium) is installed */
 if (_DW_EDGE_DETECTED = _dw_edge_detect())
 {
 	   wc.lpfnWndProc = (WNDPROC)_edgeWindowProc;
+	   wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
 }
 else
 #endif
 {
 	   wc.lpfnWndProc = (WNDPROC)_browserWindowProc;
 * 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}, *thisbuf = outbuf;
 va_start(args, format);
 * Parameters:
 *           title: The title of the message box.
 *           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 }, *thisbuf = outbuf;
 int rc;
 void API dw_window_reparent(HWND handle, HWND newparent)
 {
 SetParent(handle, newparent);
 }
-LOGFONT _get_logfont(HDC hdc, char *fontname)
+LOGFONT _get_logfont(HDC hdc, const char *fontname)
 {
 char  *Italic, *Bold, *myFontName = strchr(fontname, '.');
 int size = atoi(fontname);
 LOGFONT lf = {0};
 }
 /* Create a font handle from specified font name..
 * or return a handle to the default font.
 */
-HFONT _acquire_font2(HDC hdc, char *fontname)
+HFONT _acquire_font2(HDC hdc, const char *fontname)
 {
 HFONT hfont = 0;
 if(fontname != DefaultFont && fontname[0])
 {
 }
 /* Create a font handle from specified font name..
 * or return a handle to the default font.
 */
-HFONT _acquire_font(HWND handle, char *fontname)
+HFONT _acquire_font(HWND handle, const char *fontname)
 {
 HDC hdc = GetDC(handle);
 HFONT hfont = _acquire_font2(hdc, fontname);
 ReleaseDC(handle, hdc);
 return hfont;
 /*
 * 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)
 {
 HFONT oldfont = _DefaultFont;
 _DefaultFont = _acquire_font(HWND_DESKTOP, fontname);
 if(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)
 {
 HFONT hfont, oldfont;
 ColorInfo *cinfo;
 TCHAR tmpbuf[100] = {0};
 * 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)
 {
 CHOOSEFONT cf = { 0 };
 LOGFONT lf = { 0 };
 char *str = NULL;
 char *bold = "";
 * Parameters:
 *       owner: The Owner's window handle or HWND_DESKTOP.
 *       title: The Window title.
 *       flStyle: Style flags, see the DW 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(sizeof(Box), 1);
 ULONG flStyleEx = 0;
 #ifdef AEROGLASS
 * 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(sizeof(Box), 1);
 HWND hwndframe;
 newbox->pad = pad;
 #endif
 }
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 void _dw_html_action(HWND hwnd, int action);
-int _dw_html_raw(HWND hwnd, char *string);
+int _dw_html_raw(HWND hwnd, const char *string);
-int _dw_html_url(HWND hwnd, char *url);
+int _dw_html_url(HWND hwnd, const char *url);
-int _dw_html_javascript_run(HWND hwnd, char *script, void *scriptdata);
+int _dw_html_javascript_run(HWND hwnd, const char *script, void *scriptdata);
 #ifdef BUILD_EDGE
 void _dw_edge_action(HWND hwnd, int action);
-int _dw_edge_raw(HWND hwnd, char *string);
+int _dw_edge_raw(HWND hwnd, const char *string);
-int _dw_edge_url(HWND hwnd, char *url);
+int _dw_edge_url(HWND hwnd, const char *url);
-int _dw_edge_javascript_run(HWND hwnd, char *script, void *scriptdata);
+int _dw_edge_javascript_run(HWND hwnd, const char *script, void *scriptdata);
 #endif
 #endif
 /*
 * Causes the embedded HTML widget to take action.
 *       string: String buffer containt HTML code to
 *               be rendered.
 * Returns:
 *       DW_ERROR_NONE (0) on success.
 */
-int API dw_html_raw(HWND handle, char *string)
+int API dw_html_raw(HWND handle, const char *string)
 {
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 #ifdef BUILD_EDGE
 if (_DW_EDGE_DETECTED)
 return _dw_edge_raw(handle, string);
 *       url: Universal Resource Locator of the web or
 *               file object to be rendered.
 * Returns:
 *       DW_ERROR_NONE (0) on success.
 */
-int API dw_html_url(HWND handle, char *url)
+int API dw_html_url(HWND handle, const char *url)
 {
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 #if BUILD_EDGE
 if (_DW_EDGE_DETECTED)
 return _dw_edge_url(handle, url);
 *       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)
 {
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 #if BUILD_EDGE
 if (_DW_EDGE_DETECTED)
 return _dw_edge_javascript_run(handle, script, scriptdata);
 * 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)
 {
 HWND tmp = CreateWindow(STATICCLASSNAME,
 UTF8toWide(text),
 SS_NOPREFIX | SS_NOTIFY | SS_LEFTNOWORDWRAP |
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN,
 * 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)
 {
 HWND tmp = CreateWindow(StatusbarClassName,
 UTF8toWide(text),
 WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN,
 0,0,0,0,
 * Create a new Entryfield passwird 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)
 {
 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
 EDITCLASSNAME,
 UTF8toWide(text),
 ES_WANTRETURN | WS_CHILD |
 DeleteDC(hdc);
 }
 }
 /* Internal function to create a toolbar based button */
-HWND _create_toolbar(char *text, ULONG id, HICON icon, HBITMAP hbitmap)
+HWND _create_toolbar(const char *text, ULONG id, HICON icon, HBITMAP hbitmap)
 {
 HWND tmp;
 HIMAGELIST imlist, dimlist;
 BITMAP bmi = { 0 };
 TBBUTTON tbButtons[] = {
 * 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)
 {
 HWND tmp;
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HICON icon = LoadImage(DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, 0);
 HBITMAP hbitmap = icon ? 0 : LoadBitmap(DWInstance, MAKEINTRESOURCE(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 or ICO 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)
 {
 HWND tmp;
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HBITMAP hbitmap = 0;
 HANDLE hicon = 0;
 *       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)
 {
 HWND tmp;
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HBITMAP hbitmap = 0;
 HANDLE hicon = 0;
 * 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)
 {
 HWND buddy = CreateWindowEx(WS_EX_CLIENTEDGE,
 EDITCLASSNAME,
 UTF8toWide(text),
 WS_CHILD | WS_BORDER | WS_VISIBLE |
 *           (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 hbitmap = 0;
 HANDLE icon = 0;
 if(id)
 *       data: the image from meory
 *                 Bitmap on Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
 *       len: length of data
 */
-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 hbitmap=0;
 HICON icon=0;
 char *file;
 FILE *fp;
 * 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)
 {
 Box *thisbox;
 TCHAR tmpbuf[100] = {0}, *wtext = UTF8toWide(text);
 GetClassName(handle, tmpbuf, 99);
 * 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)
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 if(cinfo && cinfo->buddy)
 _create_tooltip(cinfo->buddy, bubbletext);
 * 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 pageidx, char *text)
+void API dw_notebook_page_set_text(HWND handle, ULONG pageidx, const char *text)
 {
 NotebookPage **array = (NotebookPage **)dw_window_get_data(handle, "_dw_array");
 int pageid;
 * 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)
 {
 }
 /*
 * Packs the specified box into the notebook page.
 * 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)
 {
 TCHAR tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 * 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)
 {
 TCHAR tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 *          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)
 {
 TVITEM tvi;
 TVINSERTSTRUCT tvins;
 HTREEITEM hti;
 *          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)
 {
 TVITEM tvi;
 TVINSERTSTRUCT tvins;
 HTREEITEM hti;
 *          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)
 {
 TVITEM tvi;
 tvi.mask = TVIF_HANDLE;
 tvi.hItem = item;
 * Configures the main filesystem column 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)
 {
 #ifdef GDIPLUS
 return _dw_load_icon(filename);
 #else
 char *file = malloc(strlen(filename) + 5);
 * Parameters:
 *       data: Source of icon data
 *                 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)
 {
 HANDLE 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_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)
 {
 LV_ITEM lvi;
 int item = 0;
 if(pointer)
 *          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);
 }
 /*
 * 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)
 {
-_dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_STRING, title);
+_dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_STRING, (void *)title);
 }
 /*
 * Changes the title of a row already inserted in the container.
 * 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)
 {
-_dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_STRING, title);
+_dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_STRING, (void *)title);
 }
 /*
 * Sets the data of a row in the container.
 * Parameters:
 * 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)
 {
 int index = ListView_GetNextItem(handle, -1, LVNI_ALL);
 while ( index != -1 )
 {
 * 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)
 {
 int index = ListView_GetNextItem(handle, -1, LVNI_ALL);
 while(index != -1)
 {
 * 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)
 {
 NOTIFYICONDATA tnid;
 tnid.cbSize = sizeof(NOTIFYICONDATA);
 tnid.hWnd = handle;
 tnid.uID = (UINT)(uintptr_t)icon;
 tnid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
 tnid.uCallbackMessage = WM_USER+2;
 tnid.hIcon = (HICON)icon;
 if(bubbletext)
-_tcsncpy(tnid.szTip, UTF8toWide(bubbletext), sizeof(tnid.szTip));
+_tcsncpy(tnid.szTip, UTF8toWide(bubbletext), sizeof(tnid.szTip) / sizeof(TCHAR));
 else
 tnid.szTip[0] = 0;
 Shell_NotifyIcon(NIM_ADD, &tnid);
 }
 *       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)
 {
 HDC hdc;
 int mustdelete = 0;
 HFONT hFont = 0, oldFont = 0;
 ColorInfo *cinfo = NULL;
 *       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)
 {
 HDC hdc;
 int mustdelete = 0;
 HFONT hFont = NULL, oldFont;
 SIZE sz;
 *                 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;
 BITMAP bm;
 HDC hdc;
 #ifndef GDIPLUS
 *                 (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;
 BITMAP bm;
 HDC hdc;
 char *file;
 *                  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)
 {
 HFONT hfont = _acquire_font2(pixmap->hdc, fontname);
 *         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)
 {
 if(!func || !name)
 return DW_ERROR_UNKNOWN;
 if(0 == strlen(name))
 * 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)
 {
 SECURITY_ATTRIBUTES sa;
 sa.nLength = sizeof( SECURITY_ATTRIBUTES);
 sa.lpSecurityDescriptor = &_dwsd;
 /* Destroy this semaphore.
 * Parameters:
 *         eve: Handle to the semaphore obtained by
 *              a create call.
 */
-HEV API dw_named_event_get(char *name)
+HEV API dw_named_event_get(const char *name)
 {
 return OpenEvent(EVENT_ALL_ACCESS, FALSE, UTF8toWide(name));
 }
 /* Resets the event semaphore so threads who call wait
 *         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)
 {
 SECURITY_ATTRIBUTES sa;
 HSHM handle;
 sa.nLength = sizeof(SECURITY_ATTRIBUTES);
 * 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)
 {
 HSHM handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, UTF8toWide(name));
 if(!handle)
 return 0;
 /*
 * 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)
 {
 HGLOBAL ptr1;
 LPTSTR ptr2;
 TCHAR *buf;
 #ifdef UNICODE
 * 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, char *ext, int flags)
 {
 OPENFILENAME of = {0};
 TCHAR filenamebuf[BROWSEBUFSIZE+1] = {0}, *fbuf = filenamebuf;
 TCHAR filterbuf[BROWSEBUFSIZE+1] = {0};
 TCHAR *exten = UTF8toWide(ext);
 *       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)
 {
 char **newparams;
 int retcode, count = 0, z;
 while(params[count])
 /* 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)
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(window, GWLP_USERDATA);
 if(!cinfo)
 {
 * 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)
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(window, GWLP_USERDATA);
 if(cinfo && cinfo->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 _myUTF8toWide(utf8string, malloc(MultiByteToWideChar(CP_UTF8, 0, utf8string, -1, NULL, 0) * sizeof(WCHAR)));
 #else
 return NULL;
 *       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 _myWideToUTF8(wstring, malloc(WideCharToMultiByte(CP_UTF8, 0, wstring, -1, NULL, 0, NULL, NULL)));
 #else
 return NULL;

Mercurial > dwindows

comparison win/dw.c @ 2034:89d62197124b