dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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.


svn path=/trunk/; revision=23512
This commit is contained in:
Michael Natterer 2007-09-12 16:26:04 +00:00 committed by Michael Natterer
parent 028d523aeb
commit c3f89cc7f0
8 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
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.
2007-09-12 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorprofilecombobox.c

4
app/dialogs/preferences-dialog.c
View File

@ -1298,11 +1298,11 @@ prefs_display_options_frame_add (Gimp *gimp,
gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
gtk_widget_show (checks_vbox);
#ifndef HAVE_CARBON
#ifndef GDK_WINDOWING_QUARTZ
prefs_check_button_add (object, "show-menubar",
_("Show _menubar"),
GTK_BOX (checks_vbox));
#endif /* !HAVE_CARBON */
#endif /* !GDK_WINDOWING_QUARTZ */
prefs_check_button_add (object, "show-rulers",
_("Show _rulers"),
GTK_BOX (checks_vbox));

4
app/display/gimpdisplayshell.c
View File

@ -796,11 +796,11 @@ gimp_display_shell_new (GimpDisplay *display,
main_vbox = gtk_vbox_new (FALSE, 1);
gtk_container_add (GTK_CONTAINER (shell), main_vbox);
#ifndef HAVE_CARBON
#ifndef GDK_WINDOWING_QUARTZ
shell->menubar =
gtk_ui_manager_get_widget (GTK_UI_MANAGER (shell->menubar_manager),
"/image-menubar");
#endif /* !HAVE_CARBON */
#endif /* !GDK_WINDOWING_QUARTZ */
if (shell->menubar)
{

7
app/gui/gtk-macmenu.c
View File

@ -23,9 +23,10 @@
#include "config.h"
#ifdef HAVE_CARBON
#include <gtk/gtk.h>
#ifdef GDK_WINDOWING_QUARTZ
#include <gdk/gdkkeysyms.h>
#include <Carbon/Carbon.h>
@ -791,4 +792,4 @@ gtk_macmenu_set_prefs_item (GtkMenuItem *menu_item,
}
}
#endif /* HAVE_CARBON */
#endif /* GDK_WINDOWING_QUARTZ */

8
app/gui/gui.c
View File

@ -84,9 +84,9 @@
#include "session.h"
#include "splash.h"
#include "themes.h"
#ifdef HAVE_CARBON
#ifdef GDK_WINDOWING_QUARTZ
#include "gtk-macmenu.h"
#endif /* HAVE_CARBON */
#endif /* GDK_WINDOWING_QUARTZ */
#include "gimp-intl.h"
@ -462,7 +462,7 @@ gui_restore_after_callback (Gimp *gimp,
gui_config->tearoff_menus);
gimp_ui_manager_update (image_ui_manager, NULL);
#ifdef HAVE_CARBON
#ifdef GDK_WINDOWING_QUARTZ
{
GtkWidget *menu;
GtkWidget *item;
@ -490,7 +490,7 @@ gui_restore_after_callback (Gimp *gimp,
if (GTK_IS_MENU_ITEM (item))
gtk_macmenu_set_prefs_item (GTK_MENU_ITEM (item), _("Preferences"));
}
#endif /* HAVE_CARBON */
#endif /* GDK_WINDOWING_QUARTZ */
g_signal_connect_object (gui_config, "notify::tearoff-menus",
G_CALLBACK (gui_tearoff_menus_notify),

4
app/widgets/gimptoolbox.c
View File

@ -202,9 +202,9 @@ gimp_toolbox_constructor (GType type,
manager = GTK_UI_MANAGER (GIMP_IMAGE_DOCK (toolbox)->ui_manager);
#ifndef HAVE_CARBON
#ifndef GDK_WINDOWING_QUARTZ
toolbox->menu_bar = gtk_ui_manager_get_widget (manager, "/toolbox-menubar");
#endif /* !HAVE_CARBON */
#endif /* !GDK_WINDOWING_QUARTZ */
if (toolbox->menu_bar)
{

7
configure.in
View File

@ -944,6 +944,13 @@ AC_SUBST(GIMP_REMOTE)
AC_SUBST(GIMP_COMMAND)
###############################
# Some stuff is quartz specific
###############################
AM_CONDITIONAL(HAVE_GDK_QUARTZ, test "x$gdk_target" = "xquartz")
###################
# Check for libtiff
###################

2
menus/Makefile.am
View File

@ -52,7 +52,7 @@ if GIMP_UNSTABLE
DEBUG_MENU_PARAMS = --stringparam debug-menu yes
endif
if HAVE_CARBON
if HAVE_GDK_QUARTZ
HELP_MENU_PARAMS = --stringparam help-menu yes
endif