use GDK_DISABLE_DEPRECATED
This commit is contained in:
parent
6669d0f7f8
commit
f14741dc02
|
@ -1,7 +1,7 @@
|
||||||
CC = cl
|
CC = cl
|
||||||
LINK = link
|
LINK = link
|
||||||
CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo
|
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
|
CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins
|
||||||
CPPFLAGS = /c /MD /W0 /nologo /DWIN32
|
CPPFLAGS = /c /MD /W0 /nologo /DWIN32
|
||||||
LDFLAGS = /subsystem:windows /nologo
|
LDFLAGS = /subsystem:windows /nologo
|
||||||
|
|
|
@ -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
|
* 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
|
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.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 @@
|
@@ -42,7 +42,6 @@
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -1329,6 +1329,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe
|
||||||
#include <gtk/gtkmain.h>
|
#include <gtk/gtkmain.h>
|
||||||
#include <gtk/gtksignal.h>
|
#include <gtk/gtksignal.h>
|
||||||
#include <gtk/gtkselection.h>
|
#include <gtk/gtkselection.h>
|
||||||
|
@@ -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
|
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.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
|
+++ xchat-wdk/src/fe-text/fe-text.c 2010-09-28 14:38:39 +0000
|
||||||
|
|
Loading…
Reference in New Issue