From 55ca24d1d4ffa575c8b35fe95098a8ee61bba1db Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 23 Dec 2010 22:16:50 -0500 Subject: [PATCH] Drop GtkThemeEngine It is not used anymore. --- gtk/Makefile.am | 2 - gtk/gtk.symbols | 3 - gtk/gtkrc.c | 1 - gtk/gtkstyle.c | 2 - gtk/gtkthemes.c | 194 ------------------------------------------------ gtk/gtkthemes.h | 52 ------------- 6 files changed, 254 deletions(-) delete mode 100644 gtk/gtkthemes.c delete mode 100644 gtk/gtkthemes.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2f411a58cf..a9cf1a564e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -428,7 +428,6 @@ gtk_private_h_sources = \ gtktexttagprivate.h \ gtktexttypes.h \ gtktextutil.h \ - gtkthemes.h \ gtktimeline.h \ gtktoolpaletteprivate.h \ gtktreedatalist.h \ @@ -639,7 +638,6 @@ gtk_base_c_sources = \ gtktexttypes.c \ gtktextutil.c \ gtktextview.c \ - gtkthemes.c \ gtkthemingengine.c \ gtktimeline.c \ gtktoggleaction.c \ diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index b9937bdb89..87208a8e58 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2884,9 +2884,6 @@ gtk_text_view_set_wrap_mode gtk_text_view_starts_display_line gtk_text_view_window_to_buffer_coords gtk_text_window_type_get_type G_GNUC_CONST -gtk_theme_engine_create_rc_style -gtk_theme_engine_get -gtk_theme_engine_get_type G_GNUC_CONST gtk_theming_engine_get gtk_theming_engine_get_background_color gtk_theming_engine_get_border diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 3535e16960..5e37a5606a 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -47,7 +47,6 @@ #include "gtkversion.h" #include "gtkrc.h" #include "gtkbindings.h" -#include "gtkthemes.h" #include "gtkintl.h" #include "gtkiconfactory.h" #include "gtkmain.h" diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 3bfc66422a..635bacfc63 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -35,9 +35,7 @@ #include "gtkspinbutton.h" #include "gtkstyle.h" #include "gtkwidget.h" -#include "gtkthemes.h" #include "gtkiconfactory.h" -#include "gtksettings.h" /* _gtk_settings_parse_convert() */ #include "gtkintl.h" #include "gtkdebug.h" #include "gtkspinner.h" diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c deleted file mode 100644 index 1533fa48c9..0000000000 --- a/gtk/gtkthemes.c +++ /dev/null @@ -1,194 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * Themes added by The Rasterman - * - * 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, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include -#include -#include -#include "gtkthemes.h" -#include "gtkrc.h" -#include "gtkintl.h" -#include "gtkdebug.h" - - -typedef struct _GtkThemeEngineClass GtkThemeEngineClass; - -struct _GtkThemeEngine -{ - GTypeModule parent_instance; - - GModule *library; - - void (*init) (GTypeModule *); - void (*exit) (void); - GtkRcStyle *(*create_rc_style) (); - - gchar *name; -}; - -struct _GtkThemeEngineClass -{ - GTypeModuleClass parent_class; -}; - -static GHashTable *engine_hash = NULL; - -static gboolean -gtk_theme_engine_load (GTypeModule *module) -{ - GtkThemeEngine *engine = GTK_THEME_ENGINE (module); - - gchar *engine_path; - - engine_path = gtk_rc_find_module_in_path (engine->name); - - if (!engine_path) - { - g_warning (_("Unable to locate theme engine in module_path: \"%s\","), - engine->name); - return FALSE; - } - - /* load the lib */ - - GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path)); - - engine->library = g_module_open (engine_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - g_free(engine_path); - if (!engine->library) - { - g_warning ("%s", g_module_error()); - return FALSE; - } - - /* extract symbols from the lib */ - if (!g_module_symbol (engine->library, "theme_init", - (gpointer *)&engine->init) || - !g_module_symbol (engine->library, "theme_exit", - (gpointer *)&engine->exit) || - !g_module_symbol (engine->library, "theme_create_rc_style", - (gpointer *)&engine->create_rc_style)) - { - g_warning ("%s", g_module_error()); - g_module_close (engine->library); - - return FALSE; - } - - /* call the theme's init (theme_init) function to let it */ - /* setup anything it needs to set up. */ - engine->init (module); - - return TRUE; -} - -static void -gtk_theme_engine_unload (GTypeModule *module) -{ - GtkThemeEngine *engine = GTK_THEME_ENGINE (module); - - engine->exit(); - - g_module_close (engine->library); - engine->library = NULL; - - engine->init = NULL; - engine->exit = NULL; - engine->create_rc_style = NULL; -} - -static void -gtk_theme_engine_class_init (GtkThemeEngineClass *class) -{ - GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (class); - - module_class->load = gtk_theme_engine_load; - module_class->unload = gtk_theme_engine_unload; -} - -GType -gtk_theme_engine_get_type (void) -{ - static GType theme_engine_type = 0; - - if (!theme_engine_type) - { - const GTypeInfo theme_engine_info = { - sizeof (GtkThemeEngineClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_theme_engine_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkThemeEngine), - 0, /* n_preallocs */ - NULL, /* instance_init */ - }; - - theme_engine_type = - g_type_register_static (G_TYPE_TYPE_MODULE, I_("GtkThemeEngine"), - &theme_engine_info, 0); - } - - return theme_engine_type; -} - -GtkThemeEngine* -gtk_theme_engine_get (const gchar *name) -{ - GtkThemeEngine *result; - - if (!engine_hash) - engine_hash = g_hash_table_new (g_str_hash, g_str_equal); - - /* get the library name for the theme - */ - result = g_hash_table_lookup (engine_hash, name); - - if (!result) - { - result = g_object_new (GTK_TYPE_THEME_ENGINE, NULL); - g_type_module_set_name (G_TYPE_MODULE (result), name); - result->name = g_strdup (name); - - g_hash_table_insert (engine_hash, result->name, result); - } - - if (!g_type_module_use (G_TYPE_MODULE (result))) - return NULL; - - return result; -} - -GtkRcStyle * -gtk_theme_engine_create_rc_style (GtkThemeEngine *engine) -{ - g_return_val_if_fail (engine != NULL, NULL); - - return engine->create_rc_style (); -} diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h deleted file mode 100644 index 91edccc109..0000000000 --- a/gtk/gtkthemes.h +++ /dev/null @@ -1,52 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * Themes added by The Rasterman - * - * 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, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_THEMES_H__ -#define __GTK_THEMES_H__ - - -#include -#include - - -G_BEGIN_DECLS - -#define GTK_TYPE_THEME_ENGINE (gtk_theme_engine_get_type ()) -#define GTK_THEME_ENGINE(theme_engine) (G_TYPE_CHECK_INSTANCE_CAST ((theme_engine), GTK_TYPE_THEME_ENGINE, GtkThemeEngine)) -#define GTK_IS_THEME_ENGINE(theme_engine) (G_TYPE_CHECK_INSTANCE_TYPE ((theme_engine), GTK_TYPE_THEME_ENGINE)) - -#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION) - -GType gtk_theme_engine_get_type (void) G_GNUC_CONST; -GtkThemeEngine *gtk_theme_engine_get (const gchar *name); -GtkRcStyle *gtk_theme_engine_create_rc_style (GtkThemeEngine *engine); - -#endif - -G_END_DECLS - -#endif /* __GTK_THEMES_H__ */