summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-24 13:41:32 +0200
committerinfirit <[email protected]>2014-10-24 15:40:43 +0200
commit97fb53f44158608e56e236f2bb620752d3c04b4e (patch)
tree3d1845a0378177e1c7e5c67d55d1ffa8eb505ec3 /src
parent470fed7e80a741e43e53f2e2186f9470db132983 (diff)
downloadmarco-97fb53f44158608e56e236f2bb620752d3c04b4e.tar.bz2
marco-97fb53f44158608e56e236f2bb620752d3c04b4e.tar.xz
themewidget: remove, it is unused
Based on metacity commit: 202a3712a97c2df6f0410050835898795f75a1b6 From: Alberts Muktupāvels <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ui/menu.c1
-rw-r--r--src/ui/themewidget.c312
-rw-r--r--src/ui/themewidget.h93
4 files changed, 0 insertions, 408 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 89f5770d..f1539dae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,8 +104,6 @@ marco_SOURCES = \
ui/theme-parser.h \
ui/theme.c \
ui/theme.h \
- ui/themewidget.c \
- ui/themewidget.h \
ui/ui.c \
include/all-keybindings.h
diff --git a/src/ui/menu.c b/src/ui/menu.c
index 2b6dfe83..baf192d7 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -28,7 +28,6 @@
#include "main.h"
#include "util.h"
#include "core.h"
-#include "themewidget.h"
#include "metaaccellabel.h"
#include "ui.h"
diff --git a/src/ui/themewidget.c b/src/ui/themewidget.c
deleted file mode 100644
index 36c481c6..00000000
--- a/src/ui/themewidget.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Marco theme widget (displays themed draw operations) */
-
-/*
- * Copyright (C) 2002 Havoc Pennington
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "themewidget.h"
-#include <math.h>
-
-#ifdef __GNUC__
-#define UNUSED_VARIABLE __attribute__ ((unused))
-#else
-#define UNUSED_VARIABLE
-#endif
-
-static void meta_area_class_init (MetaAreaClass *klass);
-static void meta_area_init (MetaArea *area);
-static void meta_area_size_request (GtkWidget *widget,
- GtkRequisition *req);
-#if GTK_CHECK_VERSION(3, 0, 0)
-static gboolean meta_area_draw (GtkWidget *widget,
- cairo_t *cr);
-static void meta_area_get_preferred_height (GtkWidget *widget,
- gint *minimal,
- gint *natural);
-static void meta_area_get_preferred_width (GtkWidget *widget,
- gint *minimal,
- gint *natural);
-#else
-static gint meta_area_expose (GtkWidget *widget,
- GdkEventExpose *event);
-#endif
-static void meta_area_finalize (GObject *object);
-
-
-#if GTK_CHECK_VERSION(3, 0, 0)
-
-G_DEFINE_TYPE (MetaArea, meta_area, GTK_TYPE_MISC);
-
-#else
-
-static GtkMiscClass *parent_class;
-
-GType
-meta_area_get_type (void)
-{
- static GType area_type = 0;
-
- if (!area_type)
- {
- static const GtkTypeInfo area_info =
- {
- "MetaArea",
- sizeof (MetaArea),
- sizeof (MetaAreaClass),
- (GtkClassInitFunc) meta_area_class_init,
- (GtkObjectInitFunc) meta_area_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- area_type = gtk_type_unique (GTK_TYPE_MISC, &area_info);
- }
-
- return area_type;
-}
-
-#endif
-
-static void
-meta_area_class_init (MetaAreaClass *class)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GtkWidgetClass *widget_class;
-
- widget_class = (GtkWidgetClass*) class;
- parent_class = g_type_class_peek (gtk_misc_get_type ());
-
- gobject_class->finalize = meta_area_finalize;
-
- #if GTK_CHECK_VERSION(3, 0, 0)
- widget_class->draw = meta_area_draw;
- widget_class->get_preferred_width = meta_area_get_preferred_width;
- widget_class->get_preferred_height = meta_area_get_preferred_height;
- #else
- widget_class->expose_event = meta_area_expose;
- widget_class->size_request = meta_area_size_request;
- #endif
-}
-
-static void
-meta_area_init (MetaArea *area)
-{
- #if GTK_CHECK_VERSION(3, 0, 0)
- gtk_widget_set_has_window (GTK_WIDGET(area), FALSE);
- #else
- GTK_WIDGET_SET_FLAGS (area, GTK_NO_WINDOW);
- #endif
-}
-
-GtkWidget*
-meta_area_new (void)
-{
- MetaArea *area;
-
- #if GTK_CHECK_VERSION(3, 0, 0)
- area = g_object_new (META_TYPE_AREA, NULL);
- #else
- area = gtk_type_new (META_TYPE_AREA);
- #endif
-
- return GTK_WIDGET (area);
-}
-
-static void
-meta_area_finalize (GObject *object)
-{
- MetaArea *area;
-
- area = META_AREA (object);
-
- if (area->dnotify)
- (* area->dnotify) (area->user_data);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-#if GTK_CHECK_VERSION(3, 0, 0)
-
-static gboolean
-meta_area_draw (GtkWidget *widget,
- cairo_t *cr)
-{
- MetaArea *area;
- GtkMisc *misc;
- gint x, y;
- gfloat xalign, yalign;
- gint xpad, ypad;
- GtkAllocation allocation;
- GtkRequisition req;
-
- g_return_val_if_fail (META_IS_AREA (widget), FALSE);
-
- if (gtk_widget_is_drawable (widget))
- {
- area = META_AREA (widget);
- misc = GTK_MISC (widget);
-
- gtk_widget_get_allocation(widget, &allocation);
- gtk_widget_get_requisition(widget, &req);
-
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- gtk_misc_get_alignment(misc, &xalign, &yalign);
- else
- {
- gtk_misc_get_alignment(misc, &xalign, &yalign);
- xalign = 1.0 - xalign;
- }
-
- gtk_misc_get_padding(misc, &xpad, &ypad);
-
-
- x = floor (allocation.x + xpad
- + ((allocation.width - req.width) * xalign)
- + 0.5);
- y = floor (allocation.y + ypad
- + ((allocation.height - req.height) * yalign)
- + 0.5);
-
- if (area->draw_func)
- {
- (* area->draw_func) (area, cr,
- area->user_data);
- }
- }
-
- return FALSE;
-}
-
-#else
-
-static gint
-meta_area_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- MetaArea *area;
- GtkMisc *misc;
- gint x, y;
- gfloat xalign;
-
- g_return_val_if_fail (META_IS_AREA (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- area = META_AREA (widget);
- misc = GTK_MISC (widget);
-
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- xalign = misc->xalign;
- else
- xalign = 1.0 - misc->xalign;
-
- x = floor (widget->allocation.x + misc->xpad
- + ((widget->allocation.width - widget->requisition.width) * xalign)
- + 0.5);
- y = floor (widget->allocation.y + misc->ypad
- + ((widget->allocation.height - widget->requisition.height) * misc->yalign)
- + 0.5);
-
- if (area->expose_func)
- {
- (* area->expose_func) (area, event, x, y,
- area->user_data);
- }
- }
-
- return FALSE;
-}
-
-#endif
-
-static void
-meta_area_size_request (GtkWidget *widget,
- GtkRequisition *req)
-{
- MetaArea *area;
-
- area = META_AREA (widget);
-
- req->width = 0;
- req->height = 0;
-
- if (area->size_func)
- {
- (* area->size_func) (area, &req->width, &req->height,
- area->user_data);
- }
-}
-
-#if GTK_CHECK_VERSION(3, 0, 0)
-
-static void
-meta_area_get_preferred_width (GtkWidget *widget,
- gint *minimal,
- gint *natural)
-{
- GtkRequisition requisition;
-
- meta_area_size_request (widget, &requisition);
-
- *minimal = *natural = requisition.width;
-}
-
-static void
-meta_area_get_preferred_height (GtkWidget *widget,
- gint *minimal,
- gint *natural)
-{
- GtkRequisition requisition;
-
- meta_area_size_request (widget, &requisition);
-
- *minimal = *natural = requisition.height;
-}
-
-#endif
-
-void
-meta_area_setup (MetaArea *area,
- MetaAreaSizeFunc size_func,
- #if GTK_CHECK_VERSION(3, 0, 0)
- MetaAreaDrawFunc draw_func,
- #else
- MetaAreaExposeFunc expose_func,
- #endif
- void *user_data,
- GDestroyNotify dnotify)
-{
- if (area->dnotify)
- (* area->dnotify) (area->user_data);
-
- area->size_func = size_func;
- #if GTK_CHECK_VERSION(3, 0, 0)
- area->draw_func = draw_func;
- #else
- area->expose_func = expose_func;
- #endif
- area->user_data = user_data;
- area->dnotify = dnotify;
-
- gtk_widget_queue_resize (GTK_WIDGET (area));
-}
-
diff --git a/src/ui/themewidget.h b/src/ui/themewidget.h
deleted file mode 100644
index 17b9d993..00000000
--- a/src/ui/themewidget.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Marco theme widget (displays themed draw operations) */
-
-/*
- * Copyright (C) 2002 Havoc Pennington
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "theme.h"
-#include <gtk/gtk.h>
-
-#ifndef META_THEME_WIDGET_H
-#define META_THEME_WIDGET_H
-
-#define META_TYPE_AREA (meta_area_get_type ())
-#define META_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_AREA, MetaArea))
-#define META_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_AREA, MetaAreaClass))
-#define META_IS_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_AREA))
-#define META_IS_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_AREA))
-#define META_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_AREA, MetaAreaClass))
-
-typedef struct _MetaArea MetaArea;
-typedef struct _MetaAreaClass MetaAreaClass;
-
-
-typedef void (* MetaAreaSizeFunc) (MetaArea *area,
- int *width,
- int *height,
- void *user_data);
-#if GTK_CHECK_VERSION(3, 0, 0)
-typedef void (* MetaAreaDrawFunc) (MetaArea *area,
- cairo_t *cr,
- void *user_data);
-#else
-typedef void (* MetaAreaExposeFunc) (MetaArea *area,
- GdkEventExpose *event,
- int x_offset,
- int y_offset,
- void *user_data);
-#endif
-
-#define parent_class meta_area_parent_class
-
-struct _MetaArea
-{
- GtkMisc misc;
-
- MetaAreaSizeFunc size_func;
- #if GTK_CHECK_VERSION(3, 0, 0)
- MetaAreaDrawFunc draw_func;
- #else
- MetaAreaExposeFunc expose_func;
- #endif
- void *user_data;
- GDestroyNotify dnotify;
-};
-
-struct _MetaAreaClass
-{
- GtkMiscClass parent_class;
-};
-
-
-GType meta_area_get_type (void) G_GNUC_CONST;
-GtkWidget* meta_area_new (void);
-
-void meta_area_setup (MetaArea *area,
- MetaAreaSizeFunc size_func,
- #if GTK_CHECK_VERSION(3, 0, 0)
- MetaAreaDrawFunc draw_func,
- #else
- MetaAreaExposeFunc expose_func,
- #endif
- void *user_data,
- GDestroyNotify dnotify);
-
-
-#endif