callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include <stdlib.h> for getenv().

Browse Source 
2001-01-16  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().

	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.

	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
	to g_{locale,filename}_{to,from}_utf8 to match current API.

	* gtk/makefile.msc.in (gtk_OBJECTS)
	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.

	* gtk/gtk.def: Update.
This commit is contained in:
Tor Lillqvist
2001-01-15 22:12:31 +00:00
committed by Tor Lillqvist
parent 420e4ee2f7
commit 18e95c4e0f
13 changed files with 134 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdk/win32/gdkevents-win32.c
View File

@ -1622,6 +1622,7 @@ gdk_event_translate (GdkEvent *event,
window_impl = (window ? GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl) : NULL))
GdkWindow *orig_window, *new_window;
GdkColormap *colormap;
GdkColormapPrivateWin32 *colormap_private;
GdkPixmap *pixmap;
GdkPixmapImplWin32 *pixmap_impl;
@ -2595,9 +2596,11 @@ gdk_event_translate (GdkEvent *event,
if (GDK_WINDOW_DESTROYED (window))
break;
colormap_private = GDK_COLORMAP_PRIVATE_DATA (GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap);
colormap = GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap;
if (colormap)
colormap_private = GDK_COLORMAP_PRIVATE_DATA (colormap);
hdc = (HDC) msg->wParam;
if (colormap_private && colormap_private->xcolormap->rc_palette)
if (colormap && colormap_private->xcolormap->rc_palette)
{
int k;

6
gdk/win32/gdkfont-win32.c
View File

@ -224,7 +224,7 @@ logfont_to_xlfd (const LOGFONT *lfp,
/* Convert the facename Windows fives us from the locale-dependent
* codepage to UTF-8.
*/
utf8_facename = g_filename_to_utf8 (lfp->lfFaceName, NULL);
utf8_facename = g_filename_to_utf8 (lfp->lfFaceName, -1, NULL, NULL, NULL);
/* Replace characters illegal in an XLFD with hex escapes. */
p = facename;
@ -1284,7 +1284,7 @@ gdk_font_load_internal (const gchar *font_name)
logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
logfont.lfQuality = PROOF_QUALITY;
logfont.lfPitchAndFamily = DEFAULT_PITCH;
fn = g_filename_from_utf8 (font_name, NULL);
fn = g_filename_from_utf8 (font_name, -1, NULL, NULL, NULL);
strcpy (logfont.lfFaceName, fn);
g_free (fn);
}
@ -1473,7 +1473,7 @@ gdk_font_load_internal (const gchar *font_name)
logfont.lfPitchAndFamily = VARIABLE_PITCH;
else
logfont.lfPitchAndFamily = DEFAULT_PITCH;
fn = g_filename_from_utf8 (family, NULL);
fn = g_filename_from_utf8 (family, -1, NULL, NULL, NULL);
strcpy (logfont.lfFaceName, fn);
g_free (fn);
}

2
gdk/win32/gdkvisual-win32.c
View File

@ -29,6 +29,8 @@
#include "gdkvisual.h"
#include "gdkprivate-win32.h"
#include <stdlib.h>
static void gdk_visual_decompose_mask (gulong mask,
gint *shift,
gint *prec);