Add g_return_if_fail() (_gtk_file_chooser_embed_get_resizable_hints): Add

Sun Feb 29 01:51:27 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkfilechooserembed.c
        (_gtk_file_chooser_embed_get_default_size):  Add g_return_if_fail()
        (_gtk_file_chooser_embed_get_resizable_hints): Add g_return_if_fail()

        * gtk/gtkfilechooserdialog.c
        (file_chooser_widget_default_size_changed): Get the correct
        initial size for the dialog.  Also, don't bother with
        gtk_window_set_default_size().  It's not really meaningful.

        * gtk/gtkfilechooserdefault.c
        (gtk_file_chooser_default_get_default_size): Get the correct
        spacing for the preview_widget
        (update_preview_widget_visibility): Clear widget field after we
        destroy it.

diff --git a/ChangeLog b/ChangeLog
index 94a642f748754544bfb8960d15f25c601d3aca92..5348b00c05925030b01af60fdb0a634b894afb06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Sun Feb 29 01:51:27 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserembed.c
+       (_gtk_file_chooser_embed_get_default_size):  Add g_return_if_fail()
+       (_gtk_file_chooser_embed_get_resizable_hints): Add g_return_if_fail()
+
+       * gtk/gtkfilechooserdialog.c
+       (file_chooser_widget_default_size_changed): Get the correct
+       initial size for the dialog.  Also, don't bother with
+       gtk_window_set_default_size().  It's not really meaningful.
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_default_size): Get the correct
+       spacing for the preview_widget
+       (update_preview_widget_visibility): Clear widget field after we
+       destroy it.
+
 2004-02-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 94a642f748754544bfb8960d15f25c601d3aca92..5348b00c05925030b01af60fdb0a634b894afb06 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+Sun Feb 29 01:51:27 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserembed.c
+       (_gtk_file_chooser_embed_get_default_size):  Add g_return_if_fail()
+       (_gtk_file_chooser_embed_get_resizable_hints): Add g_return_if_fail()
+
+       * gtk/gtkfilechooserdialog.c
+       (file_chooser_widget_default_size_changed): Get the correct
+       initial size for the dialog.  Also, don't bother with
+       gtk_window_set_default_size().  It's not really meaningful.
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_default_size): Get the correct
+       spacing for the preview_widget
+       (update_preview_widget_visibility): Clear widget field after we
+       destroy it.
+
 2004-02-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 94a642f748754544bfb8960d15f25c601d3aca92..5348b00c05925030b01af60fdb0a634b894afb06 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+Sun Feb 29 01:51:27 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserembed.c
+       (_gtk_file_chooser_embed_get_default_size):  Add g_return_if_fail()
+       (_gtk_file_chooser_embed_get_resizable_hints): Add g_return_if_fail()
+
+       * gtk/gtkfilechooserdialog.c
+       (file_chooser_widget_default_size_changed): Get the correct
+       initial size for the dialog.  Also, don't bother with
+       gtk_window_set_default_size().  It's not really meaningful.
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_default_size): Get the correct
+       spacing for the preview_widget
+       (update_preview_widget_visibility): Clear widget field after we
+       destroy it.
+
 2004-02-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 94a642f748754544bfb8960d15f25c601d3aca92..5348b00c05925030b01af60fdb0a634b894afb06 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+Sun Feb 29 01:51:27 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserembed.c
+       (_gtk_file_chooser_embed_get_default_size):  Add g_return_if_fail()
+       (_gtk_file_chooser_embed_get_resizable_hints): Add g_return_if_fail()
+
+       * gtk/gtkfilechooserdialog.c
+       (file_chooser_widget_default_size_changed): Get the correct
+       initial size for the dialog.  Also, don't bother with
+       gtk_window_set_default_size().  It's not really meaningful.
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_default_size): Get the correct
+       spacing for the preview_widget
+       (update_preview_widget_visibility): Clear widget field after we
+       destroy it.
+
 2004-02-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 94a642f748754544bfb8960d15f25c601d3aca92..5348b00c05925030b01af60fdb0a634b894afb06 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+Sun Feb 29 01:51:27 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserembed.c
+       (_gtk_file_chooser_embed_get_default_size):  Add g_return_if_fail()
+       (_gtk_file_chooser_embed_get_resizable_hints): Add g_return_if_fail()
+
+       * gtk/gtkfilechooserdialog.c
+       (file_chooser_widget_default_size_changed): Get the correct
+       initial size for the dialog.  Also, don't bother with
+       gtk_window_set_default_size().  It's not really meaningful.
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_default_size): Get the correct
+       spacing for the preview_widget
+       (update_preview_widget_visibility): Clear widget field after we
+       destroy it.
+
 2004-02-29  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c

diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml
index 77a7f5f46675625f734e34af37718ccba1c1ab1d..5e8f6a21d7afead306372ac49fce871494cc02f4 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -94,7 +94,6 @@ an application.)
 @list: the list shown in the drop-down window.
 @Deprecated: Use #GtkComboBox instead.
 
-
 <!-- ##### ARG GtkCombo:allow-empty ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtkfilechooser.sgml b/docs/reference/gtk/tmpl/gtkfilechooser.sgml
index be434ed0b0b8f52c5b79aaa3ef4e487b5b1621e6..858b4bcb6db8d54500937d3e6d3a5b51e7b2cd71 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkfilechooser.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooser.sgml
@@ -200,6 +200,11 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
 
 </para>
 
+<!-- ##### ARG GtkFileChooser:use-preview-label ##### -->
+<para>
+
+</para>
+
 <!-- ##### ENUM GtkFileChooserAction ##### -->
     <para>
       Describes whether a #GtkFileChooser is being used to open

diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 3ced55977f6c06ef5ddddf06fcd0cf436b6e7162..de5248e7af8aa160264a86089bfd5ee45ea4f0ec 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -37,7 +37,6 @@ should be accessed using the functions below.
 
 @Deprecated: Use #GtkComboBox instead.
 
-
 <!-- ##### SIGNAL GtkOptionMenu::changed ##### -->
 <para>
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 9ac5a9a3b2264f52de9a15b8802812050202ccd6..8e6c1e3505690e858dd75daa93661110d6d2a74c 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -72,7 +72,6 @@ typedef struct _GtkFileChooserDefaultClass GtkFileChooserDefaultClass;
 #define GTK_IS_FILE_CHOOSER_DEFAULT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_DEFAULT))
 #define GTK_FILE_CHOOSER_DEFAULT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DEFAULT, GtkFileChooserDefaultClass))
 
-#define PREVIEW_HBOX_SPACING 12
 
 struct _GtkFileChooserDefaultClass
 {
@@ -207,6 +206,9 @@ typedef enum {
 /* Standard icon size */
 /* FIXME: maybe this should correspond to the font size in the tree views... */
 #define ICON_SIZE 20
+#define PREVIEW_HBOX_SPACING 12
+#define NUM_LINES 40
+#define NUM_CHARS 60
 
 static void gtk_file_chooser_default_class_init       (GtkFileChooserDefaultClass *class);
 static void gtk_file_chooser_default_iface_init       (GtkFileChooserIface        *iface);
@@ -639,7 +641,10 @@ update_preview_widget_visibility (GtkFileChooserDefault *impl)
   else
     {
       if (impl->preview_label)
-       gtk_widget_destroy (impl->preview_label);
+       {
+         gtk_widget_destroy (impl->preview_label);
+         impl->preview_label = NULL;
+       }
     }
 
   if (impl->preview_widget_active && impl->preview_widget)
@@ -2186,6 +2191,7 @@ update_appearance (GtkFileChooserDefault *impl)
       gtk_widget_hide (impl->save_extra_align);
       gtk_widget_hide (impl->browse_extra_align);
     }
+
   g_signal_emit_by_name (impl, "default-size-changed");
 }
 
@@ -2342,7 +2348,7 @@ static void
 gtk_file_chooser_default_style_set      (GtkWidget *widget,
                                         GtkStyle  *previous_style)
 {
-    if (GTK_WIDGET_CLASS (parent_class)->style_set)
+  if (GTK_WIDGET_CLASS (parent_class)->style_set)
     GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
 
   g_signal_emit_by_name (widget, "default-size-changed");
@@ -3094,9 +3100,6 @@ gtk_file_chooser_default_list_shortcut_folders (GtkFileChooser *chooser)
   return g_slist_reverse (list);
 }
 
-#define NUM_LINES 40
-#define NUM_CHARS 50
-
 /* Guesses a size based upon font sizes */
 static void
 find_good_size_from_style (GtkWidget *widget,
@@ -3145,7 +3148,7 @@ gtk_file_chooser_default_get_default_size (GtkFileChooserEmbed *chooser_embed,
   find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
 
   if (impl->preview_widget_active && impl->preview_widget)
-    *default_width += impl->preview_widget->requisition.width + PREVIEW_HBOX_SPACING;
+    *default_width += impl->preview_box->requisition.width + PREVIEW_HBOX_SPACING;
 }
 
 static void

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 6239f1f21d5055b708cd77486ca8af39662c0917..e9cb26ea410367bea637e2ae56f5084778407c46 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -27,9 +27,6 @@
 
 #include <stdarg.h>
 
-#define NUM_LINES 40
-#define NUM_CHARS 50
-
 struct _GtkFileChooserDialogPrivate
 {
   GtkWidget *widget;
@@ -59,8 +56,8 @@ static void     gtk_file_chooser_dialog_get_property (GObject               *obj
                                                      GValue                *value,
                                                      GParamSpec            *pspec);
 
-static void gtk_file_chooser_dialog_style_set      (GtkWidget *widget,
-                                                   GtkStyle  *previous_style);
+static void     gtk_file_chooser_dialog_style_set    (GtkWidget             *widget,
+                                                     GtkStyle              *previous_style);
 
 static GObjectClass *parent_class;
 
@@ -160,9 +157,14 @@ file_chooser_widget_default_size_changed (GtkWidget            *widget,
   gint extra_width;
   gint extra_height;
   gint width, height;
+  GtkRequisition req;
 
   priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
 
+  /* Force a size request of everything before we start.  This will make sure
+   * that widget->requisition is meaningful. */
+  gtk_widget_size_request (GTK_WIDGET (dialog), &req);
+
   /* Determine how much space the rest of the dialog uses compared to priv->widget */
   extra_width = GTK_WIDGET (dialog)->requisition.width - priv->widget->requisition.width;
   extra_height = GTK_WIDGET (dialog)->requisition.height - priv->widget->requisition.height;
@@ -173,7 +175,6 @@ file_chooser_widget_default_size_changed (GtkWidget            *widget,
   width = extra_width + width;
   height = extra_height + height;
 
-  /*  g_print ("file_chooser_widget_default_size_changed: %d %d\n", width, height);*/
   /* FIXME: We should make sure that we arent' bigger than the current screen */
   if (GTK_WIDGET_REALIZED (dialog) &&
       priv->default_width > 0 &&
@@ -183,6 +184,7 @@ file_chooser_widget_default_size_changed (GtkWidget            *widget,
       gint dx, dy;
 
       gtk_window_get_size (GTK_WINDOW (dialog), &cur_width, &cur_height);
+
       dx = width - priv->default_width;
       dy = height - priv->default_height;
       gtk_window_resize (GTK_WINDOW (dialog),
@@ -191,7 +193,7 @@ file_chooser_widget_default_size_changed (GtkWidget            *widget,
     }
   else
     {
-      gtk_window_set_default_size (GTK_WINDOW (dialog), width, height);
+      gtk_window_resize (GTK_WINDOW (dialog), width, height);
     }
   priv->default_width = width;
   priv->default_height = height;
@@ -268,6 +270,7 @@ gtk_file_chooser_dialog_get_property (GObject         *object,
   g_object_get_property (G_OBJECT (priv->widget), pspec->name, value);
 }
 
+#if 0
 static void
 set_default_size (GtkFileChooserDialog *dialog)
 {
@@ -316,6 +319,7 @@ set_default_size (GtkFileChooserDialog *dialog)
                               (default_width == -1) ? width : default_width,
                               (default_height == -1) ? height : default_height);
 }
+#endif
 
 static void
 gtk_file_chooser_dialog_style_set (GtkWidget *widget,

diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index 89637e347507cc026feaa5dd28c8329d85482c9e..72072408b5d97c1eb3602c31cab1da27a22f4413 100644 (file)
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -147,16 +147,20 @@ _gtk_file_chooser_embed_get_default_size (GtkFileChooserEmbed *chooser_embed,
                                         gint                *default_height)
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed));
+  g_return_if_fail (default_width != NULL);
+  g_return_if_fail (default_height != NULL);
 
   GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_default_size (chooser_embed, default_width, default_height);
 }
 
 void
 _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-                                           gboolean            *resize_horizontally,
-                                           gboolean            *resize_vertically)
+                                            gboolean            *resize_horizontally,
+                                            gboolean            *resize_vertically)
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed));
+  g_return_if_fail (resize_horizontally != NULL);
+  g_return_if_fail (resize_vertically != NULL);
 
   GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
 }