Compare commits

...

11 Commits

Author SHA1 Message Date
Federico Mena Quintero
1839240c72 0.8 - Federico 2000-05-22 19:09:27 +00:00
Pablo Saratxaga
1b51476458 Added rule for Latvian language gtkrc file 2000-05-22 15:11:21 +00:00
Nils Barth
c4b632e781 Spelling/grammar fixes in comments.
2000-05-21  Nils Barth  <nils_barth@post.harvard.edu>

	* Spelling/grammar fixes in comments.
2000-05-21 06:13:34 +00:00
Tim Janik
48d8ec36d5 set send_event to TRUE. (gtk_drawing_area_size): queue a resize.
Fri May 19 11:52:59 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
        send_event to TRUE.
        (gtk_drawing_area_size): queue a resize.
2000-05-19 10:00:46 +00:00
Tim Janik
9ce7ba8df8 when unref-ing the handlers, also invalidate them. bug nailed down by Karl
Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
        the handlers, also invalidate them. bug nailed down by Karl Nelson
        <kenelson@ece.ucdavis.edu>.
2000-05-19 08:22:39 +00:00
Tim Janik
719f258bc6 handle "(nil)" foundries, patch from Grigorios Magklis.
Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
        "(nil)" foundries, patch from Grigorios Magklis.

        * gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
        on non-available fonts, based on a patch by Grigorios Magklis
        <maglis@cs.rochester.edu>.
2000-05-19 05:50:46 +00:00
Elliot Lee
31fa339113 If a region does not have any rectangles, or if the specified rectangle is
If a region does not have any rectangles, or if the specified rectangle is
not in the region, then return GDK_OVERLAP_RECTANGLE_OUT instead of
GDK_OVERLAP_RECTANGLE_IN.
2000-05-18 22:44:19 +00:00
Ville Hautamaki
26b2cbe5ae Minor finnish update
Ville
2000-05-18 10:57:40 +00:00
Jonathan Blandford
fccaf53bfb Remember to save the file before committing. 2000-05-17 16:11:29 +00:00
Jonathan Blandford
f43ab0c41d Remove references to OFFSCREEN, as it is no longer necessary.
2000-05-17  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtklayout.c (gtk_layout_map): Remove references to
	OFFSCREEN, as it is no longer necessary.
2000-05-17 16:10:43 +00:00
Owen Taylor
b9d4205044 Patch from David Santiago <mrcooger@cyberverse.com> to change things so
Wed May 17 10:52:12 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcolorsel.c: Patch from David Santiago
	<mrcooger@cyberverse.com> to change things so that the
	indicator of the active palette entry is done independently,
	not via the focus, since it should always be visible.
2000-05-17 14:56:11 +00:00
25 changed files with 383 additions and 94 deletions

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -1,3 +1,42 @@
Fri May 19 11:52:59 2000 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set
send_event to TRUE.
(gtk_drawing_area_size): queue a resize.
Sun Mar 26 03:21:28 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
the handlers, also invalidate them. bug nailed down by Karl Nelson
<kenelson@ece.ucdavis.edu>.
Fri May 19 06:49:23 2000 Tim Janik <timj@gtk.org>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle
"(nil)" foundries, patch from Grigorios Magklis.
* gtk/gtkfontsel.c (gtk_font_selection_load_font): don't crash
on non-available fonts, based on a patch by Grigorios Magklis
<maglis@cs.rochester.edu>.
2000-05-18 Elliot Lee <sopwith@redhat.com>
* gdk/x11/gdkregion-generic.c: If a region does not have any
rectangles, or if the specified rectangle is not in the region, then return GDK_OVERLAP_RECTANGLE_OUT
instead of GDK_OVERLAP_RECTANGLE_IN.
2000-05-17 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklayout.c (gtk_layout_map): Remove references to
OFFSCREEN, as it is no longer necessary.
Wed May 17 10:52:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Patch from David Santiago
<mrcooger@cyberverse.com> to change things so that the
indicator of the active palette entry is done independently,
not via the focus, since it should always be visible.
2000-05-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Plug same

View File

@@ -39,7 +39,8 @@ gdk_pixbuf_doc_DATA = \
gdk-pixbuf-sections.txt
content_files = \
compiling.sgml
compiling.sgml \
gdk-pixbuf.sgml
EXTRA_DIST = \
$(gdk_pixbuf_doc_DATA) \

View File

@@ -1,3 +1,12 @@
2000-05-22 Federico Mena Quintero <federico@helixcode.com>
* configure.in: Bumped version number to 0.8.0.
* doc/Makefile.am (content_files): The toplevel gdk-pixbuf.sgml
file was not being distributed.
* gdk-pixbuf/pixops/Makefile.am (EXTRA_DIST): Added DETAILS.
2000-05-09 Darin Adler <darin@eazel.com>
* gdk-pixbuf/gdk-pixbuf-drawable.c: (rgb565lsb), (rgb565msb),

View File

@@ -20,3 +20,6 @@ libpixops_la_SOURCES = \
pixops.h \
pixops-internal.h \
$(mmx_sources)
EXTRA_DIST = \
DETAILS

View File

@@ -1438,7 +1438,7 @@ gdk_region_rect_in (GdkRegion *region,
/* this is (just) a useful optimization */
if ((region->numRects == 0) || !EXTENTCHECK (&region->extents, prect))
return GDK_OVERLAP_RECTANGLE_IN;
return GDK_OVERLAP_RECTANGLE_OUT;
partOut = FALSE;
partIn = FALSE;

View File

@@ -1438,7 +1438,7 @@ gdk_region_rect_in (GdkRegion *region,
/* this is (just) a useful optimization */
if ((region->numRects == 0) || !EXTENTCHECK (&region->extents, prect))
return GDK_OVERLAP_RECTANGLE_IN;
return GDK_OVERLAP_RECTANGLE_OUT;
partOut = FALSE;
partIn = FALSE;

View File

@@ -423,9 +423,10 @@ install-data-local:
rm -f gtkrc.$$i ; \
ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
done ; \
rm -f gtkrc.lt gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi ; \
ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
ln -s gtkrc.iso-8859-13 gtkrc.lv ; \
ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
ln -s gtkrc.iso-8859-14 gtkrc.ga ; \
ln -s gtkrc.iso-8859-15 gtkrc.et ; \

View File

@@ -525,8 +525,8 @@ color_sample_new (GtkColorSelection *colorsel)
* The palette area code
*
*/
#define CUSTOM_PALETTE_ENTRY_WIDTH 18
#define CUSTOM_PALETTE_ENTRY_HEIGHT 18
#define CUSTOM_PALETTE_ENTRY_WIDTH 16
#define CUSTOM_PALETTE_ENTRY_HEIGHT 16
static void
palette_get_color (GtkWidget *drawing_area, gdouble *color)
@@ -558,6 +558,9 @@ palette_paint (GtkWidget *drawing_area,
GdkRectangle *area,
gpointer data)
{
GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data);
ColorSelectionPrivate *priv = colorsel->private;
if (drawing_area->window == NULL)
return;
@@ -567,7 +570,7 @@ palette_paint (GtkWidget *drawing_area,
area->width,
area->height);
if (GTK_WIDGET_HAS_FOCUS (drawing_area))
if (priv->last_palette == drawing_area)
{
GdkGC *gc;
gdouble color[4];
@@ -597,44 +600,27 @@ palette_expose (GtkWidget *drawing_area,
palette_paint (drawing_area, &(event->area), data);
}
static void
palette_focus_in (GtkWidget *drawing_area,
GdkEventFocus *event,
gpointer data)
{
ColorSelectionPrivate *priv;
if (drawing_area->window == NULL)
return;
priv = GTK_COLOR_SELECTION (data)->private;
priv->last_palette = drawing_area;
GTK_WIDGET_SET_FLAGS (drawing_area, GTK_HAS_FOCUS);
gtk_widget_queue_clear_area (drawing_area, 0, 0, drawing_area->allocation.x, drawing_area->allocation.y);
}
static void
palette_focus_out (GtkWidget *drawing_area,
GdkEventFocus *event,
gpointer data)
{
GTK_WIDGET_UNSET_FLAGS (drawing_area, GTK_HAS_FOCUS);
gtk_widget_queue_clear_area (drawing_area, 0, 0, drawing_area->allocation.x, drawing_area->allocation.y);
}
static void
palette_press (GtkWidget *drawing_area,
GdkEventButton *event,
gpointer data)
{
gtk_widget_grab_focus (drawing_area);
GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data);
ColorSelectionPrivate *priv = colorsel->private;
if (priv->last_palette != NULL)
gtk_widget_queue_clear (priv->last_palette);
priv->last_palette = drawing_area;
if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (drawing_area), "color_set")) != 0)
{
gdouble color[4];
palette_get_color (drawing_area, color);
gtk_color_selection_set_color (GTK_COLOR_SELECTION (data), color);
}
gtk_widget_queue_clear (priv->last_palette);
}
static void
@@ -835,9 +821,6 @@ palette_new (GtkColorSelection *colorsel)
gtk_object_set_data (GTK_OBJECT (retval), "color_set", GINT_TO_POINTER (0));
gtk_widget_set_events (retval, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
GTK_WIDGET_SET_FLAGS (retval, GTK_CAN_FOCUS);
gtk_signal_connect (GTK_OBJECT (retval), "focus_in_event", palette_focus_in, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "focus_out_event", palette_focus_out, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "draw", palette_draw, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "expose_event", palette_expose, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "button_press_event", palette_press, colorsel);
@@ -1224,6 +1207,20 @@ make_palette_frame (GtkColorSelection *colorsel,
gtk_table_attach_defaults (GTK_TABLE (table), frame, i, i+1, j, j+1);
}
/* Set the palette entry [x][y] to be the currently selected one. */
static void
set_selected_palette (GtkColorSelection *colorsel, int x, int y)
{
ColorSelectionPrivate *priv = colorsel->private;
if (priv->last_palette != NULL)
gtk_widget_queue_clear (priv->last_palette);
priv->last_palette = priv->custom_palette[x][y];
gtk_widget_queue_clear (priv->last_palette);
}
static void
update_color (GtkColorSelection *colorsel)
{
@@ -1299,11 +1296,11 @@ add_button_pressed (GtkWidget *button,
/* forward the selection */
if ((i == GTK_CUSTOM_PALETTE_WIDTH - 1) && (j == GTK_CUSTOM_PALETTE_HEIGHT - 1))
gtk_widget_grab_focus (priv->custom_palette[0][0]);
set_selected_palette (colorsel, 0, 0);
else if (i == GTK_CUSTOM_PALETTE_WIDTH - 1)
gtk_widget_grab_focus (priv->custom_palette[0][j + 1]);
set_selected_palette (colorsel, 0, j + 1);
else
gtk_widget_grab_focus (priv->custom_palette[i + 1][j]);
set_selected_palette (colorsel, i + 1, j);
return;
}
@@ -1314,7 +1311,7 @@ add_button_pressed (GtkWidget *button,
palette_set_color (priv->custom_palette[0][0], colorsel, priv->color);
/* forward the selection */
gtk_widget_grab_focus (priv->custom_palette[1][0]);
set_selected_palette (colorsel, 1, 0);
}
GtkType
@@ -1453,7 +1450,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
priv->hex_entry = gtk_entry_new ();
gtk_signal_connect (GTK_OBJECT (priv->hex_entry), "activate", hex_changed, colorsel);
gtk_widget_set_usize (priv->hex_entry, 75, -1);
gtk_table_set_col_spacing (GTK_TABLE (table), 3, 25);
gtk_table_set_col_spacing (GTK_TABLE (table), 3, 15);
gtk_table_attach_defaults (GTK_TABLE (table), priv->hex_entry, 1, 5, 5, 6);
/* Set up the palette */
@@ -1467,6 +1464,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
make_palette_frame (colorsel, table, i, j);
}
}
set_selected_palette (colorsel, 0, 0);
priv->palette_frame = gtk_frame_new (_("Custom Palette"));
gtk_box_pack_end (GTK_BOX (top_right_vbox), priv->palette_frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 4);

View File

@@ -54,7 +54,7 @@ gtk_drawing_area_get_type (void)
(GtkClassInitFunc) NULL,
};
drawing_area_type = gtk_type_unique (gtk_widget_get_type (), &drawing_area_info);
drawing_area_type = gtk_type_unique (GTK_TYPE_WIDGET, &drawing_area_info);
}
return drawing_area_type;
@@ -63,9 +63,7 @@ gtk_drawing_area_get_type (void)
static void
gtk_drawing_area_class_init (GtkDrawingAreaClass *class)
{
GtkWidgetClass *widget_class;
widget_class = (GtkWidgetClass*) class;
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
widget_class->realize = gtk_drawing_area_realize;
widget_class->size_allocate = gtk_drawing_area_size_allocate;
@@ -81,7 +79,7 @@ gtk_drawing_area_init (GtkDrawingArea *darea)
GtkWidget*
gtk_drawing_area_new (void)
{
return GTK_WIDGET (gtk_type_new (gtk_drawing_area_get_type ()));
return GTK_WIDGET (gtk_type_new (GTK_TYPE_DRAWING_AREA));
}
void
@@ -89,11 +87,12 @@ gtk_drawing_area_size (GtkDrawingArea *darea,
gint width,
gint height)
{
g_return_if_fail (darea != NULL);
g_return_if_fail (GTK_IS_DRAWING_AREA (darea));
GTK_WIDGET (darea)->requisition.width = width;
GTK_WIDGET (darea)->requisition.height = height;
gtk_widget_queue_resize (GTK_WIDGET (darea));
}
static void
@@ -160,6 +159,7 @@ gtk_drawing_area_send_configure (GtkDrawingArea *darea)
event.type = GDK_CONFIGURE;
event.window = widget->window;
event.send_event = TRUE;
event.x = widget->allocation.x;
event.y = widget->allocation.y;
event.width = widget->allocation.width;

View File

@@ -1778,21 +1778,21 @@ gtk_font_selection_load_font (GtkFontSelection *fontsel)
#endif
#ifndef GDK_WINDOWING_WIN32
font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0)
xfs = font ? GDK_FONT_XFONT (font) : NULL;
if (xfs && (xfs->min_byte1 != 0 || xfs->max_byte1 != 0))
{
gchar *tmp_name;
gdk_font_unref (font);
tmp_name = g_strconcat (fontname, ",*", NULL);
font = gdk_fontset_load (tmp_name);
g_free(tmp_name);
g_free (tmp_name);
}
#else
/* Load as a fontset so that gtkentry uses wide chars for it */
font = gdk_fontset_load (fontname);
#endif
g_free(fontname);
g_free (fontname);
if (font)
{
@@ -3371,10 +3371,13 @@ gtk_font_selection_get_font_name (GtkFontSelection *fontsel)
family_str = font->family;
foundry_str = fontsel_info->properties[FOUNDRY][font->foundry];
/* some fonts have a (nil) foundry */
if (strcmp (foundry_str, "(nil)") == 0)
foundry_str = "";
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
property_str[prop]
= fontsel_info->properties[prop][fontsel->property_values[prop]];
property_str[prop] = fontsel_info->properties[prop][fontsel->property_values[prop]];
if (strcmp (property_str[prop], "(nil)") == 0)
property_str[prop] = "";
}

View File

@@ -477,8 +477,7 @@ gtk_layout_map (GtkWidget *widget)
if (GTK_WIDGET_VISIBLE (child->widget))
{
if (!GTK_WIDGET_MAPPED (child->widget) &&
!GTK_WIDGET_IS_OFFSCREEN (child->widget))
if (!GTK_WIDGET_MAPPED (child->widget))
gtk_widget_map (child->widget);
}
}
@@ -664,8 +663,6 @@ gtk_layout_remove (GtkContainer *container,
if (tmp_list)
{
GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
gtk_widget_unparent (widget);
layout->children = g_list_remove_link (layout->children, tmp_list);

View File

@@ -1167,7 +1167,7 @@ gtk_menu_position (GtkMenu *menu)
/* We need the requisition to figure out the right place to
* popup the menu. In fact, we always need to ask here, since
* if one a size_request was queued while we weren't popped up,
* if a size_request was queued while we weren't popped up,
* the requisition won't have been recomputed yet.
*/
gtk_widget_size_request (widget, &requisition);

View File

@@ -119,7 +119,7 @@ GtkWidget* gtk_menu_get_active (GtkMenu *menu);
void gtk_menu_set_active (GtkMenu *menu,
guint index);
/* set/get the acclerator group that holds global accelerators (should
/* set/get the accelerator group that holds global accelerators (should
* be added to the corresponding toplevel with gtk_window_add_accel_group().
*/
void gtk_menu_set_accel_group (GtkMenu *menu,

View File

@@ -1195,12 +1195,20 @@ gtk_signal_handlers_destroy (GtkObject *object)
next = handler->next;
if (handler->id > 0)
gtk_signal_handler_unref (handler, object);
{
handler->id = 0;
handler->blocked += 1;
gtk_signal_handler_unref (handler, object);
}
handler = next;
}
handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
if (handler->id > 0)
gtk_signal_handler_unref (handler, object);
{
handler->id = 0;
handler->blocked += 1;
gtk_signal_handler_unref (handler, object);
}
}
}

View File

@@ -177,7 +177,7 @@ struct _GtkArg
#define GTK_VALUE_POINTER(a) ((a).d.pointer_data)
#define GTK_VALUE_SIGNAL(a) ((a).d.signal_data)
/* return location macros, these all narow down to
/* return location macros, these all narrow down to
* pointer types, because return values need to be
* passed by reference
*/

View File

@@ -5216,10 +5216,6 @@ create_color_selection (void)
window = gtk_color_selection_dialog_new ("color selection dialog");
gtk_color_selection_set_use_opacity (
GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (window)->colorsel),
TRUE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",

View File

@@ -1,3 +1,7 @@
2000-05-18 Pauli Virtanen <pauli.virtanen@saunalahti.fi>
* fi.po: minor finnish update.
2000-05-10 Szabolcs BAN <shooby@gnome.hu>
* hu.po: corrected header

View File

@@ -1,13 +1,13 @@
# This is the Finnish locale definition for Gtk+.
# Copyright (C) 1998 Free Software Foundation, Inc.
# Copyright (C) 1998-2000 Free Software Foundation, Inc.
# Mikko Rauhala <mjr@iki.fi>, 1999.
# Minor changes: Pauli Virtanen, 2000
#
msgid ""
msgstr ""
"Project-Id-Version: gtk+ 1.1.9\n"
"POT-Creation-Date: 2000-03-30 12:49+0300\n"
"PO-Revision-Date: 2000-03-30 12:56+0300\n"
"POT-Creation-Date: 2000-04-17 21:53+0300\n"
"PO-Revision-Date: 2000-04-17 12:56+0300\n"
"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr "Sininen:"
#: gtk/gtkcolorsel.c:227
msgid "Opacity:"
msgstr "L<EFBFBD>pin<EFBFBD>kym<EFBFBD>tt<EFBFBD>myys:"
msgstr "Peitto:"
#. The OK button
#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:565 gtk/gtkfontsel.c:3785
@@ -62,7 +62,7 @@ msgstr "Ohje"
#. The directories clist
#: gtk/gtkfilesel.c:514
msgid "Directories"
msgstr "Hakemistot"
msgstr "Kansiot"
#. The files clist
#: gtk/gtkfilesel.c:533
@@ -73,11 +73,11 @@ msgstr "Tiedostot"
#: gtk/gtkfilesel.c:603 gtk/gtkfilesel.c:1642
#, c-format
msgid "Directory unreadable: %s"
msgstr "Hakemisto ei luettavissa: %s"
msgstr "Kansiota ei voi lukea: %s"
#: gtk/gtkfilesel.c:635
msgid "Create Dir"
msgstr "Luo hakemisto"
msgstr "Luo kansio"
#: gtk/gtkfilesel.c:646 gtk/gtkfilesel.c:1029
msgid "Delete File"
@@ -103,11 +103,11 @@ msgstr "Sulje"
#: gtk/gtkfilesel.c:920
msgid "Create Directory"
msgstr "Luo hakemisto"
msgstr "Luo kansio"
#: gtk/gtkfilesel.c:934
msgid "Directory name:"
msgstr "Hakemiston nimi:"
msgstr "Kansion nimi:"
#. buttons
#: gtk/gtkfilesel.c:947
@@ -162,11 +162,11 @@ msgstr "Pistekoko:"
#: gtk/gtkfontsel.c:224
msgid "Resolution X:"
msgstr "X-resoluutio:"
msgstr "X-tarkkuus:"
#: gtk/gtkfontsel.c:225
msgid "Resolution Y:"
msgstr "Y-resoluutio:"
msgstr "Y-tarkkuus:"
#: gtk/gtkfontsel.c:226
msgid "Spacing:"
@@ -184,7 +184,7 @@ msgstr "Merkist
#. of NULL initializers above
#: gtk/gtkfontsel.c:472
msgid "Font Property"
msgstr "Kirjasimen ominaisuus"
msgstr "Kirjasinlajin ominaisuus"
#: gtk/gtkfontsel.c:473
msgid "Requested Value"
@@ -233,21 +233,21 @@ msgstr "Esikatselu:"
#: gtk/gtkfontsel.c:729
msgid "Font Information"
msgstr "Kirjasintiedot"
msgstr "Kirjasinlajin tiedot"
#: gtk/gtkfontsel.c:762
msgid "Requested Font Name:"
msgstr "Pyydetty kirjasimen nimi:"
msgstr "Pyydetty kirjasinlajin nimi:"
#: gtk/gtkfontsel.c:773
msgid "Actual Font Name:"
msgstr "Todellinen kirjasimen nimi:"
msgstr "Todellinen kirjasinlajin nimi:"
# , c-format
#: gtk/gtkfontsel.c:784
#, c-format
msgid "%i fonts available with a total of %i styles."
msgstr "%i kirjasinta saatavissa yhteens<6E> %i:ll<6C> tyylill<6C>."
msgstr "%i kirjasinlajia saatavissa yhteens<6E> %i:ll<6C> tyylill<6C>."
#: gtk/gtkfontsel.c:799
msgid "Filter"
@@ -312,7 +312,7 @@ msgstr "[C]"
#: gtk/gtkfontsel.c:1811
msgid "The selected font is not available."
msgstr "Valittua kirjasinlajia ei ole saatavissa."
msgstr "Valittua kirjasinlajia ei ole saatavilla."
#: gtk/gtkfontsel.c:1817
msgid "The selected font is not a valid font."
@@ -328,7 +328,7 @@ msgstr "(tuntematon)"
#: gtk/gtkfontsel.c:2022
msgid "roman"
msgstr "suora"
msgstr "pysty"
#: gtk/gtkfontsel.c:2034
msgid "proportional"
@@ -360,7 +360,7 @@ msgstr "lihavoitu"
#: gtk/gtkfontsel.c:2717
msgid "demibold"
msgstr "osalihavoitu"
msgstr "puolilihava"
#: gtk/gtkfontsel.c:2720
msgid "medium"
@@ -392,7 +392,7 @@ msgstr "Toteuta"
#: gtk/gtkfontsel.c:3814
msgid "Font Selection"
msgstr "Kirjasimen valinta"
msgstr "Kirjasinlajin valinta"
#: gtk/gtkgamma.c:395
msgid "Gamma"
@@ -473,7 +473,7 @@ msgstr "ei"
#: gtk/gtkinputdialog.c:578 gtk/gtkinputdialog.c:614
msgid "(disabled)"
msgstr "(poistettu)"
msgstr "(ei k<>yt<79>ss<73>)"
#. and clear button
#: gtk/gtkinputdialog.c:692
@@ -487,13 +487,13 @@ msgid "Page %u"
msgstr "Sivu %u"
# , c-format
#: gtk/gtkrc.c:1785
#: gtk/gtkrc.c:1801
#, c-format
msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
msgstr "Kuvatiedostoa ei l<>ytynyt pixmap_path:sta: \"%s\" rivi %d"
# , c-format
#: gtk/gtkrc.c:1788
#: gtk/gtkrc.c:1804
#, c-format
msgid "Unable to locate image file in pixmap_path: \"%s\""
msgstr "Kuvatiedostoa ei l<>ytynyt pixmap_path:sta: \"%s\""

View File

@@ -5216,10 +5216,6 @@ create_color_selection (void)
window = gtk_color_selection_dialog_new ("color selection dialog");
gtk_color_selection_set_use_opacity (
GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (window)->colorsel),
TRUE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",