From 011f2c333ade1fcecb2e774311191c71944067d8 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 25 Mar 1998 04:34:43 +0000 Subject: [PATCH] refresh the open/save as dialogs upon open * app/fileops.c: refresh the open/save as dialogs upon open * applied gimp-quinet-980323-0, fixing more M_PI madness * applied gimp-quinet-980323-1 which fixes redundant inline checks * plug-ins/gfig/gfig.c: changed stipple to type unsigned char to quell warnings -Yosh --- ChangeLog | 12 ++++++++++++ app/fileops.c | 4 +++- config.h.in | 3 --- configure.in | 3 --- plug-ins/common/destripe.c | 6 ------ plug-ins/common/nlfilt.c | 6 ------ plug-ins/common/whirlpinch.c | 4 ++++ plug-ins/common/zealouscrop.c | 6 ------ plug-ins/destripe/destripe.c | 6 ------ plug-ins/gfig/gfig.c | 14 +++++++++++--- plug-ins/gfli/gfli.c | 6 ------ plug-ins/libgck/gck/gckcommon.h | 4 ++++ plug-ins/nlfilt/nlfilt.c | 6 ------ plug-ins/sinus/sinus.c | 6 ------ plug-ins/whirlpinch/whirlpinch.c | 4 ++++ plug-ins/zealouscrop/zealouscrop.c | 6 ------ 16 files changed, 38 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6de9dc76a4..bd18d73448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Mar 24 20:32:53 PST 1998 Manish Singh + + * app/fileops.c: refresh the open/save as dialogs upon open + + * applied gimp-quinet-980323-0, fixing more M_PI madness + + * applied gimp-quinet-980323-1 which fixes redundant inline + checks + + * plug-ins/gfig/gfig.c: changed stipple to type unsigned char to + quell warnings + Tue Mar 24 18:03:37 PST 1998 Manish Singh * configure.in: corrected test for libXmu for some systems; added diff --git a/app/fileops.c b/app/fileops.c index e427f5b192..3e7feec42a 100644 --- a/app/fileops.c +++ b/app/fileops.c @@ -488,6 +488,7 @@ file_open_callback (GtkWidget *w, if (GTK_WIDGET_VISIBLE (fileload)) return; + gtk_file_selection_set_filename (GTK_FILE_SELECTION(fileload), "."); gtk_window_set_title (GTK_WINDOW (fileload), "Load Image"); } @@ -578,6 +579,7 @@ file_save_as_callback (GtkWidget *w, if (GTK_WIDGET_VISIBLE (filesave)) return; + gtk_file_selection_set_filename (GTK_FILE_SELECTION(filesave), "."); gtk_window_set_title (GTK_WINDOW (filesave), "Save Image"); } @@ -954,7 +956,7 @@ file_overwrite (char *filename, char* raw_filename) overwrite_box->full_filename = filename; overwrite_box->raw_filename = raw_filename; overwrite_box->obox = gtk_dialog_new (); - gtk_window_set_wmclass (GTK_WINDOW (overwrite_box->obox), "fiel_exists", "Gimp"); + gtk_window_set_wmclass (GTK_WINDOW (overwrite_box->obox), "file_exists", "Gimp"); gtk_window_set_title (GTK_WINDOW (overwrite_box->obox), "File Exists!"); gtk_window_position (GTK_WINDOW (overwrite_box->obox), GTK_WIN_POS_MOUSE); diff --git a/config.h.in b/config.h.in index 932ce89cf5..ef3c492e50 100644 --- a/config.h.in +++ b/config.h.in @@ -12,9 +12,6 @@ /* Define if you have the vprintf function. */ #undef HAVE_VPRINTF -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - /* Define to `int' if doesn't define. */ #undef pid_t diff --git a/configure.in b/configure.in index 10cd3757a2..098d49dd03 100644 --- a/configure.in +++ b/configure.in @@ -218,9 +218,6 @@ if test $gimp_ok = no; then AC_DEFINE(NO_FD_SET) fi -dnl TVM: check for compiler characteristics -AC_C_INLINE - dnl Check for random number functions AC_CHECK_FUNC(random, AC_DEFINE(RAND_FUNC, random) AC_DEFINE(SRAND_FUNC, srandom), diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index fe3fcc18ed..1200257f76 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -50,12 +50,6 @@ #include #include -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - /* * Constants... */ diff --git a/plug-ins/common/nlfilt.c b/plug-ins/common/nlfilt.c index 31e1e697f3..c3ec65a6b7 100644 --- a/plug-ins/common/nlfilt.c +++ b/plug-ins/common/nlfilt.c @@ -35,12 +35,6 @@ #include #include -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - static mw_preview_t nlfilt_do_preview; struct Grgb { diff --git a/plug-ins/common/whirlpinch.c b/plug-ins/common/whirlpinch.c index 8c72f5cf4e..e9a7432482 100644 --- a/plug-ins/common/whirlpinch.c +++ b/plug-ins/common/whirlpinch.c @@ -60,6 +60,10 @@ #define M_PI 3.14159265358979323846 #endif /* M_PI */ +#ifndef M_PI_2 +#define M_PI_2 1.57079632679489661923 +#endif /* M_PI_2 */ + #define PLUG_IN_NAME "plug_in_whirl_pinch" #define PLUG_IN_VERSION "May 1997, 2.09" diff --git a/plug-ins/common/zealouscrop.c b/plug-ins/common/zealouscrop.c index e72e9fa101..4d0b9fa800 100644 --- a/plug-ins/common/zealouscrop.c +++ b/plug-ins/common/zealouscrop.c @@ -16,12 +16,6 @@ #include "libgimp/gimp.h" #include "gtk/gtk.h" -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - /* Declare local functions. */ static void query(void); static void run(char *name, diff --git a/plug-ins/destripe/destripe.c b/plug-ins/destripe/destripe.c index fe3fcc18ed..1200257f76 100644 --- a/plug-ins/destripe/destripe.c +++ b/plug-ins/destripe/destripe.c @@ -50,12 +50,6 @@ #include #include -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - /* * Constants... */ diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index aa95ed123b..4cd11da0a7 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -89,9 +89,17 @@ #define BRUSH_PREVIEW_SZ 32 #define GFIG_HEADER "GFIG Version 0.1\n" - -#define TRUE 1 +#ifndef FALSE #define FALSE 0 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif #define PREVIEW_MASK GDK_EXPOSURE_MASK | \ GDK_MOTION_NOTIFY | \ @@ -4562,7 +4570,7 @@ gfig_grid_colours(GtkWidget *w,GdkColormap *cmap) GdkGCValues values; GdkColor new_col1; GdkColor new_col2; - char stipple[8] = + unsigned char stipple[8] = { 0xAA, /* ####---- */ 0x55, /* ###----# */ diff --git a/plug-ins/gfli/gfli.c b/plug-ins/gfli/gfli.c index 2d9a8b75ff..8aa5a7a128 100644 --- a/plug-ins/gfli/gfli.c +++ b/plug-ins/gfli/gfli.c @@ -56,12 +56,6 @@ #include "gtk/gtk.h" #include "libgimp/gimp.h" -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - static void query (void); static void run (char *name, int nparams, diff --git a/plug-ins/libgck/gck/gckcommon.h b/plug-ins/libgck/gck/gckcommon.h index 45d2bc2040..c9f5c921e2 100644 --- a/plug-ins/libgck/gck/gckcommon.h +++ b/plug-ins/libgck/gck/gckcommon.h @@ -33,6 +33,10 @@ #define M_PI 3.14159265358979323846 #endif +#ifndef M_PI_2 +#define M_PI_2 1.57079632679489661923 +#endif + #define EPSILON 1.0e-5 #endif diff --git a/plug-ins/nlfilt/nlfilt.c b/plug-ins/nlfilt/nlfilt.c index 31e1e697f3..c3ec65a6b7 100644 --- a/plug-ins/nlfilt/nlfilt.c +++ b/plug-ins/nlfilt/nlfilt.c @@ -35,12 +35,6 @@ #include #include -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - static mw_preview_t nlfilt_do_preview; struct Grgb { diff --git a/plug-ins/sinus/sinus.c b/plug-ins/sinus/sinus.c index 128d83468a..849ab841d3 100644 --- a/plug-ins/sinus/sinus.c +++ b/plug-ins/sinus/sinus.c @@ -42,12 +42,6 @@ #include "sinus_logo.h" #endif -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - #ifndef M_PI #define M_PI 3.14159265358979323846 #endif /* M_PI */ diff --git a/plug-ins/whirlpinch/whirlpinch.c b/plug-ins/whirlpinch/whirlpinch.c index 8c72f5cf4e..e9a7432482 100644 --- a/plug-ins/whirlpinch/whirlpinch.c +++ b/plug-ins/whirlpinch/whirlpinch.c @@ -60,6 +60,10 @@ #define M_PI 3.14159265358979323846 #endif /* M_PI */ +#ifndef M_PI_2 +#define M_PI_2 1.57079632679489661923 +#endif /* M_PI_2 */ + #define PLUG_IN_NAME "plug_in_whirl_pinch" #define PLUG_IN_VERSION "May 1997, 2.09" diff --git a/plug-ins/zealouscrop/zealouscrop.c b/plug-ins/zealouscrop/zealouscrop.c index e72e9fa101..4d0b9fa800 100644 --- a/plug-ins/zealouscrop/zealouscrop.c +++ b/plug-ins/zealouscrop/zealouscrop.c @@ -16,12 +16,6 @@ #include "libgimp/gimp.h" #include "gtk/gtk.h" -#ifdef __GNUC__ -#define inline inline -#else -#define inline -#endif - /* Declare local functions. */ static void query(void); static void run(char *name,