Don't use GTK_WIDGET_NO_WINDOW in internal code anymore

[~andy/gtk] / gtk / gtkmessagedialog.h

diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 68c1b409fd50afbcb21e42b35ee8f89d4209127d..1bb1ec5fc2f0abf83595c89434f05317348ad62c 100644 (file)
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -18,28 +18,23 @@
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_MESSAGE_DIALOG_H__
 #define __GTK_MESSAGE_DIALOG_H__
 
 #include <gtk/gtkdialog.h>
+#include <gtk/gtkenums.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum
-{
-  GTK_MESSAGE_INFO,
-  GTK_MESSAGE_WARNING,
-  GTK_MESSAGE_QUESTION,
-  GTK_MESSAGE_ERROR
-} GtkMessageType;
+G_BEGIN_DECLS
 
 typedef enum
 {
@@ -58,7 +53,6 @@ typedef enum
 #define GTK_IS_MESSAGE_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE_DIALOG))
 #define GTK_MESSAGE_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
 
-
 typedef struct _GtkMessageDialog        GtkMessageDialog;
 typedef struct _GtkMessageDialogClass   GtkMessageDialogClass;
 
@@ -68,8 +62,8 @@ struct _GtkMessageDialog
   
   GtkDialog parent_instance;
   
-  GtkWidget *image;
-  GtkWidget *label;
+  GtkWidget *GSEAL (image);
+  GtkWidget *GSEAL (label);
 };
 
 struct _GtkMessageDialogClass
@@ -83,7 +77,7 @@ struct _GtkMessageDialogClass
   void (*_gtk_reserved4) (void);
 };
 
-GType      gtk_message_dialog_get_type (void);
+GType      gtk_message_dialog_get_type (void) G_GNUC_CONST;
 
 GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
                                         GtkDialogFlags  flags,
@@ -91,12 +85,30 @@ GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
                                         GtkButtonsType  buttons,
                                         const gchar    *message_format,
                                         ...) G_GNUC_PRINTF (5, 6);
- 
 
+GtkWidget* gtk_message_dialog_new_with_markup   (GtkWindow      *parent,
+                                                 GtkDialogFlags  flags,
+                                                 GtkMessageType  type,
+                                                 GtkButtonsType  buttons,
+                                                 const gchar    *message_format,
+                                                 ...) G_GNUC_PRINTF (5, 6);
+
+void       gtk_message_dialog_set_image    (GtkMessageDialog *dialog,
+                                           GtkWidget        *image);
+
+GtkWidget * gtk_message_dialog_get_image   (GtkMessageDialog *dialog);
+
+void       gtk_message_dialog_set_markup  (GtkMessageDialog *message_dialog,
+                                           const gchar      *str);
+
+void       gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
+                                                     const gchar      *message_format,
+                                                     ...) G_GNUC_PRINTF (2, 3);
 
+void       gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
+                                                       const gchar      *message_format,
+                                                       ...) G_GNUC_PRINTF (2, 3);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_MESSAGE_DIALOG_H__ */