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

take the custom tab label from gtk_print_operation_set_custom_tab_label()

Browse Source 
2007-01-13  Hans Breuer <hans@breuer.org>

	* gtk/gtkprintoperation-win32.c : take the custom tab label from
	gtk_print_operation_set_custom_tab_label() into account (bug #390746).

svn path=/trunk/; revision=17139
This commit is contained in:
Hans Breuer
2007-01-13 22:18:06 +00:00
committed by Hans Breuer
parent 3f403cde24
commit 17c60500bb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2007-01-13 Hans Breuer <hans@breuer.org> 2007-01-13 Hans Breuer <hans@breuer.org>
* gtk/gtkprintoperation-win32.c : take the custom tab label from
gtk_print_operation_set_custom_tab_label() into account (bug #390746).
* gtk/gtkimmulticontext.c : don't include "gtkprivate.h" to avoid * gtk/gtkimmulticontext.c : don't include "gtkprivate.h" to avoid
differing definitions of GTK_LOCALEDIR (bug #396175). differing definitions of GTK_LOCALEDIR (bug #396175).

13
gtk/gtkprintoperation-win32.c
View File

@ -1356,7 +1356,7 @@ create_application_page (GtkPrintOperation *op)
WORD baseunitX, baseunitY; WORD baseunitX, baseunitY;
WORD *array; WORD *array;
GtkRequisition requisition; GtkRequisition requisition;
const char *app_name; const char *tab_label;
/* Make the template the size of the custom widget size request */ /* Make the template the size of the custom widget size request */
gtk_widget_size_request (op->priv->custom_widget, &requisition); gtk_widget_size_request (op->priv->custom_widget, &requisition);
@ -1386,10 +1386,13 @@ create_application_page (GtkPrintOperation *op)
page.dwFlags = PSP_DLGINDIRECT | PSP_USETITLE | PSP_PREMATURE; page.dwFlags = PSP_DLGINDIRECT | PSP_USETITLE | PSP_PREMATURE;
page.hInstance = GetModuleHandle (NULL); page.hInstance = GetModuleHandle (NULL);
page.pResource = template; page.pResource = template;
app_name = g_get_application_name ();
if (app_name == NULL) tab_label = op->priv->custom_tab_label;
app_name = _("Application"); if (tab_label == NULL)
page.pszTitle = g_utf8_to_utf16 (app_name, tab_label = g_get_application_name ();
if (tab_label == NULL)
tab_label = _("Application");
page.pszTitle = g_utf8_to_utf16 (tab_label,
-1, NULL, NULL, NULL); -1, NULL, NULL, NULL);
page.pfnDlgProc = pageDlgProc; page.pfnDlgProc = pageDlgProc;
page.pfnCallback = NULL; page.pfnCallback = NULL;