summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog14
-rw-r--r--ChangeLog.pre-2-014
-rw-r--r--ChangeLog.pre-2-1014
-rw-r--r--ChangeLog.pre-2-214
-rw-r--r--ChangeLog.pre-2-414
-rw-r--r--ChangeLog.pre-2-614
-rw-r--r--ChangeLog.pre-2-814
-rw-r--r--gdk/x11/gdkselection-x11.c4
-rw-r--r--gtk/gtkwindow.c22
-rw-r--r--gtk/testgtk.c14
-rw-r--r--tests/testgtk.c14
11 files changed, 140 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a64e7631..705658b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0a64e7631..705658b11 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a64e7631..705658b11 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a64e7631..705658b11 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a64e7631..705658b11 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a64e7631..705658b11 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a64e7631..705658b11 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Sun Nov 12 14:10:09 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): Fix
+ problem with using result of g_get_charset() backwards -
+ pointed out by Mikael Hermansson <mikeh@bahnhof.se>.
+
+ * gtk/gtkwindow.c (gtk_window_compute_hints): Support
+ negative min_width/height and max_width/height to
+ mean "requisition"; this allows setting a window
+ to be user-resizable in only one direction easily.
+
+ * gtk/testgtk.c (create_main_window): Remove hard-coded
+ usize - set a default size in the vertical direction.
+
Sun Nov 12 13:33:01 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c: Add some missing casts. Support
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 454d1cbd7..8ca938983 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -415,7 +415,7 @@ gdk_text_property_to_utf8_list (GdkAtom encoding,
gint local_count;
gint i;
gchar *charset = NULL;
- gboolean need_conversion= g_get_charset (&charset);
+ gboolean need_conversion = !g_get_charset (&charset);
gint count = 0;
GError *error = NULL;
@@ -605,7 +605,7 @@ gdk_utf8_to_compound_text (const gchar *str,
g_return_val_if_fail (str != NULL, FALSE);
- need_conversion = g_get_charset (&charset);
+ need_conversion = !g_get_charset (&charset);
tmp_str = sanitize_utf8 (str);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index dbf9ecaf8..821f9d855 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2125,8 +2125,15 @@ gtk_window_compute_hints (GtkWindow *window,
if (*new_flags & GDK_HINT_MIN_SIZE)
{
- new_geometry->min_width += extra_width;
- new_geometry->min_height += extra_height;
+ if (new_geometry->min_width < 0)
+ new_geometry->min_width = requisition.width;
+ else
+ new_geometry->min_width += extra_width;
+
+ if (new_geometry->min_height < 0)
+ new_geometry->min_width = requisition.height;
+ else
+ new_geometry->min_height += extra_height;
}
else if (!window->allow_shrink)
{
@@ -2138,8 +2145,15 @@ gtk_window_compute_hints (GtkWindow *window,
if (*new_flags & GDK_HINT_MAX_SIZE)
{
- new_geometry->max_width += extra_width;
- new_geometry->max_height += extra_height;
+ if (new_geometry->max_width < 0)
+ new_geometry->max_width = requisition.width;
+ else
+ new_geometry->max_width += extra_width;
+
+ if (new_geometry->max_height < 0)
+ new_geometry->max_width = requisition.height;
+ else
+ new_geometry->max_height += extra_height;
}
else if (!window->allow_grow)
{
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index fd1795f2f..cfcbaf130 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -9151,13 +9151,21 @@ create_main_window (void)
GtkWidget *label;
gchar buffer[64];
GtkWidget *separator;
+ GdkGeometry geometry;
int i;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
gtk_widget_set_name (window, "main window");
- gtk_widget_set_usize (window, 200, 400);
gtk_widget_set_uposition (window, 20, 20);
+ gtk_window_set_default_size (GTK_WINDOW (window), -1, 400);
+
+ geometry.min_width = -1;
+ geometry.min_height = -1;
+ geometry.max_width = -1;
+ geometry.max_height = G_MAXSHORT;
+ gtk_window_set_geometry_hints (GTK_WINDOW (window), NULL,
+ &geometry,
+ GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_main_quit),
@@ -9187,7 +9195,7 @@ create_main_window (void)
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE, 0);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index fd1795f2f..cfcbaf130 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -9151,13 +9151,21 @@ create_main_window (void)
GtkWidget *label;
gchar buffer[64];
GtkWidget *separator;
+ GdkGeometry geometry;
int i;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
gtk_widget_set_name (window, "main window");
- gtk_widget_set_usize (window, 200, 400);
gtk_widget_set_uposition (window, 20, 20);
+ gtk_window_set_default_size (GTK_WINDOW (window), -1, 400);
+
+ geometry.min_width = -1;
+ geometry.min_height = -1;
+ geometry.max_width = -1;
+ geometry.max_height = G_MAXSHORT;
+ gtk_window_set_geometry_hints (GTK_WINDOW (window), NULL,
+ &geometry,
+ GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_main_quit),
@@ -9187,7 +9195,7 @@ create_main_window (void)
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE, 0);
View Lorry Controller Status