dwindows: win/dw.c comparison

comparison win/dw.c @ 2038:133f29e9f488

Win: Hopefully finally const changes for Windows. OS/2 to go.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 17 Nov 2019 05:35:00 +0000
parents	ea303d356419
children	82e5c998df2e

comparison

equal deleted inserted replaced

-:a00e73284c97
+:133f29e9f488
 *       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)
 {
 MENUITEMINFO mii;
 HMENU mymenu = (HMENU)menux;
 char buffer[31] = {0};
 int is_checked, is_disabled;
-char *menutitle = title;
+char *menutitle = (char *)title;
 /*
 * Check if this is a menubar; if so get the menu object
 * for the menubar
 */
 * 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)
 {
 HWND tmp = CreateWindowEx(WS_EX_CLIENTEDGE,
 EDITCLASSNAME,
 UTF8toWide(text),
 ES_WANTRETURN | WS_CHILD |
 * 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)
 {
 HWND tmp = CreateWindow(COMBOBOXCLASSNAME,
 UTF8toWide(text),
 WS_CHILD | CBS_DROPDOWN | WS_VSCROLL |
 WS_CLIPCHILDREN | CBS_AUTOHSCROLL | WS_VISIBLE,
 * 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)
 {
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 UTF8toWide(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)
 {
 ColorInfo *cinfo;
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 UTF8toWide(text),
 WS_CHILD | BS_AUTORADIOBUTTON |
 * 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)
 {
 ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 UTF8toWide(text),
 WS_CHILD | BS_AUTOCHECKBOX |
 * Parameters:
 *          handle: Handle to the listbox to be appended to.
 *          text: Text to append 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)
 {
 TCHAR tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 * 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)
 {
 int textlen, len = GetWindowTextLength(handle);
 TCHAR *tmpbuf, *srcbuf = UTF8toWide(buffer);
 if(startpoint < 0)
 *          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)
 {
 int len = GetWindowTextLength(handle);
 TCHAR *tmpbuf = calloc(sizeof(TCHAR), len+2);
 TCHAR *searchtext = UTF8toWide(text);
 int z, textlen, retval = 0;
 * 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)
 {
 if(!handle)
 return DW_ERROR_UNKNOWN;
 *handle = LoadLibrary(UTF8toWide(name));
 /*
 * 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 *browseurl = url;
+char *browseurl = strdup(url);
 int retcode;
-if(strlen(url) > 7 && strncmp(url, "file://", 7) == 0)
+if(strlen(browseurl) > 7 && strncmp(browseurl, "file://", 7) == 0)
 {
 int len, z;
-browseurl = &url[7];
+browseurl = &browseurl[7];
 len = (int)strlen(browseurl);
 for(z=0;z<len;z++)
 {
 if(browseurl[z] == '|')
 browseurl[z] = '\\';
 }
 }
 retcode = DW_POINTER_TO_INT(ShellExecute(NULL, TEXT("open"), UTF8toWide(browseurl), NULL, NULL, SW_SHOWNORMAL));
+free(browseurl);
 if(retcode<33 && retcode != 2)
 return DW_ERROR_UNKNOWN;
 return DW_ERROR_NONE;
 }
 *       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)
 {
 DWPrint *print;
 if(!drawfunc || !(print = calloc(1, sizeof(DWPrint))))
 return NULL;

Mercurial > dwindows

comparison win/dw.c @ 2038:133f29e9f488