stylecontext: Do invalidation on first resize container

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

diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 896ef335d4691b7a6f1ff07c7048d93ea766c605..e511281434fba2887b6c6c600063969aebd9cc49 100644 (file)
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 David Abilleira Freijeiro <odaf@nexo.es>
  * All rights reserved
  * Based on gnome-color-picker by Federico Mena <federico@nuclecu.unam.mx>
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ -14,19 +14,22 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 /*
  * Modified by the GTK+ Team and others 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/.
  */
 
 #ifndef __GTK_FONT_BUTTON_H__
 #define __GTK_FONT_BUTTON_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbutton.h>
 
 
@@ -41,7 +44,6 @@ G_BEGIN_DECLS
 #define GTK_IS_FONT_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_BUTTON))
 #define GTK_IS_FONT_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_BUTTON))
 #define GTK_FONT_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_BUTTON, GtkFontButtonClass))
-#define GTK_FONT_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_FONT_BUTTON, GtkFontButtonPrivate))
 
 typedef struct _GtkFontButton        GtkFontButton;
 typedef struct _GtkFontButtonClass   GtkFontButtonClass;
@@ -72,7 +74,7 @@ GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
 GtkWidget            *gtk_font_button_new            (void);
 GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
 
-G_CONST_RETURN gchar *gtk_font_button_get_title      (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_title      (GtkFontButton *font_button);
 void                  gtk_font_button_set_title      (GtkFontButton *font_button,
                                                       const gchar   *title);
 gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
@@ -81,7 +83,7 @@ void                  gtk_font_button_set_use_font   (GtkFontButton *font_button
 gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
 void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
                                                       gboolean       use_size);
-G_CONST_RETURN gchar* gtk_font_button_get_font_name  (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_font_name  (GtkFontButton *font_button);
 gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
                                                       const gchar   *fontname);
 gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);
@@ -93,9 +95,5 @@ void                  gtk_font_button_set_show_size  (GtkFontButton *font_button
 
 G_END_DECLS
 
-    
-#endif /* __GTK_FONT_BUTTON_H__ */
-
-
-
 
+#endif /* __GTK_FONT_BUTTON_H__ */