Some GtkAboutDialog doc additions

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

diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 6a1c657de30ac34d7ab0872cff75611df5a90c2b..aeaa507cedebaa6dbcc1d0fdbb411713ee5b088b 100644 (file)
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -21,18 +21,20 @@
  * 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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_COLOR_SELECTION_DIALOG_H__
 #define __GTK_COLOR_SELECTION_DIALOG_H__
 
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkcolorsel.h>
-#include <gtk/gtkvbox.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+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))
@@ -42,18 +44,17 @@ extern "C" {
 #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 _GtkColorSelectionDialogClass  GtkColorSelectionDialogClass;
+typedef struct _GtkColorSelectionDialog              GtkColorSelectionDialog;
+typedef struct _GtkColorSelectionDialogPrivate       GtkColorSelectionDialogPrivate;
+typedef struct _GtkColorSelectionDialogClass         GtkColorSelectionDialogClass;
 
 
 struct _GtkColorSelectionDialog
 {
   GtkDialog parent_instance;
 
-  GtkWidget *colorsel;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-  GtkWidget *help_button;
+  /*< private >*/
+  GtkColorSelectionDialogPrivate *priv;
 };
 
 struct _GtkColorSelectionDialogClass
@@ -68,14 +69,12 @@ struct _GtkColorSelectionDialogClass
 };
 
 
-/* ColorSelectionDialog */ 
-GType      gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_color_selection_dialog_new      (const gchar *title); 
-
+/* ColorSelectionDialog */
+GType      gtk_color_selection_dialog_get_type            (void) G_GNUC_CONST;
+GtkWidget* gtk_color_selection_dialog_new                 (const gchar *title);
+GtkWidget* gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorsel);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */