Commit 654e9c9d authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Handle twain and winsnap subdirs normally.

2003-05-31  Tor Lillqvist  <tml@iki.fi>

	* plug-ins/Makefile.am: Handle twain and winsnap subdirs normally.

	* configure.in: Set TWAIN and WINSNAP on Win32. Expand
	Makefiles in these dirs.

	* plug-ins/twain/Makefile.am
	* plug-ins/winsnap/Makefile.am: New files, from stable branch.

	* plug-ins/winsnap/winsnap.c: Make it build with GTK2.
parent 7e6b119a
2003-05-31 Tor Lillqvist <tml@iki.fi>
* plug-ins/Makefile.am: Handle twain and winsnap subdirs normally.
* configure.in: Set TWAIN and WINSNAP on Win32. Expand
Makefiles in these dirs.
* plug-ins/twain/Makefile.am
* plug-ins/winsnap/Makefile.am: New files, from stable branch.
* plug-ins/winsnap/winsnap.c: Make it build with GTK2.
* README.win32: Update.
* plug-ins/makefile.cygwin
......@@ -904,8 +904,10 @@ AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno)
###########################################################
if test x"$os_win32" = xyes; then
TWAIN='twain'
WINCLIPBOARD='winclipboard'
WINPRINT='winprint'
WINSNAP='winsnap'
dnl webbrowser has ifdefs for Win32
WEBBROWSER='webbrowser'
dnl xjt does build, but it isn't more confusing than useful on Win32,
......@@ -921,9 +923,11 @@ fi
AC_SUBST(BZ2)
AC_SUBST(MAIL)
AC_SUBST(SCREENSHOT)
AC_SUBST(TWAIN)
AC_SUBST(URL)
AC_SUBST(WINCLIPBOARD)
AC_SUBST(WINPRINT)
AC_SUBST(WINSNAP)
AC_SUBST(XJT)
#################################################################
......@@ -1038,7 +1042,7 @@ AC_SUBST(GIMPINSTALL)
dnl FIXME: Do we need to do this?
if test -n "$DISTMAKE"; then
TIFF=tiff JPEG=jpeg PNG=png MNG=mng AA=aa PRINT=print
WEBBROWSER=webbrowser HELPBROWSER=helpbrowser
TWAIN=twain WEBBROWSER=webbrowser WINSNAP=winsnap HELPBROWSER=helpbrowser
XJT=xjt XPM=xpm
fi
......@@ -1135,6 +1139,8 @@ plug-ins/pygimp/plug-ins/Makefile
plug-ins/rcm/Makefile
plug-ins/sel2path/Makefile
plug-ins/sgi/Makefile
plug-ins/twain/Makefile
plug-ins/winsnap/Makefile
modules/Makefile
devel-docs/Makefile
devel-docs/libgimp/Makefile
......
## Process this file with automake to produce Makefile.in
EXTRA_DIST = \
makefile.msc \
twain/README \
twain/tw_dump.c \
twain/tw_dump.h \
twain/tw_func.c \
twain/tw_func.h \
twain/tw_sess.c \
twain/tw_util.c \
twain/tw_util.h \
twain/twain.c \
twain/twain.h \
winsnap/resource.h \
winsnap/select.cur \
winsnap/small.ico \
winsnap/winsnap.c \
winsnap/winsnap.h \
winsnap/winsnap.ico \
winsnap/winsnap.rc
makefile.msc
if BUILD_PYTHON
pygimp=pygimp
......@@ -51,6 +34,8 @@ SUBDIRS = \
rcm \
sgi \
sel2path \
$(TWAIN) \
$(WEBBROWSER) \
$(WINSNAP) \
$(XJT) \
common
## Process this file with automake to produce Makefile.in
twain_LDFLAGS = -mwindows
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = twain
twain_SOURCES = \
tw_func.c \
tw_func.h \
tw_util.c \
tw_util.h \
twain.c \
twain.h
EXTRA_DIST = \
README \
tw_dump.c \
tw_dump.h \
tw_sess.c
INCLUDES = \
-I$(top_srcdir) \
$(GLIB_CFLAGS)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(GLIB_LIBS) \
$(INTLLIBS) \
-luser32
## Process this file with automake to produce Makefile.in
winsnap_LDFLAGS = -mwindows
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = winsnap
winsnap_SOURCES = \
winsnap.c \
winsnap.h
EXTRA_DIST = \
resource.h \
select.cur \
small.ico \
winsnap.ico \
winsnap.rc
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
winsnap-win32res.o \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(INTLLIBS)
winsnap-win32res.o: winsnap.rc select.cur small.ico winsnap.ico
$(top_srcdir)/build/win32/compile-resource winsnap.rc winsnap-win32res.o
......@@ -85,8 +85,6 @@ static HCURSOR selectCursor = 0;
static ICONINFO iconInfo;
/* Forward declarations */
static void init(void);
static void quit(void);
static void query(void);
static void run(char *, int, GimpParam *, int *, GimpParam **);
static void sendBMPToGimp(HBITMAP hBMP, HDC hDC, RECT rect);
......@@ -894,7 +892,7 @@ snap_dialog(void)
/* Main Dialog */
dialog = gtk_dialog_new ();
gtk_window_set_title(GTK_WINDOW(dialog), PLUG_IN_PRINT_NAME);
gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
g_signal_connect (dialog, "destroy",
G_CALLBACK (snap_close_callback),
NULL);
......@@ -934,7 +932,7 @@ snap_dialog(void)
gtk_box_pack_start (GTK_BOX (vbox),
hbox, TRUE, TRUE, 0);
winsnapintf.single_button = gtk_radio_button_new ( radio_group );
radio_group = gtk_radio_button_group ( GTK_RADIO_BUTTON (winsnapintf.single_button) );
radio_group = gtk_radio_button_get_group ( GTK_RADIO_BUTTON (winsnapintf.single_button) );
gtk_box_pack_start (GTK_BOX (hbox),
winsnapintf.single_button, TRUE, TRUE, 0);
g_signal_connect (winsnapintf.single_button, "toggled",
......@@ -981,7 +979,7 @@ snap_dialog(void)
gtk_container_add (GTK_CONTAINER (frame), hbox);
winsnapintf.root_button = gtk_radio_button_new ( radio_group );
radio_group = gtk_radio_button_group ( GTK_RADIO_BUTTON (winsnapintf.root_button) );
radio_group = gtk_radio_button_get_group ( GTK_RADIO_BUTTON (winsnapintf.root_button) );
gtk_box_pack_start (GTK_BOX (hbox), winsnapintf.root_button, TRUE, TRUE, 0);
g_signal_connect (winsnapintf.root_button, "toggled",
G_CALLBACK (snap_toggle_update),
......
Markdown is supported
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