From f14741dc02bebca75ea88525c8dd8115fd4f19d7 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 29 Sep 2010 22:09:40 +0200 Subject: use GDK_DISABLE_DEPRECATED --- src/makeinc.skel | 2 +- xchat-wdk.patch | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/makeinc.skel b/src/makeinc.skel index a8b5933f..b640fe2d 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -1,7 +1,7 @@ CC = cl LINK = link CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo -CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DUSE_IPV6 /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp +CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DUSE_IPV6 /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins CPPFLAGS = /c /MD /W0 /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 52f472ad..16963717 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -1320,7 +1320,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat * compile-time dependency. This makes it so I don't have to hear the diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe-gtk/xtext.c --- xchat-wdk.orig/src/fe-gtk/xtext.c 2008-08-29 11:24:17 +0000 -+++ xchat-wdk/src/fe-gtk/xtext.c 2010-09-28 14:38:39 +0000 ++++ xchat-wdk/src/fe-gtk/xtext.c 2010-09-29 20:07:37 +0000 @@ -42,7 +42,6 @@ #include #include @@ -1329,6 +1329,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe #include #include #include +@@ -3834,7 +3833,7 @@ + PaintDesktop (hdc); + ReleaseDC (hwnd, hdc); + +- gdk_window_get_size (GTK_WIDGET (xtext)->window, &width, &height); ++ gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &width, &height); + img = gdk_image_get (GTK_WIDGET (xtext)->window, 0, 0, width+128, height); + xtext->pixmap = win32_tint (xtext, img, img->width, img->height); + diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.c xchat-wdk/src/fe-text/fe-text.c --- xchat-wdk.orig/src/fe-text/fe-text.c 2008-08-29 11:24:17 +0000 +++ xchat-wdk/src/fe-text/fe-text.c 2010-09-28 14:38:39 +0000 -- cgit 1.4.1