AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 14:00:10 +00:00
Code Issues Projects Releases Wiki Activity

messagedialog: Remove priv pointer

Browse Source
This commit is contained in:
Timm Bäder 2018-06-18 11:14:36 +02:00
parent 2d6955285c
commit 3756234708
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/gtkmessagedialog.c
View File

@ -98,7 +98,7 @@
* the message area as an internal child with the name “message_area”. * the message area as an internal child with the name “message_area”.
*/ */
struct _GtkMessageDialogPrivate typedef struct
{ {
GtkWidget *label; GtkWidget *label;
GtkWidget *message_area; /* vbox for the primary and secondary labels, and any extra content from the caller */ GtkWidget *message_area; /* vbox for the primary and secondary labels, and any extra content from the caller */
@ -107,7 +107,7 @@ struct _GtkMessageDialogPrivate
guint has_primary_markup : 1; guint has_primary_markup : 1;
guint has_secondary_text : 1; guint has_secondary_text : 1;
guint message_type : 3; guint message_type : 3;
}; } GtkMessageDialogPrivate;
static void gtk_message_dialog_constructed (GObject *object); static void gtk_message_dialog_constructed (GObject *object);
static void gtk_message_dialog_set_property (GObject *object, static void gtk_message_dialog_set_property (GObject *object,
@ -268,14 +268,11 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
static void static void
gtk_message_dialog_init (GtkMessageDialog *dialog) gtk_message_dialog_init (GtkMessageDialog *dialog)
{ {
GtkMessageDialogPrivate *priv; GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
GtkWidget *action_area; GtkWidget *action_area;
GtkSettings *settings; GtkSettings *settings;
gboolean use_caret; gboolean use_caret;
dialog->priv = gtk_message_dialog_get_instance_private (dialog);
priv = dialog->priv;
priv->has_primary_markup = FALSE; priv->has_primary_markup = FALSE;
priv->has_secondary_text = FALSE; priv->has_secondary_text = FALSE;
priv->has_primary_markup = FALSE; priv->has_primary_markup = FALSE;
@ -295,7 +292,7 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
static void static void
setup_primary_label_font (GtkMessageDialog *dialog) setup_primary_label_font (GtkMessageDialog *dialog)
{ {
GtkMessageDialogPrivate *priv = dialog->priv; GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
if (!priv->has_primary_markup) if (!priv->has_primary_markup)
{ {
@ -327,7 +324,7 @@ static void
setup_type (GtkMessageDialog *dialog, setup_type (GtkMessageDialog *dialog,
GtkMessageType type) GtkMessageType type)
{ {
GtkMessageDialogPrivate *priv = dialog->priv; GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
const gchar *name = NULL; const gchar *name = NULL;
AtkObject *atk_obj; AtkObject *atk_obj;
@ -426,7 +423,7 @@ gtk_message_dialog_set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object); GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object);
GtkMessageDialogPrivate *priv = dialog->priv; GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
switch (prop_id) switch (prop_id)
{ {
@ -496,7 +493,7 @@ gtk_message_dialog_get_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object); GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object);
GtkMessageDialogPrivate *priv = dialog->priv; GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
switch (prop_id) switch (prop_id)
{ {
@ -572,11 +569,12 @@ gtk_message_dialog_new (GtkWindow *parent,
if (message_format) if (message_format)
{ {
GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private ((GtkMessageDialog*)dialog);
va_start (args, message_format); va_start (args, message_format);
msg = g_strdup_vprintf (message_format, args); msg = g_strdup_vprintf (message_format, args);
va_end (args); va_end (args);
gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (widget)->priv->label), msg); gtk_label_set_text (GTK_LABEL (priv->label), msg);
g_free (msg); g_free (msg);
} }
@ -672,12 +670,10 @@ void
gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog, gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog,
const gchar *str) const gchar *str)
{ {
GtkMessageDialogPrivate *priv; GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog)); g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
priv = message_dialog->priv;
priv->has_primary_markup = TRUE; priv->has_primary_markup = TRUE;
gtk_label_set_markup (GTK_LABEL (priv->label), str); gtk_label_set_markup (GTK_LABEL (priv->label), str);
} }
@ -696,14 +692,12 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
const gchar *message_format, const gchar *message_format,
...) ...)
{ {
GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
va_list args; va_list args;
gchar *msg = NULL; gchar *msg = NULL;
GtkMessageDialogPrivate *priv;
g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog)); g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
priv = message_dialog->priv;
if (message_format) if (message_format)
{ {
priv->has_secondary_text = TRUE; priv->has_secondary_text = TRUE;
@ -756,14 +750,12 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
const gchar *message_format, const gchar *message_format,
...) ...)
{ {
GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
va_list args; va_list args;
gchar *msg = NULL; gchar *msg = NULL;
GtkMessageDialogPrivate *priv;
g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog)); g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
priv = message_dialog->priv;
if (message_format) if (message_format)
{ {
priv->has_secondary_text = TRUE; priv->has_secondary_text = TRUE;
@ -802,9 +794,11 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
GtkWidget * GtkWidget *
gtk_message_dialog_get_message_area (GtkMessageDialog *message_dialog) gtk_message_dialog_get_message_area (GtkMessageDialog *message_dialog)
{ {
GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog), NULL); g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog), NULL);
return message_dialog->priv->message_area; return priv->message_area;
} }
static void static void

4
gtk/gtkmessagedialog.h
View File

@ -43,15 +43,11 @@ G_BEGIN_DECLS
#define GTK_MESSAGE_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass)) #define GTK_MESSAGE_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
typedef struct _GtkMessageDialog GtkMessageDialog; typedef struct _GtkMessageDialog GtkMessageDialog;
typedef struct _GtkMessageDialogPrivate GtkMessageDialogPrivate;
typedef struct _GtkMessageDialogClass GtkMessageDialogClass; typedef struct _GtkMessageDialogClass GtkMessageDialogClass;
struct _GtkMessageDialog struct _GtkMessageDialog
{ {
GtkDialog parent_instance; GtkDialog parent_instance;
/*< private >*/
GtkMessageDialogPrivate *priv;
}; };
struct _GtkMessageDialogClass struct _GtkMessageDialogClass