GtkColorChooserWidget: deselect swatch before removing palettes

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

diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index e452e156173c27dbcbc1423e2402fde97ba2c7f4..8ac451bfaac9704ff86a816978647950eaead058 100644 (file)
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -18,18 +18,16 @@
  * 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/>.
  */
 
+#ifndef __GTK_ASSISTANT_H__
+#define __GTK_ASSISTANT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ASSISTANT_H__
-#define __GTK_ASSISTANT_H__
-
 #include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
@@ -139,6 +137,7 @@ gint                  gtk_assistant_append_page           (GtkAssistant
 gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            gint                  position);
+GDK_AVAILABLE_IN_3_2
 void                  gtk_assistant_remove_page           (GtkAssistant         *assistant,
                                                            gint                  page_num);
 void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
@@ -156,18 +155,20 @@ void                  gtk_assistant_set_page_title        (GtkAssistant
 const gchar *         gtk_assistant_get_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+GDK_DEPRECATED_IN_3_2
 void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            GdkPixbuf            *pixbuf);
+GDK_DEPRECATED_IN_3_2
 GdkPixbuf            *gtk_assistant_get_page_header_image (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
+GDK_DEPRECATED_IN_3_2
 void                  gtk_assistant_set_page_side_image   (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            GdkPixbuf            *pixbuf);
+GDK_DEPRECATED_IN_3_2
 GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
-#endif
 
 void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
                                                            GtkWidget            *page,