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

scale: Drop unneeded private exports

Browse Source 
Nobody outside gtkscale.c is using these functions, so make
them static.
This commit is contained in:
Matthias Clasen 2015-09-19 11:33:38 -04:00
parent 442ad755d4
commit ea241c691c
3 changed files with 32 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/Makefile.am
View File

@ -365,7 +365,6 @@ gtk_private_h_sources = \
gtkcolorswatchprivate.h \ gtkcolorswatchprivate.h \
gtkcoloreditorprivate.h \ gtkcoloreditorprivate.h \
gtkcolorplaneprivate.h \ gtkcolorplaneprivate.h \
gtkcolorscaleprivate.h \
gtkcolorchooserprivate.h \ gtkcolorchooserprivate.h \
gtkcomboboxprivate.h \ gtkcomboboxprivate.h \
gtkcontainerprivate.h \ gtkcontainerprivate.h \

73
gtk/gtkscale.c
View File

@ -28,7 +28,6 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkscaleprivate.h"
#include "gtkrangeprivate.h" #include "gtkrangeprivate.h"
#include "gtkadjustment.h" #include "gtkadjustment.h"
@ -162,6 +161,12 @@ static void gtk_scale_buildable_custom_finished (GtkBuildable *buildable,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer user_data); gpointer user_data);
static void gtk_scale_clear_layout (GtkScale *scale);
static void gtk_scale_get_value_size (GtkScale *scale,
gint *width,
gint *height);
static gchar * gtk_scale_format_value (GtkScale *scale,
gdouble value);
G_DEFINE_TYPE_WITH_CODE (GtkScale, gtk_scale, GTK_TYPE_RANGE, G_DEFINE_TYPE_WITH_CODE (GtkScale, gtk_scale, GTK_TYPE_RANGE,
@ -229,7 +234,7 @@ gtk_scale_update_style (GtkScale *scale)
NULL); NULL);
gtk_range_set_min_slider_size (range, slider_length); gtk_range_set_min_slider_size (range, slider_length);
_gtk_scale_clear_layout (scale); gtk_scale_clear_layout (scale);
} }
#define add_slider_binding(binding_set, keyval, mask, scroll) \ #define add_slider_binding(binding_set, keyval, mask, scroll) \
@ -661,7 +666,7 @@ gtk_scale_set_digits (GtkScale *scale,
if (priv->draw_value) if (priv->draw_value)
gtk_range_set_round_digits (range, digits); gtk_range_set_round_digits (range, digits);
_gtk_scale_clear_layout (scale); gtk_scale_clear_layout (scale);
gtk_widget_queue_resize (GTK_WIDGET (scale)); gtk_widget_queue_resize (GTK_WIDGET (scale));
g_object_notify_by_pspec (G_OBJECT (scale), properties[PROP_DIGITS]); g_object_notify_by_pspec (G_OBJECT (scale), properties[PROP_DIGITS]);
@ -712,7 +717,7 @@ gtk_scale_set_draw_value (GtkScale *scale,
else else
gtk_range_set_round_digits (GTK_RANGE (scale), -1); gtk_range_set_round_digits (GTK_RANGE (scale), -1);
_gtk_scale_clear_layout (scale); gtk_scale_clear_layout (scale);
gtk_widget_queue_resize (GTK_WIDGET (scale)); gtk_widget_queue_resize (GTK_WIDGET (scale));
@ -808,7 +813,7 @@ gtk_scale_set_value_pos (GtkScale *scale,
priv->value_pos = pos; priv->value_pos = pos;
widget = GTK_WIDGET (scale); widget = GTK_WIDGET (scale);
_gtk_scale_clear_layout (scale); gtk_scale_clear_layout (scale);
if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget)) if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget))
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
@ -845,7 +850,7 @@ gtk_scale_get_range_border (GtkRange *range,
scale = GTK_SCALE (range); scale = GTK_SCALE (range);
priv = scale->priv; priv = scale->priv;
_gtk_scale_get_value_size (scale, &w, &h); gtk_scale_get_value_size (scale, &w, &h);
border->left = 0; border->left = 0;
border->right = 0; border->right = 0;
@ -902,11 +907,10 @@ gtk_scale_get_range_border (GtkRange *range,
} }
} }
/* FIXME this could actually be static at the moment. */ static void
void gtk_scale_get_value_size (GtkScale *scale,
_gtk_scale_get_value_size (GtkScale *scale, gint *width,
gint *width, gint *height)
gint *height)
{ {
GtkScalePrivate *priv = scale->priv; GtkScalePrivate *priv = scale->priv;
GtkRange *range; GtkRange *range;
@ -923,7 +927,7 @@ _gtk_scale_get_value_size (GtkScale *scale,
layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL); layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
adjustment = gtk_range_get_adjustment (range); adjustment = gtk_range_get_adjustment (range);
txt = _gtk_scale_format_value (scale, gtk_adjustment_get_lower (adjustment)); txt = gtk_scale_format_value (scale, gtk_adjustment_get_lower (adjustment));
pango_layout_set_text (layout, txt, -1); pango_layout_set_text (layout, txt, -1);
g_free (txt); g_free (txt);
@ -934,7 +938,7 @@ _gtk_scale_get_value_size (GtkScale *scale,
if (height) if (height)
*height = logical_rect.height; *height = logical_rect.height;
txt = _gtk_scale_format_value (scale, gtk_adjustment_get_upper (adjustment)); txt = gtk_scale_format_value (scale, gtk_adjustment_get_upper (adjustment));
pango_layout_set_text (layout, txt, -1); pango_layout_set_text (layout, txt, -1);
g_free (txt); g_free (txt);
@ -1026,7 +1030,7 @@ static void
gtk_scale_screen_changed (GtkWidget *widget, gtk_scale_screen_changed (GtkWidget *widget,
GdkScreen *old_screen) GdkScreen *old_screen)
{ {
_gtk_scale_clear_layout (GTK_SCALE (widget)); gtk_scale_clear_layout (GTK_SCALE (widget));
} }
static void static void
@ -1382,33 +1386,24 @@ gtk_scale_real_get_layout_offsets (GtkScale *scale,
*y += allocation.y; *y += allocation.y;
} }
/** /*
* _gtk_scale_format_value:
* @scale: a #GtkScale
* @value: adjustment value
*
* Emits #GtkScale::format-value signal to format the value, * Emits #GtkScale::format-value signal to format the value,
* if no user signal handlers, falls back to a default format. * if no user signal handlers, falls back to a default format.
* *
* Returns: formatted value * Returns: formatted value
*/ */
gchar* static gchar *
_gtk_scale_format_value (GtkScale *scale, gtk_scale_format_value (GtkScale *scale,
gdouble value) gdouble value)
{ {
GtkScalePrivate *priv = scale->priv;
gchar *fmt = NULL; gchar *fmt = NULL;
g_signal_emit (scale, g_signal_emit (scale, signals[FORMAT_VALUE], 0, value, &fmt);
signals[FORMAT_VALUE],
0,
value,
&fmt);
if (fmt) if (fmt)
return fmt; return fmt;
else else
return g_strdup_printf ("%0.*f", priv->digits, value); return g_strdup_printf ("%0.*f", scale->priv->digits, value);
} }
static void static void
@ -1416,7 +1411,7 @@ gtk_scale_finalize (GObject *object)
{ {
GtkScale *scale = GTK_SCALE (object); GtkScale *scale = GTK_SCALE (object);
_gtk_scale_clear_layout (scale); gtk_scale_clear_layout (scale);
gtk_scale_clear_marks (scale); gtk_scale_clear_marks (scale);
G_OBJECT_CLASS (gtk_scale_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_scale_parent_class)->finalize (object);
@ -1453,8 +1448,8 @@ gtk_scale_get_layout (GtkScale *scale)
if (priv->draw_value) if (priv->draw_value)
{ {
txt = _gtk_scale_format_value (scale, txt = gtk_scale_format_value (scale,
gtk_adjustment_get_value (gtk_range_get_adjustment (GTK_RANGE (scale)))); gtk_adjustment_get_value (gtk_range_get_adjustment (GTK_RANGE (scale))));
pango_layout_set_text (priv->layout, txt, -1); pango_layout_set_text (priv->layout, txt, -1);
g_free (txt); g_free (txt);
} }
@ -1498,18 +1493,10 @@ gtk_scale_get_layout_offsets (GtkScale *scale,
*y = local_y; *y = local_y;
} }
void static void
_gtk_scale_clear_layout (GtkScale *scale) gtk_scale_clear_layout (GtkScale *scale)
{ {
GtkScalePrivate *priv = scale->priv; g_set_object (&scale->priv->layout, NULL);
g_return_if_fail (GTK_IS_SCALE (scale));
if (priv->layout)
{
g_object_unref (priv->layout);
priv->layout = NULL;
}
} }
static void static void

36
gtk/gtkscaleprivate.h
View File

@ -1,36 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2011 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_SCALE_PRIVATE_H__
#define __GTK_SCALE_PRIVATE_H__
#include <gtk/gtkscale.h>
G_BEGIN_DECLS
void _gtk_scale_clear_layout (GtkScale *scale);
void _gtk_scale_get_value_size (GtkScale *scale,
gint *width,
gint *height);
gchar * _gtk_scale_format_value (GtkScale *scale,
gdouble value);
G_END_DECLS
#endif /* __GTK_SCALE_PRIVATE_H__ */