dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 986:87dc0f5f96d0

Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. Changed return values of a number of functions to be consistent across platforms and use the defines.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 07 May 2011 05:14:06 +0000
parents	2497a806d34e
children	98d73c9e81fc

comparison

equal deleted inserted replaced

-:cfc0777aceb5
+:87dc0f5f96d0
 DW_MUTEX_LOCK;
 clist = gtk_clist_new_with_titles(count, (gchar **)titles);
 if(!clist)
 {
 DW_MUTEX_UNLOCK;
-return FALSE;
+return DW_ERROR_GENERAL;
 }
 multi = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_multi");
 gtk_object_set_data(GTK_OBJECT(handle), "_dw_multi", GINT_TO_POINTER(multi));
 gtk_clist_set_column_auto_resize(GTK_CLIST(clist), 0, TRUE);
 justification = GTK_JUSTIFY_LEFT;
 gtk_clist_set_column_justification(GTK_CLIST(clist),z,justification);
 }
 DW_MUTEX_UNLOCK;
-return TRUE;
+return DW_ERROR_NONE;
 }
 /*
 * Sets up the container columns.
 * Parameters:
 */
 int dw_filesystem_setup(HWND handle, unsigned long *flags, char **titles, int count)
 {
 char **newtitles = malloc(sizeof(char *) * (count + 1));
 unsigned long *newflags = malloc(sizeof(unsigned long) * (count + 1));
+int res;
 newtitles[0] = "Filename";
 newflags[0] = DW_CFA_STRINGANDICON | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
 memcpy(&newtitles[1], titles, sizeof(char *) * count);
 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
-_dw_container_setup(handle, newflags, newtitles, count + 1, 1, 1);
+res = _dw_container_setup(handle, newflags, newtitles, count + 1, 1, 1);
 if ( newtitles) free(newtitles);
 if ( newflags ) free(newflags);
-return TRUE;
+return res;
 }
 /*
 * Obtains an icon from a module (or header in GTK).
 * Parameters:
 *       eve: The handle to the event returned by dw_event_new().
 */
 int dw_event_reset (HEV eve)
 {
 if(!eve)
-return FALSE;
+return DW_ERROR_NON_INIT;
 pthread_mutex_lock (&(eve->mutex));
 pthread_cond_broadcast (&(eve->event));
 pthread_cond_init (&(eve->event), NULL);
 eve->posted = 0;
 pthread_mutex_unlock (&(eve->mutex));
-return 0;
+return DW_ERROR_NONE;
 }
 /*
 * Posts a semaphore created by dw_event_new(). Causing all threads
 * waiting on this event in dw_event_wait to continue.
 *       eve: The handle to the event returned by dw_event_new().
 */
 int dw_event_post (HEV eve)
 {
 if(!eve)
-return FALSE;
+return DW_ERROR_NON_INIT;
 pthread_mutex_lock (&(eve->mutex));
 pthread_cond_broadcast (&(eve->event));
 eve->posted = 1;
 pthread_mutex_unlock (&(eve->mutex));
-return 0;
+return DW_ERROR_NONE;
 }
 /*
 * Waits on a semaphore created by dw_event_new(), until the
 * event gets posted or until the timeout expires.
 int rc;
 struct timeval now;
 struct timespec timeo;
 if(!eve)
-return FALSE;
+return DW_ERROR_NON_INIT;
 if(eve->posted)
-return 0;
+return DW_ERROR_GENERAL;
 pthread_mutex_lock (&(eve->mutex));
 gettimeofday(&now, 0);
 timeo.tv_sec = now.tv_sec + (timeout / 1000);
 timeo.tv_nsec = now.tv_usec * 1000;
 rc = pthread_cond_timedwait (&(eve->event), &(eve->mutex), &timeo);
 pthread_mutex_unlock (&(eve->mutex));
 if(!rc)
-return 1;
+return DW_ERROR_NONE;
 if(rc == ETIMEDOUT)
-return -1;
+return DW_ERROR_TIMEOUT;
-return 0;
+return DW_ERROR_GENERAL;
 }
 /*
 * Closes a semaphore created by dw_event_new().
 * Parameters:
 *       eve: The handle to the event returned by dw_event_new().
 */
 int dw_event_close(HEV *eve)
 {
 if(!eve || !(*eve))
-return FALSE;
+return DW_ERROR_NON_INIT;
 pthread_mutex_lock (&((*eve)->mutex));
 pthread_cond_destroy (&((*eve)->event));
 pthread_mutex_unlock (&((*eve)->mutex));
 pthread_mutex_destroy (&((*eve)->mutex));
 free(*eve);
 *eve = NULL;
-return TRUE;
+return DW_ERROR_NONE;
 }
 struct _seminfo {
 int fd;
 int waiting;
 /*
 * Returns the index to the item in the list currently selected.
 * Parameters:
 *          handle: Handle to the listbox to be queried.
 */
-unsigned int dw_listbox_selected(HWND handle)
+int dw_listbox_selected(HWND handle)
 {
 GtkWidget *handle2 = handle;
 int retval = DW_LIT_NONE;
 int _locked_by_me = FALSE;

Mercurial > dwindows

comparison gtk/dw.c @ 986:87dc0f5f96d0