]> Pileus Git - ~andy/gtk/commitdiff
Fix line endings
authorMatthias Clasen <matthiasc@src.gnome.org>
Thu, 19 Jan 2006 13:38:50 +0000 (13:38 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Thu, 19 Jan 2006 13:38:50 +0000 (13:38 +0000)
ChangeLog
ChangeLog.pre-2-10
gtk/gtkassistant.h

index fff1903237c03a08da8d60581d79ba4374d228a1..67630806a6b070061ab117cd7909b3d3ac20a602 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkassistant.h: Fix line endings.
+
 2006-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkassistant.[hc]: Add GtkAssistant, a widget to
index fff1903237c03a08da8d60581d79ba4374d228a1..67630806a6b070061ab117cd7909b3d3ac20a602 100644 (file)
@@ -1,3 +1,7 @@
+2006-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkassistant.h: Fix line endings.
+
 2006-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkassistant.[hc]: Add GtkAssistant, a widget to
index 5d294774f6052a1a52fc45d67e5f137d2e6e6078..b48c88cab3d36aefd9d6521ac9035a88164e07cc 100644 (file)
-/* \r
- * GTK - The GIMP Toolkit\r
- * Copyright (C) 1999  Red Hat, Inc.\r
- * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>\r
- * Copyright (C) 2003  Matthias Clasen <mclasen@redhat.com>\r
- * Copyright (C) 2005  Carlos Garnacho Parro <carlosg@gnome.org>\r
- *\r
- * All rights reserved.\r
- *\r
- * This library is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Lesser General Public\r
- * License as published by the Free Software Foundation; either\r
- * version 2 of the License, or (at your option) any later version.\r
- *\r
- * This library is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
- * Lesser General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Lesser General Public\r
- * License along with this library; if not, write to the\r
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
- * Boston, MA 02111-1307, USA.\r
- */\r
-\r
-#ifndef __GTK_ASSISTANT_H__\r
-#define __GTK_ASSISTANT_H__\r
-\r
-#include <gtk/gtkwidget.h>\r
-#include <gtk/gtkwindow.h>\r
-\r
-G_BEGIN_DECLS\r
-\r
-#define GTK_TYPE_ASSISTANT         (gtk_assistant_get_type ())\r
-#define GTK_ASSISTANT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_ASSISTANT, GtkAssistant))\r
-#define GTK_ASSISTANT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_ASSISTANT, GtkAssistantClass))\r
-#define GTK_IS_ASSISTANT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_ASSISTANT))\r
-#define GTK_IS_ASSISTANT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_ASSISTANT))\r
-#define GTK_ASSISTANT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_ASSISTANT, GtkAssistantClass))\r
-\r
-typedef enum\r
-{\r
-  GTK_ASSISTANT_PAGE_CONTENT,\r
-  GTK_ASSISTANT_PAGE_INTRO,\r
-  GTK_ASSISTANT_PAGE_CONFIRM,\r
-  GTK_ASSISTANT_PAGE_SUMMARY,\r
-  GTK_ASSISTANT_PAGE_PROGRESS\r
-} GtkAssistantPageType;\r
-\r
-typedef struct _GtkAssistant      GtkAssistant;\r
-typedef struct _GtkAssistantClass GtkAssistantClass;\r
-\r
-struct _GtkAssistant\r
-{\r
-  GtkWindow  parent;\r
-\r
-  GtkWidget *cancel;\r
-  GtkWidget *forward;\r
-  GtkWidget *back;\r
-  GtkWidget *apply;\r
-  GtkWidget *close;\r
-  GtkWidget *last;\r
-};\r
-\r
-struct _GtkAssistantClass\r
-{\r
-  GtkWindowClass parent_class;\r
-\r
-  void (* prepare) (GtkAssistant *assistant);\r
-  void (* apply)   (GtkAssistant *assistant);\r
-  void (* close)   (GtkAssistant *assistant);\r
-  void (* cancel)  (GtkAssistant *assistant);\r
-\r
-  /* Padding for future expansion */\r
-  void (*_gtk_reserved1) (void);\r
-  void (*_gtk_reserved2) (void);\r
-  void (*_gtk_reserved3) (void);\r
-  void (*_gtk_reserved4) (void);\r
-  void (*_gtk_reserved5) (void);\r
-};\r
-\r
-typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);\r
-\r
-GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;\r
-GtkWidget            *gtk_assistant_new                   (void);\r
-gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);\r
-void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,\r
-                                                          gint                  page_num);\r
-gint                  gtk_assistant_get_n_pages           (GtkAssistant         *assistant);\r
-GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,\r
-                                                          gint                  page_num);\r
-gint                  gtk_assistant_prepend_page          (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-gint                  gtk_assistant_append_page           (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page,\r
-                                                          gint                  position);\r
-void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,\r
-                                                          GtkAssistantPageFunc  page_func,\r
-                                                          gpointer              data,\r
-                                                          GDestroyNotify        destroy);\r
-void                  gtk_assistant_set_page_type         (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page,\r
-                                                          GtkAssistantPageType  type);\r
-GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page,\r
-                                                          const gchar          *title);\r
-G_CONST_RETURN gchar *gtk_assistant_get_page_title        (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page,\r
-                                                          GdkPixbuf            *pixbuf);\r
-GdkPixbuf            *gtk_assistant_get_page_header_image (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-void                  gtk_assistant_set_page_side_image   (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page,\r
-                                                          GdkPixbuf            *pixbuf);\r
-GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page,\r
-                                                          gboolean              complete);\r
-gboolean              gtk_assistant_get_page_complete     (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *page);\r
-void                  gtk_assistant_add_action_widget     (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *child);\r
-void                  gtk_assistant_remove_action_widget  (GtkAssistant         *assistant,\r
-                                                          GtkWidget            *child);\r
-\r
-G_END_DECLS\r
-\r
-#endif /* __GTK_ASSISTANT_H__ */\r
+/* 
+ * GTK - The GIMP Toolkit
+ * Copyright (C) 1999  Red Hat, Inc.
+ * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>
+ * Copyright (C) 2003  Matthias Clasen <mclasen@redhat.com>
+ * Copyright (C) 2005  Carlos Garnacho Parro <carlosg@gnome.org>
+ *
+ * All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * 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.
+ */
+
+#ifndef __GTK_ASSISTANT_H__
+#define __GTK_ASSISTANT_H__
+
+#include <gtk/gtkwidget.h>
+#include <gtk/gtkwindow.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ASSISTANT         (gtk_assistant_get_type ())
+#define GTK_ASSISTANT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_ASSISTANT, GtkAssistant))
+#define GTK_ASSISTANT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_ASSISTANT, GtkAssistantClass))
+#define GTK_IS_ASSISTANT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_ASSISTANT))
+#define GTK_IS_ASSISTANT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_ASSISTANT))
+#define GTK_ASSISTANT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_ASSISTANT, GtkAssistantClass))
+
+typedef enum
+{
+  GTK_ASSISTANT_PAGE_CONTENT,
+  GTK_ASSISTANT_PAGE_INTRO,
+  GTK_ASSISTANT_PAGE_CONFIRM,
+  GTK_ASSISTANT_PAGE_SUMMARY,
+  GTK_ASSISTANT_PAGE_PROGRESS
+} GtkAssistantPageType;
+
+typedef struct _GtkAssistant      GtkAssistant;
+typedef struct _GtkAssistantClass GtkAssistantClass;
+
+struct _GtkAssistant
+{
+  GtkWindow  parent;
+
+  GtkWidget *cancel;
+  GtkWidget *forward;
+  GtkWidget *back;
+  GtkWidget *apply;
+  GtkWidget *close;
+  GtkWidget *last;
+};
+
+struct _GtkAssistantClass
+{
+  GtkWindowClass parent_class;
+
+  void (* prepare) (GtkAssistant *assistant);
+  void (* apply)   (GtkAssistant *assistant);
+  void (* close)   (GtkAssistant *assistant);
+  void (* cancel)  (GtkAssistant *assistant);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+};
+
+typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
+
+GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
+GtkWidget            *gtk_assistant_new                   (void);
+gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);
+void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
+                                                          gint                  page_num);
+gint                  gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
+GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,
+                                                          gint                  page_num);
+gint                  gtk_assistant_prepend_page          (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+gint                  gtk_assistant_append_page           (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,
+                                                          GtkWidget            *page,
+                                                          gint                  position);
+void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
+                                                          GtkAssistantPageFunc  page_func,
+                                                          gpointer              data,
+                                                          GDestroyNotify        destroy);
+void                  gtk_assistant_set_page_type         (GtkAssistant         *assistant,
+                                                          GtkWidget            *page,
+                                                          GtkAssistantPageType  type);
+GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
+                                                          GtkWidget            *page,
+                                                          const gchar          *title);
+G_CONST_RETURN gchar *gtk_assistant_get_page_title        (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,
+                                                          GtkWidget            *page,
+                                                          GdkPixbuf            *pixbuf);
+GdkPixbuf            *gtk_assistant_get_page_header_image (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+void                  gtk_assistant_set_page_side_image   (GtkAssistant         *assistant,
+                                                          GtkWidget            *page,
+                                                          GdkPixbuf            *pixbuf);
+GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
+                                                          GtkWidget            *page,
+                                                          gboolean              complete);
+gboolean              gtk_assistant_get_page_complete     (GtkAssistant         *assistant,
+                                                          GtkWidget            *page);
+void                  gtk_assistant_add_action_widget     (GtkAssistant         *assistant,
+                                                          GtkWidget            *child);
+void                  gtk_assistant_remove_action_widget  (GtkAssistant         *assistant,
+                                                          GtkWidget            *child);
+
+G_END_DECLS
+
+#endif /* __GTK_ASSISTANT_H__ */