gdk/gdkwindow.c, gtk/gtkwidget.c: Include fallback-c89.c

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

diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 47ed059a5629df62c78748b36e303127985da865..6fc7f464f7612951d3724e8f48107974ebd548fd 100644 (file)
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  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/>.
  */
 
 /* Color picker button for GNOME
@@ -29,14 +27,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_COLOR_BUTTON_H__
 #define __GTK_COLOR_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbutton.h>
 
 G_BEGIN_DECLS
@@ -80,28 +78,28 @@ void         gtk_color_button_set_title     (GtkColorButton *button,
                                              const gchar    *title);
 const gchar *gtk_color_button_get_title     (GtkColorButton *button);
 
-GDK_DEPRECATED_FOR(gtk_color_button_new_with_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_new_with_rgba)
 GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
-GDK_DEPRECATED_FOR(gtk_color_button_set_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_set_rgba)
 void       gtk_color_button_set_color      (GtkColorButton *button,
                                             const GdkColor *color);
-GDK_DEPRECATED_FOR(gtk_color_button_get_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_get_rgba)
 void       gtk_color_button_get_color      (GtkColorButton *button,
                                             GdkColor       *color);
-GDK_DEPRECATED_FOR(gtk_color_button_set_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_set_rgba)
 void       gtk_color_button_set_alpha      (GtkColorButton *button,
                                             guint16         alpha);
-GDK_DEPRECATED_FOR(gtk_color_button_get_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_get_rgba)
 guint16    gtk_color_button_get_alpha      (GtkColorButton *button);
-GDK_DEPRECATED_FOR(gtk_color_chooser_set_use_alpha)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_use_alpha)
 void         gtk_color_button_set_use_alpha (GtkColorButton *button,
                                              gboolean        use_alpha);
-GDK_DEPRECATED_FOR(gtk_color_chooser_get_use_alpha)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_use_alpha)
 gboolean     gtk_color_button_get_use_alpha (GtkColorButton *button);
-GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
 void         gtk_color_button_set_rgba      (GtkColorButton *button,
                                              const GdkRGBA  *rgba);
-GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
 void         gtk_color_button_get_rgba      (GtkColorButton *button,
                                              GdkRGBA        *rgba);