forked from AuroraMiddleware/gtk
Remove GtkAction
This commit is contained in:
parent
ead36206a3
commit
4384628afb
@ -1,5 +1,4 @@
|
||||
deprecated_h_sources = \
|
||||
deprecated/gtkaction.h \
|
||||
deprecated/gtkgradient.h \
|
||||
deprecated/gtksymboliccolor.h
|
||||
|
||||
@ -8,6 +7,5 @@ deprecated_private_h_sources = \
|
||||
deprecated/gtksymboliccolorprivate.h
|
||||
|
||||
deprecated_c_sources = \
|
||||
deprecated/gtkaction.c \
|
||||
deprecated/gtkgradient.c \
|
||||
deprecated/gtksymboliccolor.c
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,217 +0,0 @@
|
||||
/*
|
||||
* GTK - The GIMP Toolkit
|
||||
* Copyright (C) 1998, 1999 Red Hat, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This Library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Author: James Henstridge <james@daa.com.au>
|
||||
*
|
||||
* Modified by the GTK+ Team and others 2003. 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_ACTION_H__
|
||||
#define __GTK_ACTION_H__
|
||||
|
||||
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
|
||||
#error "Only <gtk/gtk.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#include <gtk/gtkwidget.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GTK_TYPE_ACTION (gtk_action_get_type ())
|
||||
#define GTK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
|
||||
#define GTK_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
|
||||
#define GTK_IS_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
|
||||
#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACTION))
|
||||
#define GTK_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
|
||||
|
||||
typedef struct _GtkAction GtkAction;
|
||||
typedef struct _GtkActionClass GtkActionClass;
|
||||
typedef struct _GtkActionPrivate GtkActionPrivate;
|
||||
|
||||
struct _GtkAction
|
||||
{
|
||||
GObject object;
|
||||
|
||||
/*< private >*/
|
||||
GtkActionPrivate *private_data;
|
||||
};
|
||||
|
||||
/**
|
||||
* GtkActionClass:
|
||||
* @parent_class: The parent class.
|
||||
* @activate: Signal emitted when the action is activated.
|
||||
*/
|
||||
struct _GtkActionClass
|
||||
{
|
||||
GObjectClass parent_class;
|
||||
|
||||
/*< public >*/
|
||||
|
||||
/* activation signal */
|
||||
void (* activate) (GtkAction *action);
|
||||
|
||||
/*< private >*/
|
||||
|
||||
GType menu_item_type;
|
||||
GType toolbar_item_type;
|
||||
|
||||
/* widget creation routines (not signals) */
|
||||
GtkWidget *(* create_menu_item) (GtkAction *action);
|
||||
GtkWidget *(* create_tool_item) (GtkAction *action);
|
||||
void (* connect_proxy) (GtkAction *action,
|
||||
GtkWidget *proxy);
|
||||
void (* disconnect_proxy) (GtkAction *action,
|
||||
GtkWidget *proxy);
|
||||
|
||||
GtkWidget *(* create_menu) (GtkAction *action);
|
||||
|
||||
/* Padding for future expansion */
|
||||
void (*_gtk_reserved1) (void);
|
||||
void (*_gtk_reserved2) (void);
|
||||
void (*_gtk_reserved3) (void);
|
||||
void (*_gtk_reserved4) (void);
|
||||
};
|
||||
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GType gtk_action_get_type (void) G_GNUC_CONST;
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GtkAction *gtk_action_new (const gchar *name,
|
||||
const gchar *label,
|
||||
const gchar *tooltip,
|
||||
const gchar *stock_id);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar* gtk_action_get_name (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_is_sensitive (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_get_sensitive (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_sensitive (GtkAction *action,
|
||||
gboolean sensitive);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_is_visible (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_get_visible (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_visible (GtkAction *action,
|
||||
gboolean visible);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_activate (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GtkWidget * gtk_action_create_icon (GtkAction *action,
|
||||
GtkIconSize icon_size);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GtkWidget * gtk_action_create_menu_item (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GtkWidget * gtk_action_create_tool_item (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GtkWidget * gtk_action_create_menu (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GSList * gtk_action_get_proxies (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_connect_accelerator (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_disconnect_accelerator (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar *gtk_action_get_accel_path (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GClosure *gtk_action_get_accel_closure (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_block_activate (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_unblock_activate (GtkAction *action);
|
||||
|
||||
void _gtk_action_add_to_proxy_list (GtkAction *action,
|
||||
GtkWidget *proxy);
|
||||
void _gtk_action_remove_from_proxy_list(GtkAction *action,
|
||||
GtkWidget *proxy);
|
||||
|
||||
/* protected ... for use by child actions */
|
||||
void _gtk_action_emit_activate (GtkAction *action);
|
||||
|
||||
/* protected ... for use by action groups */
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_accel_path (GtkAction *action,
|
||||
const gchar *accel_path);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_accel_group (GtkAction *action,
|
||||
GtkAccelGroup *accel_group);
|
||||
void _gtk_action_sync_menu_visible (GtkAction *action,
|
||||
GtkWidget *proxy,
|
||||
gboolean empty);
|
||||
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_label (GtkAction *action,
|
||||
const gchar *label);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar * gtk_action_get_label (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_short_label (GtkAction *action,
|
||||
const gchar *short_label);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar * gtk_action_get_short_label (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_tooltip (GtkAction *action,
|
||||
const gchar *tooltip);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar * gtk_action_get_tooltip (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_stock_id (GtkAction *action,
|
||||
const gchar *stock_id);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar * gtk_action_get_stock_id (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_gicon (GtkAction *action,
|
||||
GIcon *icon);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
GIcon *gtk_action_get_gicon (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_icon_name (GtkAction *action,
|
||||
const gchar *icon_name);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
const gchar * gtk_action_get_icon_name (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_visible_horizontal (GtkAction *action,
|
||||
gboolean visible_horizontal);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_get_visible_horizontal (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_visible_vertical (GtkAction *action,
|
||||
gboolean visible_vertical);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_get_visible_vertical (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_is_important (GtkAction *action,
|
||||
gboolean is_important);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_get_is_important (GtkAction *action);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
void gtk_action_set_always_show_image (GtkAction *action,
|
||||
gboolean always_show);
|
||||
GDK_DEPRECATED_IN_3_10
|
||||
gboolean gtk_action_get_always_show_image (GtkAction *action);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GTK_ACTION_H__ */
|
@ -244,7 +244,6 @@
|
||||
#include <gtk/gtkwindowgroup.h>
|
||||
|
||||
#ifndef GTK_DISABLE_DEPRECATED
|
||||
#include <gtk/deprecated/gtkaction.h>
|
||||
#include <gtk/deprecated/gtkgradient.h>
|
||||
#include <gtk/deprecated/gtksymboliccolor.h>
|
||||
#endif /* GTK_DISABLE_DEPRECATED */
|
||||
|
@ -19,7 +19,6 @@
|
||||
#define __GTK_MENU_ITEM_PRIVATE_H__
|
||||
|
||||
#include <gtk/gtkmenuitem.h>
|
||||
#include <gtk/deprecated/gtkaction.h>
|
||||
#include <gtk/gtkactionhelper.h>
|
||||
#include <gtk/gtkcssgadgetprivate.h>
|
||||
#include <gtk/gtkcssnodeprivate.h>
|
||||
|
@ -34,7 +34,6 @@ TESTS_ENVIRONMENT = \
|
||||
TEST_PROGS += \
|
||||
accel \
|
||||
accessible \
|
||||
action \
|
||||
adjustment \
|
||||
bitmask \
|
||||
builder \
|
||||
|
@ -1,82 +0,0 @@
|
||||
/* GtkAction tests.
|
||||
*
|
||||
* Authors: Jan Arne Petersen <jpetersen@openismus.com>
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#define GDK_DISABLE_DEPRECATION_WARNINGS
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
/* Fixture */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GtkAction *action;
|
||||
} ActionTest;
|
||||
|
||||
static void
|
||||
action_test_setup (ActionTest *fixture,
|
||||
gconstpointer test_data)
|
||||
{
|
||||
fixture->action = gtk_action_new ("name", "label", NULL, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
action_test_teardown (ActionTest *fixture,
|
||||
gconstpointer test_data)
|
||||
{
|
||||
g_object_unref (fixture->action);
|
||||
}
|
||||
|
||||
static void
|
||||
notify_count_emmisions (GObject *object,
|
||||
GParamSpec *pspec,
|
||||
gpointer data)
|
||||
{
|
||||
unsigned int *i = data;
|
||||
(*i)++;
|
||||
}
|
||||
|
||||
static void
|
||||
menu_item_label_notify_count (ActionTest *fixture,
|
||||
gconstpointer test_data)
|
||||
{
|
||||
GtkWidget *item = gtk_menu_item_new ();
|
||||
unsigned int emmisions = 0;
|
||||
|
||||
g_object_ref_sink (item);
|
||||
g_signal_connect (item, "notify::label",
|
||||
G_CALLBACK (notify_count_emmisions), &emmisions);
|
||||
|
||||
g_object_unref (item);
|
||||
}
|
||||
|
||||
/* main */
|
||||
|
||||
int
|
||||
main (int argc,
|
||||
char **argv)
|
||||
{
|
||||
gtk_test_init (&argc, &argv, NULL);
|
||||
|
||||
g_test_add ("/Action/MenuItem/label-notify-count",
|
||||
ActionTest, NULL,
|
||||
action_test_setup,
|
||||
menu_item_label_notify_count,
|
||||
action_test_teardown);
|
||||
|
||||
return g_test_run ();
|
||||
}
|
||||
|
@ -1921,13 +1921,8 @@ test_add_objects (void)
|
||||
GError *error;
|
||||
gint ret;
|
||||
GObject *obj;
|
||||
GtkWidget *menubar;
|
||||
GObject *menu, *label;
|
||||
GList *children;
|
||||
gchar *objects[2] = {"mainbox", NULL};
|
||||
gchar *objects2[3] = {"mainbox", "window2", NULL};
|
||||
gchar *objects3[3] = {"uimgr1", "menubar1"};
|
||||
gchar *objects4[2] = {"uimgr1", NULL};
|
||||
const gchar buffer[] =
|
||||
"<interface>"
|
||||
" <object class=\"GtkWindow\" id=\"window\">"
|
||||
|
Loading…
Reference in New Issue
Block a user