summaryrefslogtreecommitdiff
path: root/gdk/win32
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2001-10-26 14:38:12 +0000
committerHans Breuer <hans@src.gnome.org>2001-10-26 14:38:12 +0000
commit11e6236bec75163e81221d694e3f91befe3753cf (patch)
tree357226a25fce08e513c25efc77f0939db2c751e6 /gdk/win32
parentec3038062876714ae1a044693a1bcb6d2fea5418 (diff)
downloadgtk+-11e6236bec75163e81221d694e3f91befe3753cf.tar.gz
updated externals
2001-10-26 Hans Breuer <hans@breuer.org> * gdk-pixbuf/gdk_pixbuf.def : * gdk/gdk.def : * gtk/gtk.def : updated externals * gdk/win32/gdkpixmap-win32.c : removed duplicate of gdk_window_lookup implementation. It already was in gdk/win32/gdkwindow-win32.c * gdk/win32/gdkproperty-win32.c : made it compile again after GdkAtom API change * gtk/gtk/makefile.msc.in : updated
Diffstat (limited to 'gdk/win32')
-rw-r--r--gdk/win32/gdkpixmap-win32.c6
-rw-r--r--gdk/win32/gdkproperty-win32.c25
2 files changed, 11 insertions, 20 deletions
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index f5e14486b0..c6b203b2ec 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -443,9 +443,3 @@ gdk_pixmap_foreign_new (GdkNativeWindow anid)
return pixmap;
}
-
-GdkWindow*
-gdk_window_lookup (GdkNativeWindow hbm)
-{
- return (GdkPixmap*) gdk_win32_handle_table_lookup (hbm);
-}
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index a6d6b31985..5f7b921967 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -94,20 +94,17 @@ gdk_atom_name (GdkAtom atom)
gchar name[256];
ATOM win32_atom;
- switch (atom)
- {
- case GDK_SELECTION_PRIMARY: return g_strdup ("PRIMARY");
- case GDK_SELECTION_SECONDARY: return g_strdup ("SECONDARY");
- case GDK_SELECTION_CLIPBOARD: return g_strdup ("CLIPBOARD");
- case GDK_SELECTION_TYPE_ATOM: return g_strdup ("ATOM");
- case GDK_SELECTION_TYPE_BITMAP: return g_strdup ("BITMAP");
- case GDK_SELECTION_TYPE_COLORMAP: return g_strdup ("COLORMAP");
- case GDK_SELECTION_TYPE_DRAWABLE: return g_strdup ("DRAWABLE");
- case GDK_SELECTION_TYPE_INTEGER: return g_strdup ("INTEGER");
- case GDK_SELECTION_TYPE_PIXMAP: return g_strdup ("PIXMAP");
- case GDK_SELECTION_TYPE_WINDOW: return g_strdup ("WINDOW");
- case GDK_SELECTION_TYPE_STRING: return g_strdup ("STRING");
- }
+ if (GDK_SELECTION_PRIMARY == atom) return g_strdup ("PRIMARY");
+ else if (GDK_SELECTION_SECONDARY == atom) return g_strdup ("SECONDARY");
+ else if (GDK_SELECTION_CLIPBOARD == atom) return g_strdup ("CLIPBOARD");
+ else if (GDK_SELECTION_TYPE_ATOM == atom) return g_strdup ("ATOM");
+ else if (GDK_SELECTION_TYPE_BITMAP == atom) return g_strdup ("BITMAP");
+ else if (GDK_SELECTION_TYPE_COLORMAP == atom) return g_strdup ("COLORMAP");
+ else if (GDK_SELECTION_TYPE_DRAWABLE == atom) return g_strdup ("DRAWABLE");
+ else if (GDK_SELECTION_TYPE_INTEGER == atom) return g_strdup ("INTEGER");
+ else if (GDK_SELECTION_TYPE_PIXMAP == atom) return g_strdup ("PIXMAP");
+ else if (GDK_SELECTION_TYPE_WINDOW == atom) return g_strdup ("WINDOW");
+ else if (GDK_SELECTION_TYPE_STRING == atom) return g_strdup ("STRING");
win32_atom = GPOINTER_TO_UINT (atom);