Commit 25f3cc8d authored by Manish Singh's avatar Manish Singh
Browse files

require GTK+ 1.1.5

* configure.in: require GTK+ 1.1.5

* app/bezier_select.c
* app/channels_dialog.c
* app/global_edit.c
* app/layers_dialog.c
* plug-ins/film/film.c
* plug-ins/gfig/gfig.c
* plug-ins/xd/xd.c
* plug-ins/libgck/gck/gcklistbox.c: fixes for new scrolled window viewport
behavior

* libgimp/gimpwire.c
* app/xcf.c: use g_htonl and friends

* app/main.c: ditch some unused variables

* app/Makefile.am: removed unused pixmap references

-Yosh
parent f633c7da
Mon Nov 23 01:17:57 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: require GTK+ 1.1.5
* app/bezier_select.c
* app/channels_dialog.c
* app/global_edit.c
* app/layers_dialog.c
* plug-ins/film/film.c
* plug-ins/gfig/gfig.c
* plug-ins/xd/xd.c
* plug-ins/libgck/gck/gcklistbox.c: fixes for new scrolled window
viewport behavior
* libgimp/gimpwire.c
* app/xcf.c: use g_htonl and friends
* app/main.c: ditch some unused variables
* app/Makefile.am: removed unused pixmap references
Thu Nov 19 21:17:19 MET 1998 Sven Neumann <sven@gimp.org>
* app/gdisplay.[ch]
......
......@@ -315,23 +315,17 @@ gimp_SOURCES = \
xcf.h
EXTRA_DIST = \
tools/anchor.xpm \
tools/channel.xbm \
tools/delete.xpm \
tools/duplicate.xpm \
tools/eye.xbm \
tools/layer.xbm \
tools/linked.xbm \
tools/mask.xbm \
tools/anchor.xpm \
tools/anchor_is.xpm \
tools/delete.xpm \
tools/delete_is.xpm \
tools/duplicate.xpm \
tools/duplicate_is.xpm \
tools/lower.xpm \
tools/lower_is.xpm \
tools/mask.xbm \
tools/new.xpm \
tools/new_is.xpm \
tools/raise.xpm \
tools/raise_is.xpm
tools/raise.xpm
CPPFLAGS = \
-DLIBDIR=\""$(gimpplugindir)"\" \
......
......@@ -2192,7 +2192,8 @@ static void bezier_named_buffer_proc (GDisplay *gdisp)
pn_dlg->list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (pn_dlg->list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (listbox), pn_dlg->list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
pn_dlg->list);
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
......
......@@ -222,7 +222,8 @@ channels_dialog_create ()
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2);
channelsD->channel_list = gtk_list_new ();
gtk_container_add (GTK_CONTAINER (listbox), channelsD->channel_list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
channelsD->channel_list);
gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list), GTK_SELECTION_MULTIPLE);
gtk_signal_connect (GTK_OBJECT (channelsD->channel_list), "event",
(GtkSignalFunc) channel_list_events,
......
......@@ -627,7 +627,8 @@ paste_named_buffer (GDisplay *gdisp)
pn_dlg->list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (pn_dlg->list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (listbox), pn_dlg->list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
pn_dlg->list);
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
......
......@@ -627,7 +627,8 @@ paste_named_buffer (GDisplay *gdisp)
pn_dlg->list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (pn_dlg->list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (listbox), pn_dlg->list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
pn_dlg->list);
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
......
......@@ -627,7 +627,8 @@ paste_named_buffer (GDisplay *gdisp)
pn_dlg->list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (pn_dlg->list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (listbox), pn_dlg->list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
pn_dlg->list);
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
......
......@@ -222,7 +222,8 @@ channels_dialog_create ()
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2);
channelsD->channel_list = gtk_list_new ();
gtk_container_add (GTK_CONTAINER (listbox), channelsD->channel_list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
channelsD->channel_list);
gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list), GTK_SELECTION_MULTIPLE);
gtk_signal_connect (GTK_OBJECT (channelsD->channel_list), "event",
(GtkSignalFunc) channel_list_events,
......
......@@ -721,7 +721,8 @@ layers_dialog_create ()
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2);
layersD->layer_list = gtk_list_new ();
gtk_container_add (GTK_CONTAINER (listbox), layersD->layer_list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
layersD->layer_list);
gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list), GTK_SELECTION_BROWSE);
gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event",
(GtkSignalFunc) layer_list_events,
......
......@@ -721,7 +721,8 @@ layers_dialog_create ()
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2);
layersD->layer_list = gtk_list_new ();
gtk_container_add (GTK_CONTAINER (listbox), layersD->layer_list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
layersD->layer_list);
gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list), GTK_SELECTION_BROWSE);
gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event",
(GtkSignalFunc) layer_list_events,
......
......@@ -403,9 +403,6 @@ static void test_gserialize()
GSerialDescription *test_struct_descript;
test_struct *ts, *to;
char ser_1[] = {3, 1, 2, 3, 4, 4, 64, 83, 51, 51, 6, 0, 0, 0, 4, 102, 111, 111, 0, 8, 0, 0, 0, 2, 5, 6, 7, 8 };
void *ser;
long len;
int i;
ts = g_malloc(sizeof(test_struct));
to = g_malloc(sizeof(test_struct));
test_struct_descript
......
......@@ -2192,7 +2192,8 @@ static void bezier_named_buffer_proc (GDisplay *gdisp)
pn_dlg->list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (pn_dlg->list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (listbox), pn_dlg->list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox),
pn_dlg->list);
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
......
......@@ -5,7 +5,6 @@
#include <string.h>
#include <sys/param.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <unistd.h>
#include <errno.h>
......@@ -2203,7 +2202,7 @@ xcf_read_int32 (FILE *fp,
while (count--)
{
*data = ntohl (*data);
*data = g_ntohl (*data);
data++;
}
}
......@@ -2271,7 +2270,7 @@ xcf_write_int32 (FILE *fp,
{
for (i = 0; i < count; i++)
{
tmp = htonl (data[i]);
tmp = g_htonl (data[i]);
xcf_write_int8 (fp, (guint8*) &tmp, 4);
}
}
......
......@@ -5,7 +5,6 @@
#include <string.h>
#include <sys/param.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <unistd.h>
#include <errno.h>
......@@ -2203,7 +2202,7 @@ xcf_read_int32 (FILE *fp,
while (count--)
{
*data = ntohl (*data);
*data = g_ntohl (*data);
data++;
}
}
......@@ -2271,7 +2270,7 @@ xcf_write_int32 (FILE *fp,
{
for (i = 0; i < count; i++)
{
tmp = htonl (data[i]);
tmp = g_htonl (data[i]);
xcf_write_int8 (fp, (guint8*) &tmp, 4);
}
}
......
......@@ -66,7 +66,7 @@ ALL_LINGUAS="fr sv ja it fi ko de"
AM_GNU_GETTEXT
dnl Check for GTK+
AM_PATH_GTK(1.1.3,,
AM_PATH_GTK(1.1.5,,
AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
changequote(,)dnl
......@@ -74,7 +74,7 @@ changequote(,)dnl
dnl Evil stuff to extract GLIB stuff from gtk-config output
dnl (we want to make sure it matches with the gtk we're using)
GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'`
GLIB_LDFLAGS=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
if test -z "$GLIB_LDFLAGS" ; then
GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`
fi
......
......@@ -22,7 +22,6 @@
#include <string.h>
#include <sys/param.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <unistd.h>
#include "gimpwire.h"
......@@ -263,7 +262,7 @@ wire_read_int32 (int fd,
while (count--)
{
*data = ntohl (*data);
*data = g_ntohl (*data);
data++;
}
}
......@@ -283,7 +282,7 @@ wire_read_int16 (int fd,
while (count--)
{
*data = ntohs (*data);
*data = g_ntohs (*data);
data++;
}
}
......@@ -361,7 +360,7 @@ wire_write_int32 (int fd,
{
for (i = 0; i < count; i++)
{
tmp = htonl (data[i]);
tmp = g_htonl (data[i]);
if (!wire_write_int8 (fd, (guint8*) &tmp, 4))
return FALSE;
}
......@@ -382,7 +381,7 @@ wire_write_int16 (int fd,
{
for (i = 0; i < count; i++)
{
tmp = htons (data[i]);
tmp = g_htons (data[i]);
if (!wire_write_int8 (fd, (guint8*) &tmp, 2))
return FALSE;
}
......
......@@ -22,7 +22,6 @@
#include <string.h>
#include <sys/param.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <unistd.h>
#include "gimpwire.h"
......@@ -263,7 +262,7 @@ wire_read_int32 (int fd,
while (count--)
{
*data = ntohl (*data);
*data = g_ntohl (*data);
data++;
}
}
......@@ -283,7 +282,7 @@ wire_read_int16 (int fd,
while (count--)
{
*data = ntohs (*data);
*data = g_ntohs (*data);
data++;
}
}
......@@ -361,7 +360,7 @@ wire_write_int32 (int fd,
{
for (i = 0; i < count; i++)
{
tmp = htonl (data[i]);
tmp = g_htonl (data[i]);
if (!wire_write_int8 (fd, (guint8*) &tmp, 4))
return FALSE;
}
......@@ -382,7 +381,7 @@ wire_write_int16 (int fd,
{
for (i = 0; i < count; i++)
{
tmp = htons (data[i]);
tmp = g_htons (data[i]);
if (!wire_write_int8 (fd, (guint8*) &tmp, 2))
return FALSE;
}
......
......@@ -1165,7 +1165,8 @@ add_image_list (int add_box_flag,
list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_MULTIPLE);
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (scrolled_win), list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
list);
gtk_widget_show (list);
for (i = 0; i < n; i++)
......
......@@ -1165,7 +1165,8 @@ add_image_list (int add_box_flag,
list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_MULTIPLE);
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (scrolled_win), list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
list);
gtk_widget_show (list);
for (i = 0; i < n; i++)
......
......@@ -3575,7 +3575,8 @@ brush_page()
list = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_SINGLE);
gtk_container_add (GTK_CONTAINER (scrolled_win), list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
list);
gtk_widget_show (list);
gtk_table_attach(GTK_TABLE(table), list_frame, 0, 4, 1, 5, GTK_FILL|GTK_EXPAND , GTK_FILL|GTK_EXPAND, 0, 0);
......@@ -4353,7 +4354,7 @@ add_objects_list ()
gfig_gtk_list = list = gtk_list_new ();
/* gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_MULTIPLE); */
gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (scrolled_win), list);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), list);
gtk_widget_show (list);
/* Load saved objects */
......@@ -5576,7 +5577,8 @@ gfig_rescan_list (void)
list_widget = gtk_list_new ();
gtk_list_set_selection_mode (GTK_LIST (list_widget), GTK_SELECTION_BROWSE);
gtk_container_add (GTK_CONTAINER (scrolled_win), list_widget);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win),
list_widget);
gtk_widget_show (list_widget);
gtk_box_pack_start (GTK_BOX (vbox), list_frame, TRUE, TRUE, 0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment