* 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* GtkAccelLabel is automatically set up to display the GtkMenuItem
* accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. *<!---->/
* gtk_widget_add_accelerator (save_item, "activate", accel_group,
- * GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+ * GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
* </programlisting>
* </example>
*/
gint *min_width,
gint *nat_width);
-#define GTK_ACCEL_LABEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelPrivate))
-
G_DEFINE_TYPE (GtkAccelLabel, gtk_accel_label, GTK_TYPE_LABEL)
widget_class->get_preferred_width = gtk_accel_label_get_preferred_width;
widget_class->destroy = gtk_accel_label_destroy;
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ACCEL_LABEL);
+
class->signal_quote1 = g_strdup ("<:");
class->signal_quote2 = g_strdup (":>");
static void
gtk_accel_label_init (GtkAccelLabel *accel_label)
{
- GtkAccelLabelPrivate *priv = GTK_ACCEL_LABEL_GET_PRIVATE (accel_label);
+ GtkAccelLabelPrivate *priv;
+
+ accel_label->priv = G_TYPE_INSTANCE_GET_PRIVATE (accel_label,
+ GTK_TYPE_ACCEL_LABEL,
+ GtkAccelLabelPrivate);
+ priv = accel_label->priv;
priv->accel_padding = 3;
priv->accel_widget = NULL;
priv->accel_closure = NULL;
priv->accel_group = NULL;
priv->accel_string = NULL;
-
- accel_label->priv = priv;
}
/**
direction = gtk_widget_get_direction (widget);
ac_width = gtk_accel_label_get_accel_width (accel_label);
gtk_widget_get_allocation (widget, &allocation);
- gtk_widget_get_preferred_size (widget, &requisition, NULL);
+ gtk_widget_get_preferred_size (widget, NULL, &requisition);
if (allocation.width >= requisition.width + ac_width)
{
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_ACCELERATOR);
- gtk_style_context_set_state (context, gtk_widget_get_state_flags (widget));
gtk_render_layout (context, cr, x, y, accel_layout);
gtk_style_context_restore (context);
gtk_accel_label_set_accel_closure (accel_label, closure);
}
+static void
+accel_widget_weak_ref_cb (GtkAccelLabel *accel_label,
+ GtkWidget *old_accel_widget)
+{
+ g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
+ g_return_if_fail (GTK_IS_WIDGET (accel_label->priv->accel_widget));
+
+ g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
+ refetch_widget_accel_closure,
+ accel_label);
+ accel_label->priv->accel_widget = NULL;
+ g_object_notify (G_OBJECT (accel_label), "accel-widget");
+}
+
/**
* gtk_accel_label_set_accel_widget:
* @accel_label: a #GtkAccelLabel
* @accel_widget: the widget to be monitored.
*
- * Sets the widget to be monitored by this accelerator label.
- **/
+ * Sets the widget to be monitored by this accelerator label.
+ */
void
gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
- GtkWidget *accel_widget)
+ GtkWidget *accel_widget)
{
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
if (accel_widget)
g_return_if_fail (GTK_IS_WIDGET (accel_widget));
-
+
if (accel_widget != accel_label->priv->accel_widget)
{
if (accel_label->priv->accel_widget)
- {
- gtk_accel_label_set_accel_closure (accel_label, NULL);
- g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
- refetch_widget_accel_closure,
- accel_label);
- g_object_unref (accel_label->priv->accel_widget);
- }
+ {
+ gtk_accel_label_set_accel_closure (accel_label, NULL);
+ g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
+ refetch_widget_accel_closure,
+ accel_label);
+ g_object_weak_unref (G_OBJECT (accel_label->priv->accel_widget),
+ (GWeakNotify) accel_widget_weak_ref_cb, accel_label);
+ }
accel_label->priv->accel_widget = accel_widget;
if (accel_label->priv->accel_widget)
- {
- g_object_ref (accel_label->priv->accel_widget);
- g_signal_connect_object (accel_label->priv->accel_widget, "accel-closures-changed",
- G_CALLBACK (refetch_widget_accel_closure),
- accel_label, G_CONNECT_SWAPPED);
- refetch_widget_accel_closure (accel_label);
- }
+ {
+ g_object_weak_ref (G_OBJECT (accel_label->priv->accel_widget),
+ (GWeakNotify) accel_widget_weak_ref_cb, accel_label);
+ g_signal_connect_object (accel_label->priv->accel_widget, "accel-closures-changed",
+ G_CALLBACK (refetch_widget_accel_closure),
+ accel_label, G_CONNECT_SWAPPED);
+ refetch_widget_accel_closure (accel_label);
+ }
g_object_notify (G_OBJECT (accel_label), "accel-widget");
}
}