AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused gdk_font_charset_for_locale() function.

Browse Source 
Wed Aug 25 17:24:17 2004  Manish Singh  <yosh@gimp.org>

        * gdk/x11/gdkfont-x11.c: remove unused gdk_font_charset_for_locale()
        function.

        * gdk/x11/gdkinput-x11.c (_gdk_input_common_init): remove unused
        variables num_extensions and extensions.

        * gtk/gtkhsv.c: remove unused gtk_hsv_get_focus_gc() function.
This commit is contained in:
Manish Singh 2004-08-26 00:23:46 +00:00 committed by Manish Singh
parent e39e0b097d
commit 800574e35c
7 changed files with 41 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Wed Aug 25 17:24:17 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkfont-x11.c: remove unused gdk_font_charset_for_locale()
function.
* gdk/x11/gdkinput-x11.c (_gdk_input_common_init): remove unused
variables num_extensions and extensions.
* gtk/gtkhsv.c: remove unused gtk_hsv_get_focus_gc() function.
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org> Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize * gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Wed Aug 25 17:24:17 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkfont-x11.c: remove unused gdk_font_charset_for_locale()
function.
* gdk/x11/gdkinput-x11.c (_gdk_input_common_init): remove unused
variables num_extensions and extensions.
* gtk/gtkhsv.c: remove unused gtk_hsv_get_focus_gc() function.
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org> Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize * gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Wed Aug 25 17:24:17 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkfont-x11.c: remove unused gdk_font_charset_for_locale()
function.
* gdk/x11/gdkinput-x11.c (_gdk_input_common_init): remove unused
variables num_extensions and extensions.
* gtk/gtkhsv.c: remove unused gtk_hsv_get_focus_gc() function.
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org> Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize * gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Wed Aug 25 17:24:17 2004 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkfont-x11.c: remove unused gdk_font_charset_for_locale()
function.
* gdk/x11/gdkinput-x11.c (_gdk_input_common_init): remove unused
variables num_extensions and extensions.
* gtk/gtkhsv.c: remove unused gtk_hsv_get_focus_gc() function.
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org> Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize * gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize

37
gdk/x11/gdkfont-x11.c
View File

@ -228,43 +228,6 @@ gdk_font_load_for_display (GdkDisplay *display,
return font; return font;
} }
static char *
gdk_font_charset_for_locale (void)
{
static char *charset_map[][2] = {
{ "ANSI_X3.4-1968", "iso8859-1" },
{ "US-ASCII", "iso8859-1" },
{ "ISO-8859-1", "iso8859-1" },
{ "ISO-8859-2", "iso8859-2" },
{ "ISO-8859-3", "iso8859-3" },
{ "ISO-8859-4", "iso8859-4" },
{ "ISO-8859-5", "iso8859-5" },
{ "ISO-8859-6", "iso8859-6" },
{ "ISO-8859-7", "iso8859-7" },
{ "ISO-8859-8", "iso8859-8" },
{ "ISO-8859-9", "iso8859-9" },
{ "UTF-8", "iso8859-1" }
};
const char *codeset;
char *result = NULL;
int i;
g_get_charset (&codeset);
for (i=0; i < G_N_ELEMENTS (charset_map); i++)
if (strcmp (charset_map[i][0], codeset) == 0)
{
result = charset_map[i][1];
break;
}
if (result)
return g_strdup (result);
else
return g_strdup ("iso8859-1");
}
/** /**
* gdk_font_from_description_for_display: * gdk_font_from_description_for_display:
* @display: a #GdkDisplay * @display: a #GdkDisplay

4
gdk/x11/gdkinput-x11.c
View File

@ -383,10 +383,8 @@ gint
_gdk_input_common_init (GdkDisplay *display, _gdk_input_common_init (GdkDisplay *display,
gint include_core) gint include_core)
{ {
char **extensions;
XDeviceInfo *devices; XDeviceInfo *devices;
int num_devices; int num_devices, loop;
int num_extensions, loop;
int ignore, event_base; int ignore, event_base;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display); GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);

29
gtk/gtkhsv.c
View File

@ -110,8 +110,6 @@ static gboolean gtk_hsv_focus (GtkWidget *widget,
GtkDirectionType direction); GtkDirectionType direction);
static void gtk_hsv_move (GtkHSV *hsv, static void gtk_hsv_move (GtkHSV *hsv,
GtkDirectionType dir); GtkDirectionType dir);
static GdkGC * gtk_hsv_get_focus_gc (GtkHSV *hsv,
gint *line_width);
static guint hsv_signals[LAST_SIGNAL]; static guint hsv_signals[LAST_SIGNAL];
static GtkWidgetClass *parent_class; static GtkWidgetClass *parent_class;
@ -1778,30 +1776,3 @@ gtk_hsv_move (GtkHSV *hsv,
gtk_hsv_set_color (hsv, hue, sat, val); gtk_hsv_set_color (hsv, hue, sat, val);
} }
static GdkGC *
gtk_hsv_get_focus_gc (GtkHSV *hsv,
gint *line_width)
{
GdkGC *focus_gc;
GtkWidget *widget = GTK_WIDGET (hsv);
gint8 *dash_list;
focus_gc = gdk_gc_new (widget->window);
gdk_gc_copy (focus_gc, widget->style->fg_gc[GTK_WIDGET_STATE (widget)]);
gtk_widget_style_get (widget,
"focus-line-width", line_width,
"focus-line-pattern", (gchar *)&dash_list,
NULL);
gdk_gc_set_line_attributes (focus_gc, *line_width,
dash_list[0] ? GDK_LINE_ON_OFF_DASH : GDK_LINE_SOLID,
GDK_CAP_BUTT, GDK_JOIN_MITER);
if (dash_list[0])
gdk_gc_set_dashes (focus_gc, 0, dash_list, strlen (dash_list));
g_free (dash_list);
return focus_gc;
}