app/gimprc.c write/parse the "wheel" axis properly when writing/parsing

2002-05-21  Michael Natterer  <mitch@gimp.org>

	* app/gimprc.c
	* app/widgets/gimpdeviceinfo.c: write/parse the "wheel" axis
	properly when writing/parsing devicerc.

	* app/widgets/gimpdevices.c: no need to #define something twice.
This commit is contained in:
Michael Natterer 2002-05-21 10:16:36 +00:00 committed by Michael Natterer
parent 17e0621305
commit 500dca98b8
4 changed files with 15 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2002-05-21 Michael Natterer <mitch@gimp.org>
* app/gimprc.c
* app/widgets/gimpdeviceinfo.c: write/parse the "wheel" axis
properly when writing/parsing devicerc.
* app/widgets/gimpdevices.c: no need to #define something twice.
2002-05-18 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-text-console.c: somewhat cleaner
@ -11,7 +19,7 @@
* libgimpbase/gimpprotocol.[ch]
* libgimpbase/gimpwire.[ch]: pass "gpointer user_data" to all
functions, which in gets turn passed to the registered reader,
functions, which in turn gets passed to the registered reader,
writer, and flusher funcs.
* libgimp/gimp.c
@ -21,7 +29,7 @@
* app/plug-in/plug-in.c: pass the PlugIn as user_data. As a
consequence, got rid of more global variables. The global
"current_plug_in" and the plug_in_push()/pop() madness are still
there. Will reeplace them by some less ugly hack later...
there. Will replace them by some less ugly hack later...
2002-05-16 Sven Neumann <sven@gimp.org>

View File

@ -1772,6 +1772,8 @@ parse_device (gpointer val1p,
axes[i] = GDK_AXIS_XTILT;
else if (!strcmp ("ytilt", token_sym))
axes[i] = GDK_AXIS_YTILT;
else if (!strcmp ("wheel", token_sym))
axes[i] = GDK_AXIS_WHEEL;
else
goto error;
}

View File

@ -427,6 +427,9 @@ gimp_device_info_save (GimpDeviceInfo *device_info,
case GDK_AXIS_YTILT:
axis_type = "ytilt";
break;
case GDK_AXIS_WHEEL:
axis_type = "wheel";
break;
}
fprintf (fp, " %s",axis_type);
}

View File

@ -43,7 +43,6 @@
#include "gimprc.h"
#define GIMP_DEVICE_MANAGER_DATA_KEY "gimp-device-manager"
#define GIMP_DEVICE_MANAGER_DATA_KEY "gimp-device-manager"