summaryrefslogtreecommitdiff
path: root/gdk/win32/gdkpixmap-win32.c
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2000-03-08 06:18:41 +0000
committerTor Lillqvist <tml@src.gnome.org>2000-03-08 06:18:41 +0000
commitec1e8f1f5d81223738e4cc3f7fddd1f84df65d7e (patch)
tree4002e4fc0bcfd8f90ec63205382fbfdc1182426e /gdk/win32/gdkpixmap-win32.c
parent960906e1e2b03ac68bf9e0cec77108448e2c3fbc (diff)
downloadgtk+-ec1e8f1f5d81223738e4cc3f7fddd1f84df65d7e.tar.gz
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function for reporting errors from GDI, for which it is no use to call GetLastError on Win9x. (gdk_other_api_failed) New function, for general error reporting without calling GetLastError. (gdk_win32_api_failed) OTOH, this function always calls GetLastError. (gdk_win32_last_error_string) Remove this function, GLib has the equivalent now. * gdk/win32/gdkprivate-win32.h: Declare the above, and macros to call them with function name, file name and line number in the arguments. * gdk/win32/*.c: Use the new macros for reporting errors from GDI functions. * gtk/gtk.def: Add some missing entry points. * gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and gtk_paned_set_gutter_size, which don't exist any longer, as void. Fixes by Hans Breuer: * gdk/makefile.msc: Update for debugging. * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or PS_DASHDOTDOT or PS_DASH styles depending on the number of entries in the dash_list. * gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in the x11 backend. * gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro. * gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
Diffstat (limited to 'gdk/win32/gdkpixmap-win32.c')
-rw-r--r--gdk/win32/gdkpixmap-win32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index bbe273c849..144ae7f40e 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -58,7 +58,7 @@ gdk_win32_pixmap_destroy (GdkPixmap *pixmap)
GDK_DRAWABLE_XID (pixmap)));
if (!DeleteObject (GDK_DRAWABLE_XID (pixmap)))
- WIN32_API_FAILED ("DeleteObject");
+ WIN32_GDI_FAILED ("DeleteObject");
gdk_xid_table_remove (GDK_DRAWABLE_XID (pixmap));
@@ -137,7 +137,7 @@ gdk_pixmap_new (GdkWindow *window,
if ((hdc = GetDC (GDK_DRAWABLE_XID (window))) == NULL)
{
- WIN32_API_FAILED ("GetDC");
+ WIN32_GDI_FAILED ("GetDC");
g_free (private);
return NULL;
}
@@ -207,7 +207,7 @@ gdk_pixmap_new (GdkWindow *window,
CreateDIBSection (hdc, (BITMAPINFO *) &bmi,
iUsage, (PVOID *) &bits, NULL, 0)) == NULL)
{
- WIN32_API_FAILED ("CreateDIBSection");
+ WIN32_GDI_FAILED ("CreateDIBSection");
ReleaseDC (GDK_DRAWABLE_XID (window), hdc);
g_free (pixmap);
return NULL;