summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLog.pre-2-1012
-rw-r--r--ChangeLog.pre-2-212
-rw-r--r--ChangeLog.pre-2-412
-rw-r--r--ChangeLog.pre-2-612
-rw-r--r--ChangeLog.pre-2-812
-rw-r--r--gdk/win32/gdkimage-win32.c14
-rw-r--r--gdk/win32/gdkpixmap-win32.c59
-rw-r--r--gdk/win32/gdkprivate-win32.h12
-rw-r--r--gdk/win32/gdkwindow-win32.c2
10 files changed, 118 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index 240a2dd69..68b1663e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-12-11 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new,
+ gdk_bitmap_create_from_data, gdk_pixmap_create_from_data)
+ * gdk/win32/gdkprivate-win32.h
+ * gdk/win32/gdkimage-win32.c (_gdk_win32_setup_pixmap_image):
+ Functions now take a GdkDrawable instead of GdkWindow parameter,
+ like in X11 and linux-fb backends (#100780)
+
+ * gdk/win32/gdkwindow-win32.c (get_default_title): Do use
+ g_get_application_name() (I now have a fresh enough GLib).
+
Wed Dec 11 14:04:23 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: version 2.1.4, interface age 1.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 240a2dd69..68b1663e5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2002-12-11 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new,
+ gdk_bitmap_create_from_data, gdk_pixmap_create_from_data)
+ * gdk/win32/gdkprivate-win32.h
+ * gdk/win32/gdkimage-win32.c (_gdk_win32_setup_pixmap_image):
+ Functions now take a GdkDrawable instead of GdkWindow parameter,
+ like in X11 and linux-fb backends (#100780)
+
+ * gdk/win32/gdkwindow-win32.c (get_default_title): Do use
+ g_get_application_name() (I now have a fresh enough GLib).
+
Wed Dec 11 14:04:23 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: version 2.1.4, interface age 1.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 240a2dd69..68b1663e5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+2002-12-11 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new,
+ gdk_bitmap_create_from_data, gdk_pixmap_create_from_data)
+ * gdk/win32/gdkprivate-win32.h
+ * gdk/win32/gdkimage-win32.c (_gdk_win32_setup_pixmap_image):
+ Functions now take a GdkDrawable instead of GdkWindow parameter,
+ like in X11 and linux-fb backends (#100780)
+
+ * gdk/win32/gdkwindow-win32.c (get_default_title): Do use
+ g_get_application_name() (I now have a fresh enough GLib).
+
Wed Dec 11 14:04:23 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: version 2.1.4, interface age 1.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 240a2dd69..68b1663e5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+2002-12-11 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new,
+ gdk_bitmap_create_from_data, gdk_pixmap_create_from_data)
+ * gdk/win32/gdkprivate-win32.h
+ * gdk/win32/gdkimage-win32.c (_gdk_win32_setup_pixmap_image):
+ Functions now take a GdkDrawable instead of GdkWindow parameter,
+ like in X11 and linux-fb backends (#100780)
+
+ * gdk/win32/gdkwindow-win32.c (get_default_title): Do use
+ g_get_application_name() (I now have a fresh enough GLib).
+
Wed Dec 11 14:04:23 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: version 2.1.4, interface age 1.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 240a2dd69..68b1663e5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2002-12-11 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new,
+ gdk_bitmap_create_from_data, gdk_pixmap_create_from_data)
+ * gdk/win32/gdkprivate-win32.h
+ * gdk/win32/gdkimage-win32.c (_gdk_win32_setup_pixmap_image):
+ Functions now take a GdkDrawable instead of GdkWindow parameter,
+ like in X11 and linux-fb backends (#100780)
+
+ * gdk/win32/gdkwindow-win32.c (get_default_title): Do use
+ g_get_application_name() (I now have a fresh enough GLib).
+
Wed Dec 11 14:04:23 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: version 2.1.4, interface age 1.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 240a2dd69..68b1663e5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2002-12-11 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new,
+ gdk_bitmap_create_from_data, gdk_pixmap_create_from_data)
+ * gdk/win32/gdkprivate-win32.h
+ * gdk/win32/gdkimage-win32.c (_gdk_win32_setup_pixmap_image):
+ Functions now take a GdkDrawable instead of GdkWindow parameter,
+ like in X11 and linux-fb backends (#100780)
+
+ * gdk/win32/gdkwindow-win32.c (get_default_title): Do use
+ g_get_application_name() (I now have a fresh enough GLib).
+
Wed Dec 11 14:04:23 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: version 2.1.4, interface age 1.
diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 9f4f6784f..8f3da52b0 100644
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -105,19 +105,19 @@ _gdk_image_exit (void)
}
GdkImage *
-_gdk_win32_setup_pixmap_image (GdkPixmap *pixmap,
- GdkWindow *window,
- gint width,
- gint height,
- gint depth,
- guchar *bits)
+_gdk_win32_setup_pixmap_image (GdkPixmap *pixmap,
+ GdkDrawable *drawable,
+ gint width,
+ gint height,
+ gint depth,
+ guchar *bits)
{
GdkImage *image;
image = g_object_new (gdk_image_get_type (), NULL);
image->windowing_data = pixmap;
image->type = GDK_IMAGE_SHARED;
- image->visual = gdk_drawable_get_visual (window);
+ image->visual = gdk_drawable_get_visual (drawable);
image->byte_order = GDK_LSB_FIRST;
image->width = width;
image->height = height;
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index 2113c405e..00f090fd5 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -129,10 +129,10 @@ gdk_pixmap_impl_win32_get_size (GdkDrawable *drawable,
}
GdkPixmap*
-gdk_pixmap_new (GdkWindow *window,
- gint width,
- gint height,
- gint depth)
+gdk_pixmap_new (GdkDrawable *drawable,
+ gint width,
+ gint height,
+ gint depth)
{
struct {
BITMAPINFOHEADER bmiHeader;
@@ -155,22 +155,22 @@ gdk_pixmap_new (GdkWindow *window,
gint i;
gint window_depth;
- g_return_val_if_fail (window == NULL || GDK_IS_DRAWABLE (window), NULL);
- g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
+ g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
+ g_return_val_if_fail ((drawable != NULL) || (depth != -1), NULL);
g_return_val_if_fail ((width != 0) && (height != 0), NULL);
- if (!window)
- window = _gdk_parent_root;
+ if (!drawable)
+ drawable = _gdk_parent_root;
- if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window))
+ if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
return NULL;
- window_depth = gdk_drawable_get_depth (GDK_DRAWABLE (window));
+ window_depth = gdk_drawable_get_depth (GDK_DRAWABLE (drawable));
if (depth == -1)
depth = window_depth;
- GDK_NOTE (PIXMAP, g_print ("gdk_pixmap_new: %dx%dx%d window=%p\n",
- width, height, depth, window));
+ GDK_NOTE (PIXMAP, g_print ("gdk_pixmap_new: %dx%dx%d drawable=%p\n",
+ width, height, depth, drawable));
pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
drawable_impl = GDK_DRAWABLE_IMPL_WIN32 (GDK_PIXMAP_OBJECT (pixmap)->impl);
@@ -184,13 +184,13 @@ gdk_pixmap_new (GdkWindow *window,
if (depth == window_depth)
{
- cmap = gdk_drawable_get_colormap (window);
+ cmap = gdk_drawable_get_colormap (drawable);
if (cmap)
gdk_drawable_set_colormap (pixmap, cmap);
}
- if (GDK_IS_WINDOW (window))
- hwnd = GDK_WINDOW_HWND (window);
+ if (GDK_IS_WINDOW (drawable))
+ hwnd = GDK_WINDOW_HWND (drawable);
else
hwnd = GDK_WINDOW_HWND (_gdk_parent_root);
if ((hdc = GetDC (hwnd)) == NULL)
@@ -305,7 +305,7 @@ gdk_pixmap_new (GdkWindow *window,
}
drawable_impl->handle = hbitmap;
- pixmap_impl->image = _gdk_win32_setup_pixmap_image (pixmap, window,
+ pixmap_impl->image = _gdk_win32_setup_pixmap_image (pixmap, drawable,
width, height,
depth, bits);
@@ -350,7 +350,7 @@ static unsigned char mirror[256] = {
};
GdkPixmap *
-gdk_bitmap_create_from_data (GdkWindow *window,
+gdk_bitmap_create_from_data (GdkDrawable *drawable,
const gchar *data,
gint width,
gint height)
@@ -362,15 +362,15 @@ gdk_bitmap_create_from_data (GdkWindow *window,
g_return_val_if_fail (data != NULL, NULL);
g_return_val_if_fail ((width != 0) && (height != 0), NULL);
- g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
+ g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
- if (!window)
- window = _gdk_parent_root;
+ if (!drawable)
+ drawable = _gdk_parent_root;
- if (GDK_WINDOW_DESTROYED (window))
+ if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
return NULL;
- pixmap = gdk_pixmap_new (window, width, height, 1);
+ pixmap = gdk_pixmap_new (drawable, width, height, 1);
if (pixmap == NULL)
return NULL;
@@ -391,7 +391,7 @@ gdk_bitmap_create_from_data (GdkWindow *window,
}
GdkPixmap*
-gdk_pixmap_create_from_data (GdkWindow *window,
+gdk_pixmap_create_from_data (GdkDrawable *drawable,
const gchar *data,
gint width,
gint height,
@@ -410,11 +410,18 @@ gdk_pixmap_create_from_data (GdkWindow *window,
GdkPixmap *source;
GdkGC *gc;
- if (GDK_WINDOW_DESTROYED (window))
+ g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
+ g_return_val_if_fail (data != NULL, NULL);
+ g_return_val_if_fail (fg != NULL, NULL);
+ g_return_val_if_fail (bg != NULL, NULL);
+ g_return_val_if_fail ((drawable != NULL) || (depth != -1), NULL);
+ g_return_val_if_fail ((width != 0) && (height != 0), NULL);
+
+ if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
return NULL;
- result = gdk_pixmap_new (window, width, height, depth);
- source = gdk_bitmap_create_from_data (window, data, width, height);
+ result = gdk_pixmap_new (drawable, width, height, depth);
+ source = gdk_bitmap_create_from_data (drawable, data, width, height);
gc = gdk_gc_new (result);
gdk_gc_set_foreground (gc, fg);
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index bf0ba5f17..c81663455 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -337,12 +337,12 @@ GdkImage *_gdk_win32_copy_to_image (GdkDrawable *drawable,
gint width,
gint height);
-GdkImage *_gdk_win32_setup_pixmap_image (GdkPixmap *pixmap,
- GdkWindow *window,
- gint width,
- gint height,
- gint depth,
- guchar *bits);
+GdkImage *_gdk_win32_setup_pixmap_image (GdkPixmap *pixmap,
+ GdkDrawable *drawable,
+ gint width,
+ gint height,
+ gint depth,
+ guchar *bits);
void _gdk_win32_blit (gboolean use_fg_bg,
GdkDrawableImplWin32 *drawable,
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 6c01d60e1..30728f93c 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -253,10 +253,8 @@ static const gchar *
get_default_title (void)
{
const char *title;
-#if 0 /* So that we can build with GLib 2.0... */
title = g_get_application_name ();
if (!title)
-#endif
title = g_get_prgname ();
return title;
View Lorry Controller Status