dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 134:caeb52bb5ef4

Pass pointers to argc and argv on Unix.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 21 Oct 2002 00:40:55 +0000
parents	85f8ba78736d
children	f57ef391f104

comparison

equal deleted inserted replaced

-:85f8ba78736d
+:caeb52bb5ef4
 * Initializes the Dynamic Windows engine.
 * Parameters:
 *           newthread: True if this is the only thread.
 *                      False if there is already a message loop running.
 */
-int dw_int_init(DWResources *res, int newthread, int argc, char *argv[])
+int dw_int_init(DWResources *res, int newthread, int *argc, char **argv[])
 {
 	int z;
 	char *tmp;
 	if(res)
 		_resources.resource_data = res->resource_data;
 	}
 	gtk_set_locale();
 	g_thread_init(NULL);
-	gtk_init(&argc, &argv);
+	gtk_init(argc, argv);
 #ifdef USE_IMLIB
 	gdk_imlib_init();
 #endif
 	/* Add colors to the system colormap */
 	_dw_cmap = gdk_colormap_get_system();
 	tmp = dialog->result;
 	free(dialog);
 	return tmp;
 }
-void _delete(GtkWidget *widget, GtkWidget *event, gpointer param)
+int _delete(GtkWidget *widget, GtkWidget *event, gpointer param)
 {
 	gtk_widget_destroy(GTK_WIDGET(param));
-}
+	return FALSE;
+}
-void _delete2(GtkWidget *widget, gpointer param)
+int _delete2(GtkWidget *widget, gpointer param)
 {
 	gtk_widget_destroy(GTK_WIDGET(param));
-}
+	return FALSE;
+}
-void _dw_ok_func(HWND window, void *data)
+int _dw_ok_func(HWND window, void *data)
 {
 	DWDialog *dwwait = (DWDialog *)data;
 	if(!dwwait)
-		return;
+		return FALSE;
 	dw_window_destroy((HWND)dwwait->data);
 	dw_dialog_dismiss((DWDialog *)data, (void *)0);
+	return FALSE;
 }
 /*
 * Displays a Message Box with given text and title..
 * Parameters:
 	dw_dialog_wait(dwwait);
 	return strlen(outbuf);
 }
-void _dw_yes_func(HWND window, void *data)
+int _dw_yes_func(HWND window, void *data)
 {
 	DWDialog *dwwait = (DWDialog *)data;
 	if(!dwwait)
-		return;
+		return FALSE;
 	dw_window_destroy((HWND)dwwait->data);
 	dw_dialog_dismiss((DWDialog *)data, (void *)1);
-}
+	return FALSE;
+}
-void _dw_no_func(HWND window, void *data)
+int _dw_no_func(HWND window, void *data)
 {
 	DWDialog *dwwait = (DWDialog *)data;
 	if(!dwwait)
-		return;
+		return FALSE;
 	dw_window_destroy((HWND)dwwait->data);
 	dw_dialog_dismiss((DWDialog *)data, (void *)0);
+	return FALSE;
 }
 /*
 * Displays a Message Box with given text and title..
 * Parameters:
 *       pixmap: Handle to a pixmap returned by
 *               dw_pixmap_new..
 */
 void dw_pixmap_destroy(HPIXMAP pixmap)
 {
-#if GTK_MAJOR_VERSION < 2
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
 	gdk_pixmap_unref(pixmap->pixmap);
 	free(pixmap);
 	DW_MUTEX_UNLOCK;
-#endif
 }
 /*
 * Copies from one item to another.
 * Parameters:
 	int lastwidth = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastwidth");
 	int lastheight = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastheight");
 	/* Prevent infinite recursion ;) */
 	if(!percent || (lastwidth == event->width && lastheight == event->height))
-		return TRUE;
+		return FALSE;
 	lastwidth = event->width; lastheight = event->height;
 	gtk_object_set_data(GTK_OBJECT(widget), "_dw_lastwidth", (gpointer)lastwidth);
 	gtk_object_set_data(GTK_OBJECT(widget), "_dw_lastheight", (gpointer)lastheight);
 	if(GTK_IS_HPANED(widget))
 		gtk_paned_set_position(GTK_PANED(widget), (int)(event->width * (*percent / 100.0)));
 	if(GTK_IS_VPANED(widget))
 		gtk_paned_set_position(GTK_PANED(widget), (int)(event->height * (*percent / 100.0)));
-	return TRUE;
+	return FALSE;
 }
 #if GTK_MAJOR_VERSION > 1
 /* Figure out the new percentage */
 gint _splitbar_accept_position(GtkWidget *widget, gpointer data)
 {
 	float *percent = (float *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent");
 	int size = 0, position = gtk_paned_get_position(GTK_PANED(widget));
 	if(!percent)
-		return TRUE;
+		return FALSE;
 	if(GTK_IS_VPANED(widget))
 		size = widget->allocation.height;
 	else if(GTK_IS_HPANED(widget))
 		size = widget->allocation.width;
 	if(size > 0)
 		*percent = ((float)(position * 100) / (float)size);
-	return TRUE;
+	return FALSE;
 }
 #endif
 /*
 * Creates a splitbar window (widget) with given parameters.
 	env->MajorVersion = atoi(tempbuf);
 	env->MinorVersion = 0;
 }
 /* Internal function to handle the file OK press */
-void _gtk_file_ok(GtkWidget *widget, DWDialog *dwwait)
+gint _gtk_file_ok(GtkWidget *widget, DWDialog *dwwait)
 {
 #if GTK_MAJOR_VERSION > 1
 	const char *tmp;
 #else
 	char *tmp;
 #endif
 	if(!dwwait)
-		return;
+		return FALSE;
 	tmp = gtk_file_selection_get_filename(GTK_FILE_SELECTION(dwwait->data));
 	gtk_widget_destroy(GTK_WIDGET(dwwait->data));
 	_dw_file_active = 0;
 	dw_dialog_dismiss(dwwait, (void *)(tmp ? strdup(tmp) : NULL));
+	return FALSE;
 }
 /* Internal function to handle the file Cancel press */
-void _gtk_file_cancel(GtkWidget *widget, DWDialog *dwwait)
+gint _gtk_file_cancel(GtkWidget *widget, DWDialog *dwwait)
 {
 	if(!dwwait)
-		return;
+		return FALSE;
 	gtk_widget_destroy(GTK_WIDGET(dwwait->data));
 	_dw_file_active = 0;
 	dw_dialog_dismiss(dwwait, NULL);
+	return FALSE;
 }
 /*
 * Opens a file dialog and queries user selection.
 * Parameters:

Mercurial > dwindows

comparison gtk/dw.c @ 134:caeb52bb5ef4