gimp r23512 - in trunk: . app/dialogs app/display app/gui app/widgets menus

[mitch svn gnome org]

Author: mitch
Date: 2007-09-12 17:26:04 +0100 (Wed, 12 Sep 2007)
New Revision: 23512
ViewCVS link: http://svn.gnome.org/viewcvs/gimp?rev=23512&view=rev

Modified:
   trunk/ChangeLog
   trunk/app/dialogs/preferences-dialog.c
   trunk/app/display/gimpdisplayshell.c
   trunk/app/gui/gtk-macmenu.c
   trunk/app/gui/gui.c
   trunk/app/widgets/gimptoolbox.c
   trunk/configure.in
   trunk/menus/Makefile.am
Log:
2007-09-12  Michael Natterer  <mitch gimp org>

	Bring back our menus when building on OS X but not against the
	quartz GDK backend:

	* configure.in: added conditional HAVE_GDK_QUARTZ.

	* menus/Makefile.am: use it when moving the help menu around.

	* app/dialogs/preferences-dialog.c
	* app/display/gimpdisplayshell.c
	* app/gui/gtk-macmenu.c
	* app/gui/gui.c
	* app/widgets/gimptoolbox.c: use #ifdef GDK_WINDOWING_QUARTZ
	instead of #ifdef HAVE_CARBON when enabling the global menubar.