filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

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

diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
index b29b0d99559a6cc6f540505639fe5177ba33ec72..c1dcda32eda2444fdfba0d0584316b16040b563d 100644 (file)
--- a/gtk/gtkappchooserdialog.h
+++ b/gtk/gtkappchooserdialog.h
@@ -15,37 +15,31 @@
  * 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/>.
  *
  * Authors: Dave Camp <dave@novell.com>
  *          Alexander Larsson <alexl@redhat.com>
  *          Cosimo Cecchi <ccecchi@redhat.com>
  */
 
+#ifndef __GTK_APP_CHOOSER_DIALOG_H__
+#define __GTK_APP_CHOOSER_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APP_CHOOSER_DIALOG_H__
-#define __GTK_APP_CHOOSER_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gio/gio.h>
 
-#define GTK_TYPE_APP_CHOOSER_DIALOG\
-  (gtk_app_chooser_dialog_get_type ())
-#define GTK_APP_CHOOSER_DIALOG(obj)\
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialog))
-#define GTK_APP_CHOOSER_DIALOG_CLASS(klass)\
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass))
-#define GTK_IS_APP_CHOOSER_DIALOG(obj)\
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_DIALOG))
-#define GTK_IS_APP_CHOOSER_DIALOG_CLASS(klass)\
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_DIALOG))
-#define GTK_APP_CHOOSER_DIALOG_GET_CLASS(obj)\
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass))
+G_BEGIN_DECLS
+
+#define GTK_TYPE_APP_CHOOSER_DIALOG            (gtk_app_chooser_dialog_get_type ())
+#define GTK_APP_CHOOSER_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialog))
+#define GTK_APP_CHOOSER_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass))
+#define GTK_IS_APP_CHOOSER_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_DIALOG))
+#define GTK_IS_APP_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_DIALOG))
+#define GTK_APP_CHOOSER_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass))
 
 typedef struct _GtkAppChooserDialog        GtkAppChooserDialog;
 typedef struct _GtkAppChooserDialogClass   GtkAppChooserDialogClass;
@@ -65,15 +59,20 @@ struct _GtkAppChooserDialogClass {
   gpointer padding[16];
 };
 
-GType      gtk_app_chooser_dialog_get_type (void) G_GNUC_CONST;
+GType         gtk_app_chooser_dialog_get_type             (void) G_GNUC_CONST;
+
+GtkWidget *   gtk_app_chooser_dialog_new                  (GtkWindow           *parent,
+                                                           GtkDialogFlags       flags,
+                                                           GFile               *file);
+GtkWidget *   gtk_app_chooser_dialog_new_for_content_type (GtkWindow           *parent,
+                                                           GtkDialogFlags       flags,
+                                                           const gchar         *content_type);
 
-GtkWidget * gtk_app_chooser_dialog_new (GtkWindow *parent,
-                                       GtkDialogFlags flags,
-                                       GFile *file);
-GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent,
-                                                        GtkDialogFlags flags,
-                                                        const gchar *content_type);
+GtkWidget *   gtk_app_chooser_dialog_get_widget           (GtkAppChooserDialog *self);
+void          gtk_app_chooser_dialog_set_heading          (GtkAppChooserDialog *self,
+                                                           const gchar         *heading);
+const gchar * gtk_app_chooser_dialog_get_heading          (GtkAppChooserDialog *self);
 
-GtkWidget * gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self);
+G_END_DECLS
 
 #endif /* __GTK_APP_CHOOSER_DIALOG_H__ */