Bug 526987 - GtkCellRendererCombo should allow model to be NULL

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

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index c6135b9eee6419bcc02efdb060d1ca7e9778f2c5..499615da987442628adbc0bb6e56a72645584b0c 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2001.  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_BUTTON_H__
 #define __GTK_BUTTON_H__
 
@@ -31,11 +35,10 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkimage.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_BUTTON                 (gtk_button_get_type ())
 #define GTK_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
@@ -119,20 +122,22 @@ void                  gtk_button_set_alignment      (GtkButton      *button,
 void                  gtk_button_get_alignment      (GtkButton      *button,
                                                     gfloat         *xalign,
                                                     gfloat         *yalign);
-
-
-void _gtk_button_set_depressed             (GtkButton     *button,
-                                           gboolean       depressed);
-void _gtk_button_paint                     (GtkButton     *button,
-                                           GdkRectangle  *area,
-                                           GtkStateType   state_type,
-                                           GtkShadowType  shadow_type,
-                                           const gchar   *main_detail,
-                                           const gchar   *default_detail);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+void                  gtk_button_set_image          (GtkButton      *button,
+                                                    GtkWidget      *image);
+GtkWidget*            gtk_button_get_image          (GtkButton      *button);
+void                  gtk_button_set_image_position (GtkButton      *button,
+                                                    GtkPositionType position);
+GtkPositionType       gtk_button_get_image_position (GtkButton      *button);
+
+void _gtk_button_set_depressed             (GtkButton          *button,
+                                           gboolean            depressed);
+void _gtk_button_paint                     (GtkButton          *button,
+                                           const GdkRectangle *area,
+                                           GtkStateType        state_type,
+                                           GtkShadowType       shadow_type,
+                                           const gchar        *main_detail,
+                                           const gchar        *default_detail);
+
+G_END_DECLS
 
 #endif /* __GTK_BUTTON_H__ */