dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 120:7d2108cbcd3e

Porting DW to GTK 2.0... and changed the percent value from into to a float so there won't be any rounding.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 19 Oct 2002 11:46:54 +0000
parents	1cad81b7cc4c
children	d8af32b1b1cd

comparison

equal deleted inserted replaced

-:1cad81b7cc4c
+:7d2108cbcd3e
 #include <sys/time.h>
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #ifdef USE_IMLIB
 #include <gdk_imlib.h>
-#elif defined(USE_PIXBUF)
+#endif
+#if GTK_MAJOR_VERSION > 1
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-xlibrgb.h>
-#include <gdk-pixbuf/gdk-pixbuf-xlib.h>
 #endif
 /* These are used for resource management */
 #if defined(DW_RESOURCES) && !defined(BUILD_DLL)
 extern DWResources _resources;
 	}
 	if(data)
 	{
 		GdkPixmap *icon_pixmap = NULL;
-#ifdef USE_IMLIB
+#if GTK_MAJOR_VERSION > 1
+		icon_pixmap = (GdkPixmap *)gdk_pixbuf_new_from_xpm_data((const char **)data);
+#elif defined(USE_IMLIB)
 		gdk_imlib_data_to_pixmap((char **)data, &icon_pixmap, bitmap);
-#elif defined(USE_PIXBUF)
-		icon_pixmap = (GdkPixmap *)gdk_pixbuf_new_from_xpm_data((const char **)data);
 #else
 		icon_pixmap = gdk_pixmap_create_from_xpm_d(handle->window, bitmap, &_colors[DW_CLR_PALEGRAY], &data);
 #endif
 		return icon_pixmap;
 	}
 	DW_MUTEX_UNLOCK;
 }
 int _set_font(HWND handle, char *fontname)
 {
+	int retval = FALSE;
+#if GTK_MAJOR_VERSION < 2
 	GtkStyle *style;
 	GdkFont *font = NULL;
-	int retval = FALSE;
 	font = gdk_font_load(fontname);
 	if(font)
 	{
 		style = gtk_widget_get_style(handle);
 		style->font = font;
 		gtk_widget_set_style(handle, style);
 		retval = TRUE;
 	}
+#else
+	PangoFontDescription *font = pango_font_description_from_string(fontname);
+	if(font)
+		gtk_widget_modify_font(handle, font);
+	pango_font_description_free(font);
+#endif
 	return retval;
 }
 /*
 * Sets the font used by a specified window (widget) handle.
 		style = gtk_style_copy(gtk_widget_get_style(handle));
 		style->text[0] = style->text[1] = style->fg[0] = style->fg[1] = forecolor;
 		style->base[0] = style->base[1] = style->bg[0] = style->bg[1] = backcolor;
 		gtk_widget_set_style(handle, style);
 		_save_gdk_colors(handle, forecolor, backcolor);
 		if(GTK_IS_CLIST(handle))
 		{
 			int z, rowcount = (int)gtk_object_get_data(GTK_OBJECT(handle), "rowcount");
 * Parameters:
 *       id: An ID to be used with WinWindowFromID() or 0L.
 */
 HWND dw_bitmap_new(unsigned long id)
 {
-	GdkPixmap *pixmap= NULL;
+	GdkPixmap *pixmap = NULL;
-	GdkBitmap *bitmap;
+	GdkBitmap *bitmap = NULL;
 	GtkWidget *tmp;
 	static char * test_xpm[] = {
 		"1 1 2 1",
 		"	c None",
 		".	c #FFFFFF",
 		"."};
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
-#ifdef USE_IMLIB
+#if GTK_MAJOR_VERSION > 1
+	pixmap = (GdkPixmap *)gdk_pixbuf_new_from_xpm_data((const char **)test_xpm);
+	tmp = gtk_image_new_from_pixbuf((GdkPixbuf *)pixmap);
+#elif defined(USE_IMLIB)
 	gdk_imlib_data_to_pixmap(test_xpm, &pixmap, &bitmap);
-#elif defined(USE_PIXBUF)
-	pixmap = (GdkPixmap *)gdk_pixbuf_new_from_xpm_data((const char **)test_xpm);
 #else
 	gtk_widget_realize(last_window);
 	if(last_window)
 		pixmap = gdk_pixmap_create_from_xpm_d(last_window->window, &bitmap, &_colors[DW_CLR_PALEGRAY], test_xpm);
 #endif
+#if GTK_MAJOR_VERSION < 2
 	tmp = gtk_pixmap_new(pixmap, bitmap);
+#endif
 	gtk_widget_show(tmp);
 	gtk_object_set_data(GTK_OBJECT(tmp), "id", (gpointer)id);
 	DW_MUTEX_UNLOCK;
 	return tmp;
 }
 			char numbuf[10];
 			if(accel && accel_group)
 			{
 				tmphandle=gtk_check_menu_item_new_with_label("");
 				tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf);
-				gtk_widget_add_accelerator(tmphandle, "activate_item", accel_group, tmp_key, GDK_MOD1_MASK, 0);
+				gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
 			}
 			else
 				tmphandle=gtk_check_menu_item_new_with_label(tempbuf);
 			gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(tmphandle), TRUE);
 			sprintf(numbuf, "%lu", id);
 		{
 			if(accel && accel_group)
 			{
 				tmphandle=gtk_menu_item_new_with_label("");
 				tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(tmphandle)->child), tempbuf);
-				gtk_widget_add_accelerator(tmphandle, "activate_item", accel_group, tmp_key, GDK_MOD1_MASK, 0);
+				gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
 			}
 			else
 				tmphandle=gtk_menu_item_new_with_label(tempbuf);
 		}
 	}
 {
 	GtkWidget *tmp, *tmpbox, *scroller;
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+	tmpbox = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tmpbox),
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+	tmp = gtk_text_view_new();
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tmpbox), tmp);
+	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_NONE);
+#else
 	tmpbox = gtk_hbox_new(FALSE, 0);
 	tmp = gtk_text_new(NULL, NULL);
 	gtk_text_set_word_wrap(GTK_TEXT(tmp), FALSE);
 	gtk_text_set_line_wrap(GTK_TEXT(tmp), FALSE);
 	scroller = gtk_vscrollbar_new(GTK_TEXT(tmp)->vadj);
 	GTK_WIDGET_UNSET_FLAGS(scroller, GTK_CAN_FOCUS);
+	gtk_box_pack_start(GTK_BOX(tmpbox), tmp, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(tmpbox), scroller, FALSE, TRUE, 0);
+	gtk_widget_show(scroller);
+#endif
 	gtk_object_set_data(GTK_OBJECT(tmp), "id", (gpointer)id);
 	gtk_object_set_data(GTK_OBJECT(tmpbox), "mle", (gpointer)tmp);
-	gtk_box_pack_start(GTK_BOX(tmpbox), tmp, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(tmpbox), scroller, FALSE, TRUE, 0);
 	gtk_widget_show(tmp);
-	gtk_widget_show(scroller);
 	gtk_widget_show(tmpbox);
 	DW_MUTEX_UNLOCK;
 	return tmpbox;
 }
 	DW_MUTEX_LOCK;
 	icon_pixmap = _find_pixmap(&bitmap, id, handle);
 	if(handle->window && icon_pixmap)
+#if GTK_MAJOR_VERSION > 1
+		gtk_window_set_icon(GTK_WINDOW(handle), (GdkPixbuf *)icon_pixmap);
+#else
 		gdk_window_set_icon(handle->window, NULL, icon_pixmap, bitmap);
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
 	tmp = _find_pixmap(&bitmap, id, handle);
 	if(tmp)
+#if GTK_MAJOR_VERSION > 1
+		gtk_image_set_from_pixbuf(GTK_IMAGE(handle), (GdkPixbuf *)tmp);
+#else
 		gtk_pixmap_set(GTK_PIXMAP(handle), tmp, bitmap);
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the text used for a given window.
 * Returns:
 *       text: The text associsated with a given window.
 */
 char *dw_window_get_text(HWND handle)
 {
+#if GTK_MAJOR_VERSION > 1
+	const char *possible = "";
+#else
 	char *possible = "";
+#endif
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
 	if(GTK_IS_ENTRY(handle))
 		possible = gtk_entry_get_text(GTK_ENTRY(handle));
 {
 	unsigned int tmppoint = startpoint;
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+	if(GTK_IS_SCROLLED_WINDOW(handle))
+#else
 	if(GTK_IS_BOX(handle))
+#endif
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		GdkFont *font = (GdkFont *)gtk_object_get_data(GTK_OBJECT(handle), "gdkfont");
+#if GTK_MAJOR_VERSION > 1
+		if(tmp && GTK_IS_TEXT_VIEW(tmp))
+		{
+			char *impbuf = malloc(strlen(buffer)+1);
+			GtkTextBuffer *tbuffer;
+			GtkTextIter iter;
+			_strip_cr(impbuf, buffer);
+			tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
+			gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, startpoint);
+			gtk_text_buffer_place_cursor(tbuffer, &iter);
+			gtk_text_buffer_insert_at_cursor(tbuffer, impbuf, -1);
+			free(impbuf);
+		}
+#else
 		if(tmp && GTK_IS_TEXT(tmp))
 		{
 			GdkColor *fore = (GdkColor *)gtk_object_get_data(GTK_OBJECT(handle), "foregdk");
 			GdkColor *back = (GdkColor *)gtk_object_get_data(GTK_OBJECT(handle), "backgdk");
 			char *impbuf = malloc(strlen(buffer)+1);
 			gtk_text_set_point(GTK_TEXT(tmp), startpoint < 0 ? 0 : startpoint);
 			gtk_text_insert(GTK_TEXT(tmp), font, fore, back, impbuf, -1);
 			tmppoint = gtk_text_get_point(GTK_TEXT(tmp));
 			free(impbuf);
 		}
+#endif
 	}
 	DW_MUTEX_UNLOCK;
 	return tmppoint;
 }
 *          startpoint: Point to start grabbing text.
 *          length: Amount of text to be grabbed.
 */
 void dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
 {
+#if GTK_MAJOR_VERSION > 1
+#else
 	int _locked_by_me = FALSE;
 	gchar *text;
 	DW_MUTEX_LOCK;
 	if(GTK_IS_BOX(handle))
 				g_free(text);
 			}
 		}
 	}
 	DW_MUTEX_UNLOCK;
+#endif
 }
 /*
 * Obtains information about an MLE box.
 * Parameters:
 		*bytes = 0;
 	if(lines)
 		*lines = 0;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+	if(GTK_IS_SCROLLED_WINDOW(handle))
+	{
+		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
+		if(tmp && GTK_IS_TEXT_VIEW(tmp))
+		{
+			GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
+			if(bytes)
+				*bytes = gtk_text_buffer_get_char_count(buffer) + 1;
+			if(lines)
+				*lines = gtk_text_buffer_get_line_count(buffer) + 1;
+		}
+	}
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 					g_free(text);
 				}
 			}
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Deletes text from an MLE box.
 void dw_mle_delete(HWND handle, int startpoint, int length)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 		{
 			gtk_text_set_point(GTK_TEXT(tmp), startpoint);
 			gtk_text_forward_delete(GTK_TEXT(tmp), length);
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Clears all text from an MLE box.
 void dw_mle_clear(HWND handle)
 {
 	int length, _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 			length = gtk_text_get_length(GTK_TEXT(tmp));
 			gtk_text_set_point(GTK_TEXT(tmp), 0);
 			gtk_text_forward_delete(GTK_TEXT(tmp), length);
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the visible line of an MLE box.
 void dw_mle_set_visible(HWND handle, int line)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 				gtk_adjustment_set_value(GTK_TEXT(tmp)->vadj, pos);
 			}
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the editablity of an MLE box.
 void dw_mle_set_editable(HWND handle, int state)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+	if(GTK_IS_SCROLLED_WINDOW(handle))
+	{
+		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
+		if(tmp && GTK_IS_TEXT_VIEW(tmp))
+			gtk_text_view_set_editable(GTK_TEXT_VIEW(tmp), state);
+	}
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
-		{
 			gtk_text_set_editable(GTK_TEXT(tmp), state);
-		}
+	}
-	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the word wrap state of an MLE box.
 void dw_mle_set_word_wrap(HWND handle, int state)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+	if(GTK_IS_SCROLLED_WINDOW(handle))
+	{
+		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
+		if(tmp && GTK_IS_TEXT_VIEW(tmp))
+			gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD);
+	}
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 		{
 			gtk_text_set_word_wrap(GTK_TEXT(tmp), state);
 			gtk_text_set_line_wrap(GTK_TEXT(tmp), state);
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the current cursor position of an MLE box.
 void dw_mle_set(HWND handle, int point)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 				gtk_adjustment_set_value(GTK_TEXT(tmp)->vadj, pos);
 			}
 			gtk_text_set_point(GTK_TEXT(tmp), point);
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Finds text in an MLE box.
 int dw_mle_search(HWND handle, char *text, int point, unsigned long flags)
 {
 	int _locked_by_me = FALSE, retval = 0;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 				g_free(tmpbuf);
 			}
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 	return retval;
 }
 /*
 void dw_mle_freeze(HWND handle)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 		{
 			gtk_text_freeze(GTK_TEXT(tmp));
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Resumes redrawing of an MLE box.
 void dw_mle_thaw(HWND handle)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
+#if GTK_MAJOR_VERSION > 1
+#else
 	if(GTK_IS_BOX(handle))
 	{
 		GtkWidget *tmp = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "mle");
 		if(tmp && GTK_IS_TEXT(tmp))
 		{
 			gtk_text_thaw(GTK_TEXT(tmp));
 		}
 	}
+#endif
 	DW_MUTEX_UNLOCK;
 }
 /*
 * Returns the range of the percent bar.
 	gtk_object_set_data(GTK_OBJECT(newitem), "itemdata", (gpointer)itemdata);
 	gtk_object_set_data(GTK_OBJECT(newitem), "tree", (gpointer)tree);
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_object_set_data(GTK_OBJECT(newitem), "hbox", (gpointer)hbox);
 	gdkpix = _find_pixmap(&gdkbmp, icon, hbox);
+#if GTK_MAJOR_VERSION > 1
+	pixmap = gtk_image_new_from_pixbuf((GdkPixbuf *)gdkbmp);
+#else
 	pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
+#endif
 	gtk_container_add(GTK_CONTAINER(newitem), hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
 	gtk_widget_show(label);
 	gtk_widget_show(pixmap);
 	gtk_object_set_data(GTK_OBJECT(item), "itemdata", (gpointer)itemdata);
 	gtk_object_set_data(GTK_OBJECT(item), "tree", (gpointer)tree);
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_object_set_data(GTK_OBJECT(item), "hbox", (gpointer)hbox);
 	gdkpix = _find_pixmap(&gdkbmp, icon, hbox);
+#if GTK_MAJOR_VERSION > 1
+	pixmap = gtk_image_new_from_pixbuf((GdkPixbuf *)gdkbmp);
+#else
 	pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
+#endif
 	gtk_container_add(GTK_CONTAINER(item), hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
 	gtk_widget_show(label);
 	gtk_widget_show(pixmap);
 	hbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "hbox");
 	gtk_widget_destroy(hbox);
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_object_set_data(GTK_OBJECT(item), "hbox", (gpointer)hbox);
 	gdkpix = _find_pixmap(&gdkbmp, icon, hbox);
+#if GTK_MAJOR_VERSION > 1
+	pixmap = gtk_image_new_from_pixbuf((GdkPixbuf *)gdkbmp);
+#else
 	pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
+#endif
 	gtk_container_add(GTK_CONTAINER(item), hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
 	gtk_widget_show(label);
 	gtk_widget_show(pixmap);
 	{
 		long hicon = *((long *)data);
 		GdkBitmap *bitmap = NULL;
 		GdkPixmap *pixmap = _find_pixmap(&bitmap, hicon, clist);
+#if GTK_MAJOR_VERSION < 2
 		if(pixmap)
 			gtk_clist_set_pixmap(GTK_CLIST(clist), row, column, pixmap, bitmap);
+#endif
 	}
 	else if(flag & DW_CFA_STRING)
 	{
 		char *tmp = *((char **)data);
 		gtk_clist_set_text(GTK_CLIST(clist), row, column, tmp);
 	pixmap->width = width; pixmap->height = height;
 	DW_MUTEX_LOCK;
 	pixmap->handle = handle;
-#ifdef USE_PIXBUF
+#if GTK_MAJOR_VERSION > 1
 	pixmap->pixmap = (GdkPixmap *)gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, depth, width, height);
 #else
 	pixmap->pixmap = gdk_pixmap_new(handle->window, width, height, depth);
 #endif
 	DW_MUTEX_UNLOCK;
 	DW_MUTEX_LOCK;
 	pixmap->pixmap = _find_pixmap(&bitmap, id, handle);
 	if(pixmap->pixmap)
 	{
+#if GTK_MAJOR_VERSION < 2
 		GdkPixmapPrivate *pvt = (GdkPixmapPrivate *)pixmap->pixmap;
 		pixmap->width = pvt->width; pixmap->height = pvt->height;
+#else
+		pixmap->width = gdk_pixbuf_get_width((GdkPixbuf *)pixmap->pixmap);
+		pixmap->height = gdk_pixbuf_get_height((GdkPixbuf *)pixmap->pixmap);
+#endif
 	}
 	DW_MUTEX_UNLOCK;
 	return pixmap;
 }
 void dw_pixmap_destroy(HPIXMAP pixmap)
 {
 	int _locked_by_me = FALSE;
 	DW_MUTEX_LOCK;
-#ifdef USE_PIXBUF
+#if GTK_MAJOR_VERSION > 1
 	gdk_pixbuf_unref((GdkPixbuf *)pixmap->pixmap);
 #else
 	gdk_pixmap_unref(pixmap->pixmap);
 #endif
 	free(pixmap);
 	DW_MUTEX_LOCK;
 	if(dest)
 		gc = _set_colors(dest->window);
 	else if(src)
 		gc = _set_colors(src->window);
-#ifndef USE_PIXBUF
+#if GTK_MAJOR_VERSION < 1
 	else if(destp)
 		gc = gdk_gc_new(destp->pixmap);
 	else if(srcp)
 		gc = gdk_gc_new(srcp->pixmap);
 #endif
 	if(gc
-#ifdef USE_PIXBUF
+#if GTK_MAJOR_VERSION > 2
 || (!dest && !src)
 #endif
 	  )
 	{
-#ifndef USE_PIXBUF
+#if GTK_MAJOR_VERSION < 1
 		gdk_draw_pixmap(dest ? dest->window : destp->pixmap, gc, src ? src->window : srcp->pixmap, xsrc, ysrc, xdest, ydest, width, height);
 #else
-if(dest && srcp)
+		if(dest && srcp)
-			gdk_pixbuf_xlib_render_to_drawable(dest->window, gc, (GdkPixbuf *)srcp->pixmap, xsrc, ysrc, xdest, ydest, width, height, XLIB_RGB_DITHER_NONE, 0, 0);
+			gdk_pixbuf_render_to_drawable((GdkPixbuf *)srcp->pixmap, dest->window, gc, xsrc, ysrc, xdest, ydest, width, height, GDK_RGB_DITHER_NONE, 0, 0);
-if(gc)
+		if(gc)
 #endif
 			gdk_gc_unref(gc);
 	}
 	DW_MUTEX_UNLOCK;
 }
 }
 /* Reposition the bar according to the percentage */
 gint _splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data)
 {
-	int percent = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent");
+	float *percent = (float *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent");
 	int lastwidth = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastwidth");
 	int lastheight = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastheight");
-	float ratio = ((float)percent/100.0);
 	/* Prevent infinite recursion ;) */
-	if(lastwidth == event->width && lastheight == event->height)
+	if(!percent || (lastwidth == event->width && lastheight == event->height))
 		return TRUE;
 	lastwidth = event->width; lastheight = event->height;
-	gtk_object_set_data(GTK_OBJECT(widget), "_dw_splitbar_sizing", (gpointer)1);
 	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 * ratio));
+		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 * ratio));
+		gtk_paned_set_position(GTK_PANED(widget), (int)(event->height * (*percent / 100.0)));
 	return TRUE;
 }
+#if GTK_MAJOR_VERSION == 2
 /* Figure out the new percentage */
-gint _splitbar_child_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data)
+gint _splitbar_accept_position(GtkWidget *widget, gpointer data)
 {
-	GtkWidget *splitbar = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_splitbar");
+	float *percent = (float *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent");
-	int percent;
+	int size = 0, position = gtk_paned_get_position(GTK_PANED(widget));
-	if(!splitbar)
+	if(!percent)
-		return TRUE;
-	if(gtk_object_get_data(GTK_OBJECT(splitbar), "_dw_splitbar_sizing"))
-	{
-		gtk_object_set_data(GTK_OBJECT(splitbar), "_dw_splitbar_sizing", (gpointer)0);
 		return TRUE;
-	}
+	if(GTK_IS_VPANED(widget))
-	if(GTK_IS_VPANED(splitbar))
+		size = widget->allocation.height;
-		percent = (int)((event->height * 100) / (splitbar->allocation.height - 3));
+	else if(GTK_IS_HPANED(widget))
-	else if(GTK_IS_HPANED(splitbar))
+		size = widget->allocation.width;
-		percent = (int)((event->width * 100) / (splitbar->allocation.width - 3));
-	else
+	if(size > 0)
-		return TRUE;
+		*percent = ((float)(position * 100) / (float)size);
-	gtk_object_set_data(GTK_OBJECT(splitbar), "_dw_percent", (gpointer)percent);
 	return TRUE;
 }
+#endif
 /*
 * Creates a splitbar window (widget) with given parameters.
 * Parameters:
 *       type: Value can be BOXVERT or BOXHORZ.
 */
 HWND dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id)
 {
 	GtkWidget *tmp = NULL;
 	int _locked_by_me = FALSE;
+	float *percent = malloc(sizeof(float));
 	DW_MUTEX_LOCK;
 	if(type == BOXHORZ)
 		tmp = gtk_hpaned_new();
 	else
 		tmp = gtk_vpaned_new();
 	gtk_paned_add1(GTK_PANED(tmp), topleft);
 	gtk_paned_add2(GTK_PANED(tmp), bottomright);
 	gtk_object_set_data(GTK_OBJECT(tmp), "id", (gpointer)id);
-	gtk_object_set_data(GTK_OBJECT(tmp), "_dw_percent", (gpointer)50);
+	*percent = 50.0;
+	gtk_object_set_data(GTK_OBJECT(tmp), "_dw_percent", (gpointer)percent);
+	gtk_object_set_data(GTK_OBJECT(topleft), "_dw_splitbar", (gpointer)tmp);
 	gtk_signal_connect(GTK_OBJECT(tmp), "size-allocate", GTK_SIGNAL_FUNC(_splitbar_size_allocate), NULL);
-	gtk_object_set_data(GTK_OBJECT(topleft), "_dw_splitbar", (gpointer)tmp);
+#if GTK_MAJOR_VERSION > 1
-#if 0
+	gtk_signal_connect(GTK_OBJECT(tmp), "accept-position", GTK_SIGNAL_FUNC(_splitbar_accept_position), NULL);
-	gtk_signal_connect(GTK_OBJECT(topleft), "size-allocate", GTK_SIGNAL_FUNC(_splitbar_child_size_allocate), NULL);
+#else
+	gtk_paned_set_handle_size(GTK_PANED(tmp), 3);
 #endif
-	gtk_paned_set_handle_size(GTK_PANED(tmp), 3);
 	gtk_widget_show(tmp);
 	DW_MUTEX_UNLOCK;
 	return tmp;
 }
 /*
 * Sets the position of a splitbar (pecentage).
 * Parameters:
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
-void dw_splitbar_set(HWND handle, int percent)
+void dw_splitbar_set(HWND handle, float percent)
 {
 	/* We probably need to force a redraw here */
-	dw_window_set_data(handle, "_dw_percent", (void *)percent);
+	float *mypercent = (float *)dw_window_get_data(handle, "_dw_percent");
+	if(mypercent)
+		*mypercent = percent;
 }
 /*
 * Gets the position of a splitbar (pecentage).
 * Parameters:
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
-int dw_splitbar_get(HWND handle)
+float dw_splitbar_get(HWND handle)
 {
-	return (int)dw_window_get_data(handle, "_dw_percent");
+	float *percent = (float *)dw_window_get_data(handle, "_dw_percent");
+	if(percent)
+		return *percent;
+	return 0.0;
 }
 /*
 * Pack windows (widgets) into a box from the start (or top).
 * Parameters:
 }
 /* Internal function to handle the file OK press */
 void _gtk_file_ok(GtkWidget *widget, DWDialog *dwwait)
 {
+#if GTK_MAJOR_VERSION > 1
+	const char *tmp;
+#else
 	char *tmp;
+#endif
 	if(!dwwait)
 		return;
 	tmp = gtk_file_selection_get_filename(GTK_FILE_SELECTION(dwwait->data));

Mercurial > dwindows

comparison gtk/dw.c @ 120:7d2108cbcd3e