dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 671:c60a4f6cfae8

Implemented icon support on the Mac. In the process created a new HICN type. The existing implementation works well on OS/2 but it is kind of bad on the other platforms. I should revisit the Windows and GTK implementations. The typedef currently in use should be backwards compatible for now.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 27 Feb 2011 19:01:40 +0000
parents	9ab89d89e6b4
children	388f2a48aaae

comparison

equal deleted inserted replaced

-:0b920d0dc13e
+:c60a4f6cfae8
 /*
 * Dynamic Windows:
 *          A GTK like implementation of the PM GUI
 *          GTK forwarder module for portabilty.
 *
-* (C) 2000-2004 Brian Smith <dbsoft@technologist.com>
+* (C) 2000-2011 Brian Smith <brian@dbsoft.org>
 * (C) 2003-2004 Mark Hessling <m.hessling@qut.edu.au>
 * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru>
 */
 #include "config.h"
 #include "dw.h"
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 *          parent: Parent handle or 0 if root.
 *          itemdata: Item specific data.
 */
-HTREEITEM dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, unsigned long icon, HTREEITEM parent, void *itemdata)
+HTREEITEM dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
 #if GTK_MAJOR_VERSION > 1
 GtkWidget *tree;
 GtkTreeIter *iter;
 GtkTreeStore *store;
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 *          parent: Parent handle or 0 if root.
 *          itemdata: Item specific data.
 */
-HTREEITEM dw_tree_insert(HWND handle, char *title, unsigned long icon, HTREEITEM parent, void *itemdata)
+HTREEITEM dw_tree_insert(HWND handle, char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
 #if GTK_MAJOR_VERSION > 1
 GtkWidget *tree;
 GtkTreeIter *iter;
 GtkTreeStore *store;
 *          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 dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
+void dw_tree_item_change(HWND handle, HTREEITEM item, char *title, HICN icon)
 {
 #if GTK_MAJOR_VERSION > 1
 GtkWidget *tree;
 GtkTreeStore *store;
 GdkPixbuf *pixbuf;
 *          module: Handle to module (DLL) in OS/2 and Windows.
 *          id: A unsigned long id int the resources on OS/2 and
 *              Windows, on GTK this is converted to a pointer
 *              to an embedded XPM.
 */
-unsigned long dw_icon_load(unsigned long module, unsigned long id)
+HICN dw_icon_load(unsigned long module, unsigned long id)
 {
 return id;
 }
 /*
 * 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)
 */
-unsigned long API dw_icon_load_from_file(char *filename)
+HICN API dw_icon_load_from_file(char *filename)
 {
 int found = -1, _locked_by_me = FALSE;
 #if GTK_MAJOR_VERSION > 1
 GdkPixbuf *pixbuf;
 #elif defined(USE_IMLIB)
 {
 _PixmapArray[found].used = 0;
 _PixmapArray[found].pixmap = _PixmapArray[found].mask = NULL;
 return 0;
 }
-return ret | (1 << 31);
+return (HICN)ret | (1 << 31);
 }
 /*
 * Obtains an icon from data.
 * Parameters:
 *       data: Source of data for image.
 *       len:  length of data
 */
-unsigned long API dw_icon_load_from_data(char *data, int len)
+HICN API dw_icon_load_from_data(char *data, int len)
 {
 int found = -1, _locked_by_me = FALSE;
 char *file;
 FILE *fp;
 #if GTK_MAJOR_VERSION > 1
 {
 _PixmapArray[found].used = 0;
 _PixmapArray[found].pixmap = _PixmapArray[found].mask = NULL;
 return 0;
 }
-return ret | (1 << 31);
+return (HICN)ret | (1 << 31);
 }
 /*
 * Frees a loaded resource in OS/2 and Windows.
 * Parameters:
 *          handle: Handle to icon returned by dw_icon_load().
 */
-void dw_icon_free(unsigned long handle)
+void dw_icon_free(HICN handle)
 {
 /* If it is a private icon, find the item
 * free the associated structures and set
 * the entry to unused.
 */
 *          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, unsigned long icon)
+void API dw_filesystem_change_file(HWND handle, int row, 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.
 */
-void dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, unsigned long icon)
+void dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon)
 {
 _dw_container_set_item(handle, pointer, 0, row, (void *)&icon, filename);
 }
 /*
 * 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 dw_taskbar_insert(HWND handle, unsigned long icon, char *bubbletext)
+void dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
 {
 /* TODO */
 }
 /*
 * Deletes an icon from the taskbar.
 * Parameters:
 *       handle: Window handle that was used with dw_taskbar_insert().
 *       icon: Icon handle that was used with dw_taskbar_insert().
 */
-void dw_taskbar_delete(HWND handle, unsigned long icon)
+void dw_taskbar_delete(HWND handle, HICN icon)
 {
 /* TODO */
 }
 /*

Mercurial > dwindows

comparison gtk/dw.c @ 671:c60a4f6cfae8