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

Remove gtkcolorsel(dialog).{c,h}

Browse Source
This commit is contained in:
Timm Bäder 2016-10-04 12:34:10 +02:00 committed by Benjamin Otte
parent 9c09669711
commit d06d17b81e
7 changed files with 0 additions and 3631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/deprecated/Makefile.inc
View File

@ -3,8 +3,6 @@ deprecated_h_sources = \
deprecated/gtkaction.h \
deprecated/gtkactiongroup.h \
deprecated/gtkalignment.h \
deprecated/gtkcolorsel.h \
deprecated/gtkcolorseldialog.h \
deprecated/gtkgradient.h \
deprecated/gtkhbbox.h \
deprecated/gtkhpaned.h \
@ -40,8 +38,6 @@ deprecated_c_sources = \
deprecated/gtkaction.c \
deprecated/gtkactiongroup.c \
deprecated/gtkalignment.c \
deprecated/gtkcolorsel.c \
deprecated/gtkcolorseldialog.c \
deprecated/gtkgradient.c \
deprecated/gtkhbbox.c \
deprecated/gtkhpaned.c \

3082
gtk/deprecated/gtkcolorsel.c
View File

File diff suppressed because it is too large Load Diff

174
gtk/deprecated/gtkcolorsel.h
View File

@ -1,174 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat, Inc.
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* 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/>.
*/
/*
* 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_COLOR_SELECTION_H__
#define __GTK_COLOR_SELECTION_H__
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gtk/gtkdialog.h>
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
#define GTK_TYPE_COLOR_SELECTION (gtk_color_selection_get_type ())
#define GTK_COLOR_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection))
#define GTK_COLOR_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
#define GTK_IS_COLOR_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SELECTION))
#define GTK_IS_COLOR_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION))
#define GTK_COLOR_SELECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
typedef struct _GtkColorSelection GtkColorSelection;
typedef struct _GtkColorSelectionPrivate GtkColorSelectionPrivate;
typedef struct _GtkColorSelectionClass GtkColorSelectionClass;
/**
* GtkColorSelectionChangePaletteFunc:
* @colors: (array length=n_colors): Array of colors
* @n_colors: Number of colors in the array
*
* Deprecated: 3.4
*/
typedef void (* GtkColorSelectionChangePaletteFunc) (const GdkColor *colors,
gint n_colors);
/**
* GtkColorSelectionChangePaletteWithScreenFunc:
* @screen:
* @colors: (array length=n_colors): Array of colors
* @n_colors: Number of colors in the array
*
* Since: 2.2
* Deprecated: 3.4
*/
typedef void (* GtkColorSelectionChangePaletteWithScreenFunc) (GdkScreen *screen,
const GdkColor *colors,
gint n_colors);
struct _GtkColorSelection
{
GtkBox parent_instance;
/*< private >*/
GtkColorSelectionPrivate *private_data;
};
/**
* GtkColorSelectionClass:
* @parent_class: The parent class.
* @color_changed:
*/
struct _GtkColorSelectionClass
{
GtkBoxClass parent_class;
void (*color_changed) (GtkColorSelection *color_selection);
/*< private >*/
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
};
/* ColorSelection */
GDK_DEPRECATED_IN_3_4
GType gtk_color_selection_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_widget_new)
GtkWidget *gtk_color_selection_new (void);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_use_alpha)
gboolean gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_use_alpha)
void gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
gboolean has_opacity);
GDK_DEPRECATED_IN_3_4
gboolean gtk_color_selection_get_has_palette (GtkColorSelection *colorsel);
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_has_palette (GtkColorSelection *colorsel,
gboolean has_palette);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
guint16 alpha);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
guint16 gtk_color_selection_get_current_alpha (GtkColorSelection *colorsel);
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_previous_alpha (GtkColorSelection *colorsel,
guint16 alpha);
GDK_DEPRECATED_IN_3_4
guint16 gtk_color_selection_get_previous_alpha (GtkColorSelection *colorsel);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_selection_set_current_rgba (GtkColorSelection *colorsel,
const GdkRGBA *rgba);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
void gtk_color_selection_get_current_rgba (GtkColorSelection *colorsel,
GdkRGBA *rgba);
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_previous_rgba (GtkColorSelection *colorsel,
const GdkRGBA *rgba);
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_get_previous_rgba (GtkColorSelection *colorsel,
GdkRGBA *rgba);
GDK_DEPRECATED_IN_3_4
gboolean gtk_color_selection_is_adjusting (GtkColorSelection *colorsel);
GDK_DEPRECATED_IN_3_4
gboolean gtk_color_selection_palette_from_string (const gchar *str,
GdkColor **colors,
gint *n_colors);
GDK_DEPRECATED_IN_3_4
gchar* gtk_color_selection_palette_to_string (const GdkColor *colors,
gint n_colors);
GDK_DEPRECATED_IN_3_4
GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_selection_set_current_color (GtkColorSelection *colorsel,
const GdkColor *color);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
void gtk_color_selection_get_current_color (GtkColorSelection *colorsel,
GdkColor *color);
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_previous_color (GtkColorSelection *colorsel,
const GdkColor *color);
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_get_previous_color (GtkColorSelection *colorsel,
GdkColor *color);
G_END_DECLS
#endif /* __GTK_COLOR_SELECTION_H__ */

276
gtk/deprecated/gtkcolorseldialog.c
View File

@ -1,276 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* 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/>.
*/
/*
* 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"
#define GDK_DISABLE_DEPRECATION_WARNINGS
#include <string.h>
#include <glib.h>
#include "gtkcolorseldialog.h"
#include "gtkframe.h"
#include "gtkbutton.h"
#include "gtkstock.h"
#include "gtkintl.h"
#include "gtkbuildable.h"
/**
* SECTION:gtkcolorseldlg
* @Short_description: Deprecated dialog box for selecting a color
* @Title: GtkColorSelectionDialog
*
* The #GtkColorSelectionDialog provides a standard dialog which
* allows the user to select a color much like the #GtkFileChooserDialog
* provides a standard dialog for file selection.
*
* Use gtk_color_selection_dialog_get_color_selection() to get the
* #GtkColorSelection widget contained within the dialog. Use this widget
* and its gtk_color_selection_get_current_color()
* function to gain access to the selected color. Connect a handler
* for this widget’s #GtkColorSelection::color-changed signal to be notified
* when the color changes.
*
* # GtkColorSelectionDialog as GtkBuildable # {#GtkColorSelectionDialog-BUILDER-UI}
*
* The GtkColorSelectionDialog implementation of the GtkBuildable interface
* exposes the embedded #GtkColorSelection as internal child with the
* name “color_selection”. It also exposes the buttons with the names
* “ok_button”, “cancel_button” and “help_button”.
*/
struct _GtkColorSelectionDialogPrivate
{
GtkWidget *colorsel;
GtkWidget *ok_button;
GtkWidget *cancel_button;
GtkWidget *help_button;
};
enum {
PROP_0,
PROP_COLOR_SELECTION,
PROP_OK_BUTTON,
PROP_CANCEL_BUTTON,
PROP_HELP_BUTTON
};
/***************************/
/* GtkColorSelectionDialog */
/***************************/
static void gtk_color_selection_dialog_buildable_interface_init (GtkBuildableIface *iface);
static GObject * gtk_color_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder,
const gchar *childname);
G_DEFINE_TYPE_WITH_CODE (GtkColorSelectionDialog, gtk_color_selection_dialog, GTK_TYPE_DIALOG,
G_ADD_PRIVATE (GtkColorSelectionDialog)
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_color_selection_dialog_buildable_interface_init))
static GtkBuildableIface *parent_buildable_iface;
static void
gtk_color_selection_dialog_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GtkColorSelectionDialog *colorsel = GTK_COLOR_SELECTION_DIALOG (object);
GtkColorSelectionDialogPrivate *priv = colorsel->priv;
switch (prop_id)
{
case PROP_COLOR_SELECTION:
g_value_set_object (value, priv->colorsel);
break;
case PROP_OK_BUTTON:
g_value_set_object (value, priv->ok_button);
break;
case PROP_CANCEL_BUTTON:
g_value_set_object (value, priv->cancel_button);
break;
case PROP_HELP_BUTTON:
g_value_set_object (value, priv->help_button);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gobject_class->get_property = gtk_color_selection_dialog_get_property;
g_object_class_install_property (gobject_class,
PROP_COLOR_SELECTION,
g_param_spec_object ("color-selection",
P_("Color Selection"),
P_("The color selection embedded in the dialog."),
GTK_TYPE_WIDGET,
G_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_OK_BUTTON,
g_param_spec_object ("ok-button",
P_("OK Button"),
P_("The OK button of the dialog."),
GTK_TYPE_WIDGET,
G_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_CANCEL_BUTTON,
g_param_spec_object ("cancel-button",
P_("Cancel Button"),
P_("The cancel button of the dialog."),
GTK_TYPE_WIDGET,
G_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_HELP_BUTTON,
g_param_spec_object ("help-button",
P_("Help Button"),
P_("The help button of the dialog."),
GTK_TYPE_WIDGET,
G_PARAM_READABLE));
gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_COLOR_CHOOSER);
}
static void
gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
{
GtkColorSelectionDialogPrivate *priv;
GtkDialog *dialog = GTK_DIALOG (colorseldiag);
GtkWidget *action_area, *content_area;
colorseldiag->priv = gtk_color_selection_dialog_get_instance_private (colorseldiag);
priv = colorseldiag->priv;
content_area = gtk_dialog_get_content_area (dialog);
action_area = gtk_dialog_get_action_area (dialog);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
gtk_box_set_spacing (GTK_BOX (action_area), 6);
priv->colorsel = gtk_color_selection_new ();
gtk_container_set_border_width (GTK_CONTAINER (priv->colorsel), 5);
gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (priv->colorsel), FALSE);
gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (priv->colorsel), FALSE);
gtk_container_add (GTK_CONTAINER (content_area), priv->colorsel);
gtk_widget_show (priv->colorsel);
priv->cancel_button = gtk_dialog_add_button (dialog,
_("_Cancel"),
GTK_RESPONSE_CANCEL);
priv->ok_button = gtk_dialog_add_button (dialog,
_("_Select"),
GTK_RESPONSE_OK);
gtk_widget_grab_default (priv->ok_button);
priv->help_button = gtk_dialog_add_button (dialog,
_("_Help"),
GTK_RESPONSE_HELP);
gtk_widget_hide (priv->help_button);
gtk_window_set_title (GTK_WINDOW (colorseldiag),
_("Color Selection"));
}
/**
* gtk_color_selection_dialog_new:
* @title: a string containing the title text for the dialog.
*
* Creates a new #GtkColorSelectionDialog.
*
* Returns: a #GtkColorSelectionDialog.
*/
GtkWidget*
gtk_color_selection_dialog_new (const gchar *title)
{
GtkColorSelectionDialog *colorseldiag;
colorseldiag = g_object_new (GTK_TYPE_COLOR_SELECTION_DIALOG, NULL);
if (title)
gtk_window_set_title (GTK_WINDOW (colorseldiag), title);
gtk_window_set_resizable (GTK_WINDOW (colorseldiag), FALSE);
return GTK_WIDGET (colorseldiag);
}
/**
* gtk_color_selection_dialog_get_color_selection:
* @colorsel: a #GtkColorSelectionDialog
*
* Retrieves the #GtkColorSelection widget embedded in the dialog.
*
* Returns: (transfer none): the embedded #GtkColorSelection
*
* Since: 2.14
**/
GtkWidget*
gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorsel)
{
g_return_val_if_fail (GTK_IS_COLOR_SELECTION_DIALOG (colorsel), NULL);
return colorsel->priv->colorsel;
}
static void
gtk_color_selection_dialog_buildable_interface_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
iface->get_internal_child = gtk_color_selection_dialog_buildable_get_internal_child;
}
static GObject *
gtk_color_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder,
const gchar *childname)
{
GtkColorSelectionDialog *selection_dialog = GTK_COLOR_SELECTION_DIALOG (buildable);
GtkColorSelectionDialogPrivate *priv = selection_dialog->priv;
if (g_strcmp0 (childname, "ok_button") == 0)
return G_OBJECT (priv->ok_button);
else if (g_strcmp0 (childname, "cancel_button") == 0)
return G_OBJECT (priv->cancel_button);
else if (g_strcmp0 (childname, "help_button") == 0)
return G_OBJECT (priv->help_button);
else if (g_strcmp0 (childname, "color_selection") == 0)
return G_OBJECT (priv->colorsel);
return parent_buildable_iface->get_internal_child (buildable, builder, childname);
}

81
gtk/deprecated/gtkcolorseldialog.h
View File

@ -1,81 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* 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/>.
*/
/*
* 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_COLOR_SELECTION_DIALOG_H__
#define __GTK_COLOR_SELECTION_DIALOG_H__
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gtk/gtkdialog.h>
#include <gtk/deprecated/gtkcolorsel.h>
G_BEGIN_DECLS
#define GTK_TYPE_COLOR_SELECTION_DIALOG (gtk_color_selection_dialog_get_type ())
#define GTK_COLOR_SELECTION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog))
#define GTK_COLOR_SELECTION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
#define GTK_IS_COLOR_SELECTION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG))
#define GTK_IS_COLOR_SELECTION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG))
#define GTK_COLOR_SELECTION_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
typedef struct _GtkColorSelectionDialog GtkColorSelectionDialog;
typedef struct _GtkColorSelectionDialogPrivate GtkColorSelectionDialogPrivate;
typedef struct _GtkColorSelectionDialogClass GtkColorSelectionDialogClass;
struct _GtkColorSelectionDialog
{
GtkDialog parent_instance;
/*< private >*/
GtkColorSelectionDialogPrivate *priv;
};
struct _GtkColorSelectionDialogClass
{
GtkDialogClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
};
/* ColorSelectionDialog */
GDK_DEPRECATED_IN_3_4
GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_dialog_new)
GtkWidget* gtk_color_selection_dialog_new (const gchar *title);
GDK_DEPRECATED_IN_3_4_FOR(GtkColorChooser)
GtkWidget* gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorsel);
G_END_DECLS
#endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */

2
gtk/gtk.h
View File

@ -248,8 +248,6 @@
#include <gtk/deprecated/gtkaction.h>
#include <gtk/deprecated/gtkactiongroup.h>
#include <gtk/deprecated/gtkalignment.h>
#include <gtk/deprecated/gtkcolorsel.h>
#include <gtk/deprecated/gtkcolorseldialog.h>
#include <gtk/deprecated/gtkgradient.h>
#include <gtk/deprecated/gtkhbbox.h>
#include <gtk/deprecated/gtkhpaned.h>

12
testsuite/gtk/defaultvalue.c
View File

@ -200,18 +200,6 @@ test_type (gconstpointer data)
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (g_type_is_a (type, GTK_TYPE_COLOR_SELECTION) &&
(strcmp (pspec->name, "current-color") == 0 ||
strcmp (pspec->name, "current-rgba") == 0))
continue;
if (g_type_is_a (type, GTK_TYPE_COLOR_SELECTION_DIALOG) &&
(strcmp (pspec->name, "color-selection") == 0 ||
strcmp (pspec->name, "ok-button") == 0 ||
strcmp (pspec->name, "help-button") == 0 ||
strcmp (pspec->name, "cancel-button") == 0))
continue;
if (g_type_is_a (type, GTK_TYPE_COMBO_BOX) &&
(strcmp (pspec->name, "cell-area") == 0 ||
strcmp (pspec->name, "cell-area-context") == 0))