Commit 17c60500 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

take the custom tab label from gtk_print_operation_set_custom_tab_label()

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
parent 3f403cde
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
differing definitions of GTK_LOCALEDIR (bug #396175).
......
......@@ -1356,7 +1356,7 @@ create_application_page (GtkPrintOperation *op)
WORD baseunitX, baseunitY;
WORD *array;
GtkRequisition requisition;
const char *app_name;
const char *tab_label;
/* Make the template the size of the custom widget size request */
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.hInstance = GetModuleHandle (NULL);
page.pResource = template;
app_name = g_get_application_name ();
if (app_name == NULL)
app_name = _("Application");
page.pszTitle = g_utf8_to_utf16 (app_name,
tab_label = op->priv->custom_tab_label;
if (tab_label == NULL)
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);
page.pfnDlgProc = pageDlgProc;
page.pfnCallback = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment