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

Use wide-char API when available. (#311079, Peter Zelezny)

Browse Source 
2005-07-21  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
	wide-char API when available. (#311079, Peter Zelezny)
This commit is contained in:
Tor Lillqvist
2005-07-21 07:29:36 +00:00
committed by Tor Lillqvist
parent c0775d1c70
commit aa49bb5089
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,9 +1,13 @@
2005-07-21 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
wide-char API when available. (#311079, Peter Zelezny)
2005-07-21 Matthias Clasen <mclasen@redhat.com> 2005-07-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_bg, gtk_widget_modify_base): * gtk/gtkwidget.c (gtk_widget_modify_bg, gtk_widget_modify_base):
Add hints on how to handle "no window" widgets. (#136347) Add hints on how to handle "no window" widgets. (#136347)
2005-07-20 Keith Packard <keithp@keithp.com> 2005-07-20 Keith Packard <keithp@keithp.com>
* gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface): * gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):

6
ChangeLog.pre-2-10
View File

@ -1,9 +1,13 @@
2005-07-21 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
wide-char API when available. (#311079, Peter Zelezny)
2005-07-21 Matthias Clasen <mclasen@redhat.com> 2005-07-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_bg, gtk_widget_modify_base): * gtk/gtkwidget.c (gtk_widget_modify_bg, gtk_widget_modify_base):
Add hints on how to handle "no window" widgets. (#136347) Add hints on how to handle "no window" widgets. (#136347)
2005-07-20 Keith Packard <keithp@keithp.com> 2005-07-20 Keith Packard <keithp@keithp.com>
* gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface): * gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):

6
ChangeLog.pre-2-8
View File

@ -1,9 +1,13 @@
2005-07-21 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
wide-char API when available. (#311079, Peter Zelezny)
2005-07-21 Matthias Clasen <mclasen@redhat.com> 2005-07-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_bg, gtk_widget_modify_base): * gtk/gtkwidget.c (gtk_widget_modify_bg, gtk_widget_modify_base):
Add hints on how to handle "no window" widgets. (#136347) Add hints on how to handle "no window" widgets. (#136347)
2005-07-20 Keith Packard <keithp@keithp.com> 2005-07-20 Keith Packard <keithp@keithp.com>
* gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface): * gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):

23
gdk/win32/gdkwindow-win32.c
View File

@ -1723,12 +1723,12 @@ void
gdk_window_set_title (GdkWindow *window, gdk_window_set_title (GdkWindow *window,
const gchar *title) const gchar *title)
{ {
char *mbtitle;
g_return_if_fail (window != NULL);
g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (title != NULL); g_return_if_fail (title != NULL);
if (GDK_WINDOW_DESTROYED (window))
return;
/* Empty window titles not allowed, so set it to just a period. */ /* Empty window titles not allowed, so set it to just a period. */
if (!title[0]) if (!title[0])
title = "."; title = ".";
@ -1736,14 +1736,17 @@ gdk_window_set_title (GdkWindow *window,
GDK_NOTE (MISC, g_print ("gdk_window_set_title: %p: %s\n", GDK_NOTE (MISC, g_print ("gdk_window_set_title: %p: %s\n",
GDK_WINDOW_HWND (window), title)); GDK_WINDOW_HWND (window), title));
if (!GDK_WINDOW_DESTROYED (window)) if (G_WIN32_HAVE_WIDECHAR_API ())
{ {
/* As the title is in UTF-8 we must translate it wchar_t *wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL);
* to the system codepage. API_CALL (SetWindowTextW, (GDK_WINDOW_HWND (window), wtitle));
*/ g_free (wtitle);
mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL); }
API_CALL (SetWindowText, (GDK_WINDOW_HWND (window), mbtitle)); else
g_free (mbtitle); {
char *cptitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
API_CALL (SetWindowTextA, (GDK_WINDOW_HWND (window), cptitle));
g_free (cptitle);
} }
} }