Commit 084729ac authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Change some function names to be longer and better.

2006-05-31  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprintcontext.h:
	* gtk/gtkprintcontext.c:
	* gtk/gtkprintoperation.c:
	* gtk/gtkprintoperation-unix.c: Change some function names to be
	longer and better.
	gtk_print_context_get_cairo -> gtk_print_context_get_cairo_context
	gtk_print_context_get_fontmap -> gtk_print_context_get_pango_fontmap
	gtk_print_context_create_context -> gtk_print_context_create_pango_context
	gtk_print_context_create_layout -> gtk_print_context_create_pango_layout
	Update all callers.
parent c6a99eea
2006-05-31 Matthias Clasen <mclasen@redhat.com> 2006-05-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintcontext.h:
* gtk/gtkprintcontext.c:
* gtk/gtkprintoperation.c:
* gtk/gtkprintoperation-unix.c: Change some function names to be
longer and better.
gtk_print_context_get_cairo -> gtk_print_context_get_cairo_context
gtk_print_context_get_fontmap -> gtk_print_context_get_pango_fontmap
gtk_print_context_create_context -> gtk_print_context_create_pango_context
gtk_print_context_create_layout -> gtk_print_context_create_pango_layout
Update all callers.
* gtk/gtkpagesetupunixdialog.c: Don't run the custom page * gtk/gtkpagesetupunixdialog.c: Don't run the custom page
size dialog. (#340444, Christian Persch) size dialog. (#340444, Christian Persch)
......
2006-05-31 Matthias Clasen <mclasen@redhat.com> 2006-05-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintcontext.h:
* gtk/gtkprintcontext.c:
* gtk/gtkprintoperation.c:
* gtk/gtkprintoperation-unix.c: Change some function names to be
longer and better.
gtk_print_context_get_cairo -> gtk_print_context_get_cairo_context
gtk_print_context_get_fontmap -> gtk_print_context_get_pango_fontmap
gtk_print_context_create_context -> gtk_print_context_create_pango_context
gtk_print_context_create_layout -> gtk_print_context_create_pango_layout
Update all callers.
* gtk/gtkpagesetupunixdialog.c: Don't run the custom page * gtk/gtkpagesetupunixdialog.c: Don't run the custom page
size dialog. (#340444, Christian Persch) size dialog. (#340444, Christian Persch)
......
...@@ -209,7 +209,7 @@ _gtk_print_context_set_page_setup (GtkPrintContext *context, ...@@ -209,7 +209,7 @@ _gtk_print_context_set_page_setup (GtkPrintContext *context,
} }
/** /**
* gtk_print_context_get_cairo: * gtk_print_context_get_cairo_context:
* @context: a #GtkPrintContext * @context: a #GtkPrintContext
* *
* Obtains the cairo context that is associated with the * Obtains the cairo context that is associated with the
...@@ -220,7 +220,7 @@ _gtk_print_context_set_page_setup (GtkPrintContext *context, ...@@ -220,7 +220,7 @@ _gtk_print_context_set_page_setup (GtkPrintContext *context,
* Since: 2.10 * Since: 2.10
*/ */
cairo_t * cairo_t *
gtk_print_context_get_cairo (GtkPrintContext *context) gtk_print_context_get_cairo_context (GtkPrintContext *context)
{ {
g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL); g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL);
...@@ -343,7 +343,7 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context) ...@@ -343,7 +343,7 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context)
} }
/** /**
* gtk_print_context_get_fontmap: * gtk_print_context_get_pango_fontmap:
* @context: a #GtkPrintContext * @context: a #GtkPrintContext
* *
* Returns a #PangoFontMap that is suitable for use * Returns a #PangoFontMap that is suitable for use
...@@ -354,7 +354,7 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context) ...@@ -354,7 +354,7 @@ gtk_print_context_get_dpi_y (GtkPrintContext *context)
* Since: 2.10 * Since: 2.10
*/ */
PangoFontMap * PangoFontMap *
gtk_print_context_get_fontmap (GtkPrintContext *context) gtk_print_context_get_pango_fontmap (GtkPrintContext *context)
{ {
g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL); g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL);
...@@ -362,7 +362,7 @@ gtk_print_context_get_fontmap (GtkPrintContext *context) ...@@ -362,7 +362,7 @@ gtk_print_context_get_fontmap (GtkPrintContext *context)
} }
/** /**
* gtk_print_context_create_context: * gtk_print_context_create_pango_context:
* @context: a #GtkPrintContext * @context: a #GtkPrintContext
* *
* Creates a new #PangoContext that can be used with the * Creates a new #PangoContext that can be used with the
...@@ -373,7 +373,7 @@ gtk_print_context_get_fontmap (GtkPrintContext *context) ...@@ -373,7 +373,7 @@ gtk_print_context_get_fontmap (GtkPrintContext *context)
* Since: 2.10 * Since: 2.10
*/ */
PangoContext * PangoContext *
gtk_print_context_create_context (GtkPrintContext *context) gtk_print_context_create_pango_context (GtkPrintContext *context)
{ {
PangoContext *pango_context; PangoContext *pango_context;
...@@ -385,7 +385,7 @@ gtk_print_context_create_context (GtkPrintContext *context) ...@@ -385,7 +385,7 @@ gtk_print_context_create_context (GtkPrintContext *context)
} }
/** /**
* gtk_print_context_create_layout: * gtk_print_context_create_pango_layout:
* @context: a #GtkPrintContext * @context: a #GtkPrintContext
* *
* Creates a new #PangoLayout that is suitable for use * Creates a new #PangoLayout that is suitable for use
...@@ -396,14 +396,14 @@ gtk_print_context_create_context (GtkPrintContext *context) ...@@ -396,14 +396,14 @@ gtk_print_context_create_context (GtkPrintContext *context)
* Since: 2.10 * Since: 2.10
*/ */
PangoLayout * PangoLayout *
gtk_print_context_create_layout (GtkPrintContext *context) gtk_print_context_create_pango_layout (GtkPrintContext *context)
{ {
PangoContext *pango_context; PangoContext *pango_context;
PangoLayout *layout; PangoLayout *layout;
g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL); g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), NULL);
pango_context = gtk_print_context_create_context (context); pango_context = gtk_print_context_create_pango_context (context);
layout = pango_layout_new (pango_context); layout = pango_layout_new (pango_context);
pango_cairo_update_context (context->cr, pango_context); pango_cairo_update_context (context->cr, pango_context);
......
...@@ -38,7 +38,7 @@ GType gtk_print_context_get_type (void) G_GNUC_CONST; ...@@ -38,7 +38,7 @@ GType gtk_print_context_get_type (void) G_GNUC_CONST;
/* Rendering */ /* Rendering */
cairo_t * gtk_print_context_get_cairo (GtkPrintContext *context); cairo_t *gtk_print_context_get_cairo_context (GtkPrintContext *context);
GtkPageSetup *gtk_print_context_get_page_setup (GtkPrintContext *context); GtkPageSetup *gtk_print_context_get_page_setup (GtkPrintContext *context);
gdouble gtk_print_context_get_width (GtkPrintContext *context); gdouble gtk_print_context_get_width (GtkPrintContext *context);
...@@ -47,9 +47,9 @@ gdouble gtk_print_context_get_dpi_x (GtkPrintContext *context); ...@@ -47,9 +47,9 @@ gdouble gtk_print_context_get_dpi_x (GtkPrintContext *context);
gdouble gtk_print_context_get_dpi_y (GtkPrintContext *context); gdouble gtk_print_context_get_dpi_y (GtkPrintContext *context);
/* Fonts */ /* Fonts */
PangoFontMap *gtk_print_context_get_fontmap (GtkPrintContext *context); PangoFontMap *gtk_print_context_get_pango_fontmap (GtkPrintContext *context);
PangoContext *gtk_print_context_create_context (GtkPrintContext *context); PangoContext *gtk_print_context_create_pango_context (GtkPrintContext *context);
PangoLayout * gtk_print_context_create_layout (GtkPrintContext *context); PangoLayout *gtk_print_context_create_pango_layout (GtkPrintContext *context);
G_END_DECLS G_END_DECLS
......
...@@ -85,7 +85,7 @@ unix_end_page (GtkPrintOperation *op, ...@@ -85,7 +85,7 @@ unix_end_page (GtkPrintOperation *op,
{ {
cairo_t *cr; cairo_t *cr;
cr = gtk_print_context_get_cairo (print_context); cr = gtk_print_context_get_cairo_context (print_context);
cairo_show_page (cr); cairo_show_page (cr);
} }
......
...@@ -376,7 +376,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) ...@@ -376,7 +376,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
* *
* Gets emitted for every page that is printed. The signal handler * Gets emitted for every page that is printed. The signal handler
* must render the @page_nr's page onto the cairo context obtained * must render the @page_nr's page onto the cairo context obtained
* from @context using gtk_print_context_get_cairo(). * from @context using gtk_print_context_get_cairo_context().
* *
* <informalexample><programlisting> * <informalexample><programlisting>
* FIXME: need an example here * FIXME: need an example here
...@@ -1413,7 +1413,7 @@ pdf_end_page (GtkPrintOperation *op, ...@@ -1413,7 +1413,7 @@ pdf_end_page (GtkPrintOperation *op,
{ {
cairo_t *cr; cairo_t *cr;
cr = gtk_print_context_get_cairo (print_context); cr = gtk_print_context_get_cairo_context (print_context);
cairo_show_page (cr); cairo_show_page (cr);
} }
...@@ -1717,7 +1717,7 @@ print_pages_idle (gpointer user_data) ...@@ -1717,7 +1717,7 @@ print_pages_idle (gpointer user_data)
_gtk_print_context_set_page_setup (data->print_context, page_setup); _gtk_print_context_set_page_setup (data->print_context, page_setup);
data->op->priv->start_page (data->op, data->print_context, page_setup); data->op->priv->start_page (data->op, data->print_context, page_setup);
cr = gtk_print_context_get_cairo (data->print_context); cr = gtk_print_context_get_cairo_context (data->print_context);
cairo_save (cr); cairo_save (cr);
if (priv->manual_scale != 100.0) if (priv->manual_scale != 100.0)
......
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