GtkLabelAccessible: Sanity check _get_text() input values

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

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 01c2206a40805e21eaf4655d99af629595cc85b9..d46f181eff4d0c3a23cc2616bfa91789fe789ee0 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -12,9 +12,7 @@
  * 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/>.
  */
 
 /*
@@ -24,14 +22,14 @@
  * 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_BUTTON_H__
 #define __GTK_BUTTON_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/gtkimage.h>
 
@@ -118,6 +116,11 @@ 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);