GtkLabelAccessible: Sanity check _get_text() input values

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

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index da940be833ca3e081c2805378cf5d708c4b57108..d46f181eff4d0c3a23cc2616bfa91789fe789ee0 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -12,31 +12,29 @@
  * 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/>.
  */
 
 /*
  * 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/.
  */
 
 #ifndef __GTK_BUTTON_H__
 #define __GTK_BUTTON_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #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))
@@ -45,28 +43,16 @@ extern "C" {
 #define GTK_IS_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
 #define GTK_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
 
-typedef struct _GtkButton        GtkButton;
-typedef struct _GtkButtonClass   GtkButtonClass;
+typedef struct _GtkButton             GtkButton;
+typedef struct _GtkButtonPrivate      GtkButtonPrivate;
+typedef struct _GtkButtonClass        GtkButtonClass;
 
 struct _GtkButton
 {
+  /*< private >*/
   GtkBin bin;
 
-  GdkWindow *event_window;
-
-  gchar *label_text;
-
-  guint activate_timeout;
-
-  guint constructed : 1;
-  guint in_button : 1;
-  guint button_down : 1;
-  guint relief : 2;
-  guint use_underline : 1;
-  guint use_stock : 1;
-  guint depressed : 1;
-  guint depress_on_activate : 1;
-  guint focus_on_click : 1;
+  GtkButtonPrivate *priv;
 };
 
 struct _GtkButtonClass
@@ -93,10 +79,14 @@ GtkWidget*     gtk_button_new               (void);
 GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
 GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
 GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
+void           gtk_button_clicked           (GtkButton      *button);
+GDK_DEPRECATED
 void           gtk_button_pressed           (GtkButton      *button);
+GDK_DEPRECATED
 void           gtk_button_released          (GtkButton      *button);
-void           gtk_button_clicked           (GtkButton      *button);
+GDK_DEPRECATED
 void           gtk_button_enter             (GtkButton      *button);
+GDK_DEPRECATED
 void           gtk_button_leave             (GtkButton      *button);
 
 void                  gtk_button_set_relief         (GtkButton      *button,
@@ -104,7 +94,7 @@ void                  gtk_button_set_relief         (GtkButton      *button,
 GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
 void                  gtk_button_set_label          (GtkButton      *button,
                                                     const gchar    *label);
-G_CONST_RETURN gchar *gtk_button_get_label          (GtkButton      *button);
+const gchar *         gtk_button_get_label          (GtkButton      *button);
 void                  gtk_button_set_use_underline  (GtkButton      *button,
                                                     gboolean        use_underline);
 gboolean              gtk_button_get_use_underline  (GtkButton      *button);
@@ -123,20 +113,18 @@ void                  gtk_button_get_alignment      (GtkButton      *button,
 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);
+GDK_AVAILABLE_IN_3_6
+void                  gtk_button_set_always_show_image (GtkButton   *button,
+                                                        gboolean     always_show);
+GDK_AVAILABLE_IN_3_6
+gboolean              gtk_button_get_always_show_image (GtkButton   *button);
 
+GdkWindow*            gtk_button_get_event_window   (GtkButton      *button);
 
-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 */
 
+G_END_DECLS
 
 #endif /* __GTK_BUTTON_H__ */