GtkBubbleWindow: use OSD style class

[~andy/gtk] / gtk / deprecated / gtkcolorsel.h

diff --git a/gtk/deprecated/gtkcolorsel.h b/gtk/deprecated/gtkcolorsel.h
index 9acf9c3ee112d71f8967f14bd1172d6d7216b949..37212eb134db2158a3758984f5884c42505fe0bb 100644 (file)
--- a/gtk/deprecated/gtkcolorsel.h
+++ b/gtk/deprecated/gtkcolorsel.h
@@ -13,9 +13,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/>.
  */
 
 /*
@@ -25,13 +23,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_COLOR_SELECTION_H__
+#define __GTK_COLOR_SELECTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SELECTION_H__
-#define __GTK_COLOR_SELECTION_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkbox.h>
 
@@ -89,67 +87,67 @@ struct _GtkColorSelectionClass
 /* ColorSelection */
 
 GType      gtk_color_selection_get_type                (void) G_GNUC_CONST;
-GDK_DEPRECATED_FOR(gtk_color_chooser_widget_new)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_widget_new)
 GtkWidget *gtk_color_selection_new                     (void);
-GDK_DEPRECATED_FOR(gtk_color_chooser_get_use_alpha)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_use_alpha)
 gboolean   gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel);
-GDK_DEPRECATED_FOR(gtk_color_chooser_set_use_alpha)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_use_alpha)
 void       gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
                                                        gboolean           has_opacity);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 gboolean   gtk_color_selection_get_has_palette         (GtkColorSelection *colorsel);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void       gtk_color_selection_set_has_palette         (GtkColorSelection *colorsel,
                                                        gboolean           has_palette);
 
 
-GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
 void     gtk_color_selection_set_current_alpha   (GtkColorSelection *colorsel,
                                                  guint16            alpha);
-GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
 guint16  gtk_color_selection_get_current_alpha   (GtkColorSelection *colorsel);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void     gtk_color_selection_set_previous_alpha  (GtkColorSelection *colorsel,
                                                  guint16            alpha);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 guint16  gtk_color_selection_get_previous_alpha  (GtkColorSelection *colorsel);
 
-GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
 void     gtk_color_selection_set_current_rgba    (GtkColorSelection *colorsel,
                                                   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_selection_get_current_rgba    (GtkColorSelection *colorsel,
                                                   GdkRGBA           *rgba);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void     gtk_color_selection_set_previous_rgba   (GtkColorSelection *colorsel,
                                                   const GdkRGBA     *rgba);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void     gtk_color_selection_get_previous_rgba   (GtkColorSelection *colorsel,
                                                   GdkRGBA           *rgba);
 
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 gboolean gtk_color_selection_is_adjusting        (GtkColorSelection *colorsel);
 
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 gboolean gtk_color_selection_palette_from_string (const gchar       *str,
                                                   GdkColor         **colors,
                                                   gint              *n_colors);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 gchar*   gtk_color_selection_palette_to_string   (const GdkColor    *colors,
                                                   gint               n_colors);
 
 GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
 
-GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
 void     gtk_color_selection_set_current_color   (GtkColorSelection *colorsel,
                                                   const GdkColor    *color);
-GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
+GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
 void     gtk_color_selection_get_current_color   (GtkColorSelection *colorsel,
                                                   GdkColor          *color);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void     gtk_color_selection_set_previous_color  (GtkColorSelection *colorsel,
                                                   const GdkColor    *color);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void     gtk_color_selection_get_previous_color  (GtkColorSelection *colorsel,
                                                   GdkColor          *color);