[gtk-mac-integration] Rename the module from ige-mac-integration to gtk-mac-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-integration] Rename the module from ige-mac-integration to gtk-mac-integration
- Date: Fri, 23 Sep 2011 17:34:50 +0000 (UTC)
commit da09e56a88102521a72dafb85797e068287da37b
Author: John Ralls <jralls ceridwen us>
Date: Sat Sep 17 18:09:42 2011 -0700
Rename the module from ige-mac-integration to gtk-mac-integration
README | 10 +-
autogen.sh | 4 +-
bindings/python/Makefile.am | 8 +-
bindings/python/gtk3_osxapplication/Makefile.am | 2 +-
bindings/python/gtk_osxapplication/Makefile.am | 2 +-
bindings/python/igemacintegration/Makefile.am | 45 -
bindings/python/igemacintegration/__init__.py | 48 -
.../igemacintegration/igemacintegration-module.c | 24 -
.../igemacintegration/igemacintegration.override | 59 -
.../python/igemacintegration/test-integration.py | 87 --
configure.ac | 10 +-
data/Makefile.am | 4 +-
data/ige-mac-integration.pc.in | 11 -
docs/reference/Makefile.am | 14 +-
docs/reference/ige-mac-integration-docs.sgml | 33 -
src/Makefile.am | 36 +-
src/gtkosxapplication.c | 2 +-
src/gtkosxapplication.h | 10 +-
src/gtkosxapplication_quartz.c | 4 +-
src/ige-mac-bundle.c | 380 ------
src/ige-mac-bundle.h | 64 -
src/ige-mac-dock.c | 467 --------
src/ige-mac-dock.h | 88 --
src/ige-mac-image-utils.c | 62 -
src/ige-mac-image-utils.h | 32 -
src/ige-mac-integration.h | 30 -
src/ige-mac-menu.c | 1260 --------------------
src/ige-mac-menu.h | 50 -
src/ige-mac-private.h | 34 -
src/test-integration.c | 134 +-
30 files changed, 120 insertions(+), 2894 deletions(-)
---
diff --git a/README b/README
index c69f50a..2baa5a9 100644
--- a/README
+++ b/README
@@ -2,14 +2,14 @@ GTK+ Integration for the Mac OS X desktop, like the menubar, dock and
app bundles.
This library provides two implementations: An older Carbon
-implementation (ige-mac-integration) and a new implementation in Cocoa
+implementation (gtk-mac-integration) and a new implementation in Cocoa
(GtkOSXApplication). PyGtk bindings are provided for both.
GtkOSXApplication compiles and works with x86_64, a major failing of
the Carbon implementation, as well as resolving some other glaring
bugs. Since Apple has deperecated Carbon in OSX 10.6 (Snow Leopard)
and is likely to remove it from a future version of the operating
-system, Ige-mac-integration is also deprecated. New ports of Gtk+
+system, Gtk-mac-integration is also deprecated. New ports of Gtk+
applications should use GtkOSXApplication and maintainers of older
ports are strongly encouraged to convert as soon as practical.
@@ -20,11 +20,11 @@ will be found in their respective directories under bindings/python.
GtkOSXApplication is well documented using Gtk-Doc. To build the
documentation, pass --enable-gtk-doc to configure. A current copy may
be found online at
-http://gtk-osx.sourceforge.net/ige-mac-integration/index.html.
-Amplfying information is on the Integration page of the project wiki,
+http://gtk-osx.sourceforge.net/gtk-mac-integration/index.html.
+Amplifying information is on the Integration page of the project wiki,
https://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate.
-Some documentation for ige-mac-integration may be found at
+Some documentation for gtk-mac-integration may be found at
http://live.gnome.org/GTK%2B/OSX/Integration.
For more information about the Gtk-OSX project, please visit our
diff --git a/autogen.sh b/autogen.sh
index 0612a49..7da7b09 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,9 +15,9 @@ test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
-PROJECT=ige-mac-integration
+PROJECT=gtk-mac-integration
TEST_TYPE=-f
-FILE=src/ige-mac-menu.c
+FILE=src/gtk-mac-menu.c
CONFIGURE=configure.ac
DIE=0
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 8003ce7..a597801 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,9 +1,9 @@
if INTROSPECTION
- GTK_DIR = gtk3_osxapplication
+ GTK3_COCOA_DIR = gtk3_osxapplication
else
- GTK_DIR = gtk_osxapplication
+ GTK_COCOA_DIR = gtk_osxapplication
if !SIXTY_FOUR_BIT
- IGE_DIR = igemacintegration
+ GTK_CARBON_DIR = gtkmacintegration
endif
endif
-SUBDIRS = $(GTK_DIR) $(IGE_DIR)
+SUBDIRS = $(GTK3_COCOA_DIR) $(GTK_COCOA_DIR) $(GTK_CARBON_DIR)
diff --git a/bindings/python/gtk3_osxapplication/Makefile.am b/bindings/python/gtk3_osxapplication/Makefile.am
index 4baba1d..de090bb 100644
--- a/bindings/python/gtk3_osxapplication/Makefile.am
+++ b/bindings/python/gtk3_osxapplication/Makefile.am
@@ -17,7 +17,7 @@ _gtk_osxapplication_la_CFLAGS = \
_gtk_osxapplication_la_LDFLAGS = -module -export-symbols-regex init_gtk_osxapplication
_gtk_osxapplication_la_LIBADD = \
$(MAC_LIBS) \
- $(top_builddir)/src/libigemacintegration.la
+ $(top_builddir)/src/libgtkmacintegration.la
_gtk_osxapplication_la_SOURCES = \
gtk_osxapplication.c \
diff --git a/bindings/python/gtk_osxapplication/Makefile.am b/bindings/python/gtk_osxapplication/Makefile.am
index 562ac8d..ea16cba 100644
--- a/bindings/python/gtk_osxapplication/Makefile.am
+++ b/bindings/python/gtk_osxapplication/Makefile.am
@@ -19,7 +19,7 @@ _gtk_osxapplication_la_LDFLAGS = -module -avoid-version -export-symbols-regex in
_gtk_osxapplication_la_LIBADD = \
$(MAC_LIBS) \
$(PYGTK_LIBS) \
- $(top_builddir)/src/libigemacintegration.la
+ $(top_builddir)/src/libgtkmacintegration.la
_gtk_osxapplication_la_SOURCES = \
gtk_osxapplication.c \
gtk_osxapplication-module.c
diff --git a/configure.ac b/configure.ac
index c1fceee..4d37b30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.52)
-AC_INIT(ige-mac-integration, 0.9.8)
-AC_CONFIG_SRCDIR(src/ige-mac-menu.c)
+AC_INIT(gtk-mac-integration, 1.0.0)
+AC_CONFIG_SRCDIR(src/gtk-mac-menu.c)
AC_CONFIG_MACRO_DIR(m4)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -48,7 +48,7 @@ AS_IF([test "x$with_gtk" = xgtk+-3.0],
AC_MSG_ERROR([GTK+-2.0 specified but not found]))],
[PKG_CHECK_MODULES(MAC, [gtk+-3.0 >= 2.90],GTK_MAJOR="gtk+-3.0",
PKG_CHECK_MODULES(MAC, [gtk+-2.0 >= 2.10], GTK_MAJOR="gtk+-2.0",
- AC_MSG_ERROR([GTK+-2.0 Wersion 2.10 or higher or GTK+-3.0 Version 2.90.0 or higher is required to build ige-mac-integration])))])
+ AC_MSG_ERROR([GTK+-2.0 Wersion 2.10 or higher or GTK+-3.0 Version 2.90.0 or higher is required to build gtk-mac-integration])))])
AC_MSG_CHECKING([GTK+ Version])
@@ -71,11 +71,11 @@ AC_CONFIG_FILES(
src/Makefile
bindings/Makefile
bindings/python/Makefile
- bindings/python/igemacintegration/Makefile
+ bindings/python/gtkmacintegration/Makefile
bindings/python/gtk_osxapplication/Makefile
bindings/python/gtk3_osxapplication/Makefile
data/Makefile
- data/ige-mac-integration.pc
+ data/gtk-mac-integration.pc
docs/Makefile
docs/reference/Makefile
strings/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index e31b535..3d0b2b2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = ige-mac-integration.pc.in
+EXTRA_DIST = gtk-mac-integration.pc.in
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ige-mac-integration.pc
+pkgconfig_DATA = gtk-mac-integration.pc
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 978fa35..4b4d095 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
# of using the various options.
# The name of the module, e.g. 'glib'.
-DOC_MODULE=ige-mac-integration
+DOC_MODULE=gtk-mac-integration
# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
DOC_MODULE_VERSION=0.9
@@ -55,12 +55,12 @@ CFILE_GLOB=$(top_srcdir)/src/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
IGNORE_HFILES= \
- ige-mac-integration.h \
- ige-mac-bundle.h \
- ige-mac-dock.h \
- ige-mac-menu.h \
- ige-mac-image-utils.h \
- ige-mac-private.h \
+ gtk-mac-integration.h \
+ gtk-mac-bundle.h \
+ gtk-mac-dock.h \
+ gtk-mac-menu.h \
+ gtk-mac-image-utils.h \
+ gtk-mac-private.h \
getlabel.h \
cocoa_menu.h \
cocoa_menu_item.h \
diff --git a/src/Makefile.am b/src/Makefile.am
index 288e241..9eeca50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
AM_CPPFLAGS = -I$(top_srcdir) $(WARN_CFLAGS)
-lib_LTLIBRARIES = libigemacintegration.la
+lib_LTLIBRARIES = libgtkmacintegration.la
-libigemacintegration_la_SOURCES = \
+libgtkmacintegration_la_SOURCES = \
GtkApplicationDelegate.h \
GtkApplicationDelegate.c \
GtkApplicationNotify.h \
@@ -20,29 +20,29 @@ libigemacintegration_la_SOURCES = \
gtkosxapplication_quartz.c \
gtkosxapplication.c \
gtkosxapplicationprivate.h \
- ige-mac-dock.c \
- ige-mac-bundle.c \
- ige-mac-menu.c \
- ige-mac-image-utils.c \
- ige-mac-image-utils.h \
- ige-mac-private.h \
+ gtk-mac-dock.c \
+ gtk-mac-bundle.c \
+ gtk-mac-menu.c \
+ gtk-mac-image-utils.c \
+ gtk-mac-image-utils.h \
+ gtk-mac-private.h \
$(integration_HEADERS)
-libigemacintegration_la_CFLAGS = $(MAC_CFLAGS) -xobjective-c
-libigemacintegration_la_OBJCFLAGS = $(MAC_CFLAGS)
-libigemacintegration_la_LIBADD = $(MAC_LIBS) -lobjc
-libigemacintegration_la_LDFLAGS = -framework Carbon -framework ApplicationServices
+libgtkmacintegration_la_CFLAGS = $(MAC_CFLAGS) -xobjective-c
+libgtkmacintegration_la_OBJCFLAGS = $(MAC_CFLAGS)
+libgtkmacintegration_la_LIBADD = $(MAC_LIBS) -lobjc
+libgtkmacintegration_la_LDFLAGS = -framework Carbon -framework ApplicationServices
-integration_includedir = $(includedir)/igemacintegration
+integration_includedir = $(includedir)/gtkmacintegration
integration_include_HEADERS = \
- ige-mac-integration.h \
+ gtk-mac-integration.h \
gtkosxapplication.h \
- ige-mac-menu.h \
- ige-mac-dock.h \
- ige-mac-bundle.h
+ gtk-mac-menu.h \
+ gtk-mac-dock.h \
+ gtk-mac-bundle.h
# Test application
noinst_PROGRAMS = test-integration
test_integration_SOURCES = test-integration.c
test_integration_CFLAGS = $(MAC_CFLAGS)
-test_integration_LDADD = $(MAC_LIBS) libigemacintegration.la
+test_integration_LDADD = $(MAC_LIBS) libgtkmacintegration.la
diff --git a/src/gtkosxapplication.c b/src/gtkosxapplication.c
index 5dddc01..54de3ae 100644
--- a/src/gtkosxapplication.c
+++ b/src/gtkosxapplication.c
@@ -185,7 +185,7 @@
* along with their non-standard dependencies and their resources
* (graphical elements, translations, and such) in special directory
* structures called "bundles". To easily package your Gtk+
- * application, have a look at ige-mac-bundler, also available from
+ * application, have a look at gtk-mac-bundler, also available from
* the Gtk-OSX project.
*
* OSX provides a variety of functions pertaining to bundles, most of which are not likely to interest someone porting a Gtk+ application. GtkOSXApplication has wrapped a few that might be:
diff --git a/src/gtkosxapplication.h b/src/gtkosxapplication.h
index e71a451..346d8b8 100644
--- a/src/gtkosxapplication.h
+++ b/src/gtkosxapplication.h
@@ -110,9 +110,9 @@ void gtk_osxapplication_set_dock_icon_resource(GtkOSXApplication *self,
const gchar *name,
const gchar *type,
const gchar *subdir);
-/* Ige-mac-dock provided two functions,
- * ige_mac_dock_set_overlay_from_pixbuf and
- * ige_mac_doc_set_overlay_from_resource, but OSX 10.5 and later do
+/* Gtk-mac-dock provided two functions,
+ * gtk_mac_dock_set_overlay_from_pixbuf and
+ * gtk_mac_doc_set_overlay_from_resource, but OSX 10.5 and later do
* not support application dock tile overlays. Document dock tiles
* will by default represent a miniaturized view of the document's
* contents badged with an even more miniaturized application
@@ -124,14 +124,14 @@ gint gtk_osxapplication_attention_request(GtkOSXApplication *self,
void gtk_osxapplication_cancel_attention_request(GtkOSXApplication *self, gint id);
/* Bundle Functions */
-/* ige-mac-bundle included a bunch of silly stuff for setting up the
+/* gtk-mac-bundle included a bunch of silly stuff for setting up the
* environment. It's silly first because that's easier to do with a
* startup script, and even easier to do with an LCEnvironment
* dictionary in the bundle's Info.plist.
* Gtk applications, at least when launched with a shell script, still
* return a bundle identifier and it's executable path is correct and
- * useful. Ige-mac-bundle had a "is it an application bundle"
+ * useful. Gtk-mac-bundle had a "is it an application bundle"
* function, but NSBundle doesn't provide that; instead,
* quartz_application_get_bundle_id will return NULL if it's not really a
* bundle, there's no Info.plist, or if Info.plist doesn't have a
diff --git a/src/gtkosxapplication_quartz.c b/src/gtkosxapplication_quartz.c
index b8149fd..a25f089 100644
--- a/src/gtkosxapplication_quartz.c
+++ b/src/gtkosxapplication_quartz.c
@@ -36,7 +36,7 @@
#include "cocoa_menu_item.h"
#include "cocoa_menu.h"
#include "getlabel.h"
-#include "ige-mac-image-utils.h"
+#include "gtk-mac-image-utils.h"
/* This is a private function in libgdk; we need to have is so that we
can force new windows onto the Window menu */
@@ -1002,7 +1002,7 @@ nsimage_from_pixbuf(GdkPixbuf *pixbuf)
NSImage* newImage = nil;
g_return_val_if_fail (pixbuf != NULL, NULL);
- image = ige_mac_image_from_pixbuf (pixbuf);
+ image = gtk_mac_image_from_pixbuf (pixbuf);
// Get the image dimensions.
imageRect.size.height = CGImageGetHeight(image);
imageRect.size.width = CGImageGetWidth(image);
diff --git a/src/test-integration.c b/src/test-integration.c
index 8979a7b..8b94d17 100644
--- a/src/test-integration.c
+++ b/src/test-integration.c
@@ -27,14 +27,14 @@
* like we have to use NSMenu for this unfortunately. However, it
* might be possible to implement a category or to use the "method
* swizzling" trick to override this somehow... look into that.
- *
+ *
* or, triggering the carbon dock setup before sharedapp:
*
* EventTypeSpec kFakeEventList[] = { { INT_MAX, INT_MAX } };
EventRef event;
ReceiveNextEvent (GetEventTypeCount (kFakeEventList),
kFakeEventList,
- kEventDurationNoWait, false,
+ kEventDurationNoWait, false,
&event);
*
* - Dragging items onto the dock icon?
@@ -57,15 +57,15 @@
*/
/* Uncomment ONE of these to test menu-mangling: */
-//#define IGEMACINTEGRATION
+//#define GTKMACINTEGRATION
#define GTKOSXAPPLICATION
/* These others are optional */
#define BUILT_UI
//#define QUARTZ_HANDLERS
-/* IGEMACINTEGRATION uses Carbon, which isn't available for 64-bit builds. */
+/* GTKMACINTEGRATION uses Carbon, which isn't available for 64-bit builds. */
#ifdef __x86_64__
-#undef IGEMACINTEGRATION
+#undef GTKMACINTEGRATION
#ifndef GTKOSXAPPLICATION
#define GTKOSXAPPLICATION
#endif
@@ -79,10 +79,10 @@
#include <gdk/gdkkeysyms.h>
#endif
-#ifdef IGEMACINTEGRATION
-#include "ige-mac-menu.h"
-#include "ige-mac-dock.h"
-#include "ige-mac-bundle.h"
+#ifdef GTKMACINTEGRATION
+#include "gtk-mac-menu.h"
+#include "gtk-mac-dock.h"
+#include "gtk-mac-bundle.h"
#endif
#ifdef GTKOSXAPPLICATION
#include "gtkosxapplication.h"
@@ -180,7 +180,7 @@ new_window_cb(GtkAction* action, gpointer data)
gchar *title;
g_print("Create New Window\n");
title = g_strdup_printf( "Test Integration Window %d", serial++);
- create_window(title);
+ create_window(title);
g_free(title);
}
@@ -196,11 +196,11 @@ front_cb (GtkAction *action, gpointer data) {
g_return_if_fail(data != NULL);
}
-static GtkActionEntry test_actions[] =
+static GtkActionEntry test_actions[] =
{
/*{Name, stock_id, label, accelerator, tooltip, callback} */
{"FileMenuAction", NULL, "_File", NULL, NULL, NULL},
- {"OpenAction", GTK_STOCK_OPEN, "_Open", NULL, NULL,
+ {"OpenAction", GTK_STOCK_OPEN, "_Open", NULL, NULL,
G_CALLBACK(action_activate_cb)},
{"QuitAction", GTK_STOCK_QUIT, "_Quit", NULL, NULL,
G_CALLBACK(gtk_main_quit)},
@@ -218,15 +218,15 @@ static GtkActionEntry test_actions[] =
{"HelpMenuAction", NULL, "_Help", NULL, NULL, NULL },
{"AboutAction", GTK_STOCK_ABOUT, "_About", NULL, NULL,
G_CALLBACK(action_activate_cb)},
- {"HelpAction", GTK_STOCK_HELP, "_Help", NULL, NULL,
+ {"HelpAction", GTK_STOCK_HELP, "_Help", NULL, NULL,
G_CALLBACK(action_activate_cb)},
};
static void
radio_item_changed_cb (GtkAction* action, GtkAction* current, MenuCBData *datum)
{
- g_print ("Radio group %s in window %s changed value: %s is now active.\n",
- datum->label, gtk_window_get_title(GTK_WINDOW(datum->item)),
+ g_print ("Radio group %s in window %s changed value: %s is now active.\n",
+ datum->label, gtk_window_get_title(GTK_WINDOW(datum->item)),
gtk_action_get_name(GTK_ACTION(current)));
}
@@ -235,7 +235,7 @@ static GtkActionEntry view_menu[] =
{"ViewMenuAction", NULL, "_View", NULL, NULL, NULL},
};
-static GtkRadioActionEntry view_actions[] =
+static GtkRadioActionEntry view_actions[] =
{
/* Name, StockID, Label, Accelerator, Tooltip, Value */
{"HorizontalAction", NULL, "_Horizontal", NULL, NULL, 0},
@@ -286,9 +286,9 @@ test_setup_menu (MenuItems *items, GtkAccelGroup *accel)
g_signal_connect (items->quit_item, "activate", G_CALLBACK (gtk_main_quit), NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), items->quit_item);
//Set accelerators
- gtk_accel_map_add_entry("<test-integration>/File/Open", GDK_o,
+ gtk_accel_map_add_entry("<test-integration>/File/Open", GDK_o,
GDK_CONTROL_MASK);
- gtk_accel_map_add_entry("<test-integration>/File/Quit", GDK_q,
+ gtk_accel_map_add_entry("<test-integration>/File/Quit", GDK_q,
GDK_CONTROL_MASK);
items->edit_item = item = gtk_menu_item_new_with_label ("Edit");
@@ -309,8 +309,8 @@ test_setup_menu (MenuItems *items, GtkAccelGroup *accel)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
items->preferences_item = gtk_menu_item_new_with_label ("Preferences");
- g_signal_connect_data (items->preferences_item, "activate",
- G_CALLBACK (menu_item_activate_cb),
+ g_signal_connect_data (items->preferences_item, "activate",
+ G_CALLBACK (menu_item_activate_cb),
menu_cbdata_new ("preferences", items->window),
(GClosureNotify) menu_cbdata_delete, 0);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), items->preferences_item);
@@ -322,8 +322,8 @@ test_setup_menu (MenuItems *items, GtkAccelGroup *accel)
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
items->about_item = gtk_menu_item_new_with_label ("About");
- g_signal_connect_data (items->about_item, "activate",
- G_CALLBACK (menu_item_activate_cb),
+ g_signal_connect_data (items->about_item, "activate",
+ G_CALLBACK (menu_item_activate_cb),
menu_cbdata_new ("about", items->window),
(GClosureNotify) menu_cbdata_delete, 0);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), items->about_item);
@@ -332,9 +332,9 @@ test_setup_menu (MenuItems *items, GtkAccelGroup *accel)
}
#endif //not BUILT_UI
-#ifdef IGEMACINTEGRATION
+#ifdef GTKMACINTEGRATION
static void
-dock_clicked_cb (IgeMacDock *dock,
+dock_clicked_cb (GtkMacDock *dock,
GtkWindow *window)
{
g_print ("Dock clicked\n");
@@ -343,29 +343,29 @@ dock_clicked_cb (IgeMacDock *dock,
static void
bounce_cb (GtkWidget *button,
- IgeMacDock *dock)
+ GtkMacDock *dock)
{
- ige_mac_dock_attention_request (dock, IGE_MAC_ATTENTION_INFO);
+ gtk_mac_dock_attention_request (dock, GTK_MAC_ATTENTION_INFO);
}
static void
change_icon_cb (GtkWidget *button,
- IgeMacDock *dock)
+ GtkMacDock *dock)
{
static gboolean changed;
static GdkPixbuf *pixbuf;
if (!pixbuf) {
char filename[PATH_MAX];
- snprintf (filename, sizeof(filename), "%s/%s", PREFIX,
+ snprintf (filename, sizeof(filename), "%s/%s", PREFIX,
"share/gtk-2.0/demo/gnome-foot.png");
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
}
- if (changed)
- ige_mac_dock_set_icon_from_pixbuf (dock, NULL);
+ if (changed)
+ gtk_mac_dock_set_icon_from_pixbuf (dock, NULL);
else
- ige_mac_dock_set_icon_from_pixbuf (dock, pixbuf);
+ gtk_mac_dock_set_icon_from_pixbuf (dock, pixbuf);
changed = !changed;
}
@@ -459,8 +459,8 @@ view_menu_cb (GtkWidget *button, gpointer user_data)
sizeof(view_menu)/sizeof(GtkActionEntry),
NULL);
gtk_action_group_add_radio_actions_full(
- view_action_group, view_actions,
- sizeof(view_actions)/sizeof(GtkRadioActionEntry),
+ view_action_group, view_actions,
+ sizeof(view_actions)/sizeof(GtkRadioActionEntry),
0, G_CALLBACK(radio_item_changed_cb),
menu_cbdata_new ("View", GTK_WINDOW(window)),
(GDestroyNotify) menu_cbdata_delete );
@@ -533,12 +533,12 @@ app_open_file_cb (GtkOSXApplication *app, gchar *path, gpointer user_data)
}
#endif //GTKOSXAPPLICATION
-#ifdef IGEMACINTEGRATION
+#ifdef GTKMACINTEGRATION
-gboolean _ige_mac_menu_is_quit_menu_item_handled (void);
+gboolean _gtk_mac_menu_is_quit_menu_item_handled (void);
static GtkWidget *
-create_window(IgeMacDock *dock, const gchar *title)
+create_window(GtkMacDock *dock, const gchar *title)
{
#else
static GtkWidget *
@@ -562,9 +562,9 @@ create_window(const gchar *title)
#else //not BUILT_UI
GtkAccelGroup *accel_group = gtk_accel_group_new();
#endif //not BUILT_UI
-#ifdef IGEMACINTEGRATION
- IgeMacMenuGroup *group;
-#endif //IGEMACINTEGRATION
+#ifdef GTKMACINTEGRATION
+ GtkMacMenuGroup *group;
+#endif //GTKMACINTEGRATION
#ifdef GTKOSXAPPLICATION
GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
#endif //GTKOSXAPPLICATION
@@ -599,31 +599,31 @@ create_window(const gchar *title)
items->window_menu = NULL;
#endif //not BUILT_UI
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
- gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_box_pack_start (GTK_BOX (vbox),
menubar,
FALSE, TRUE, 0);
-
- gtk_box_pack_start (GTK_BOX (vbox),
- gtk_label_new ("Some window content here"),
+
+ gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_label_new ("Some window content here"),
FALSE, FALSE, 12);
bbox = gtk_hbutton_box_new ();
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_CENTER);
gtk_box_set_spacing (GTK_BOX (bbox), 12);
- gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_box_pack_start (GTK_BOX (vbox),
bbox,
TRUE, TRUE, 0);
button = gtk_button_new_with_mnemonic ("Bo_unce");
g_signal_connect (button, "clicked", G_CALLBACK (bounce_cb), dock);
- gtk_box_pack_start (GTK_BOX (bbox),
+ gtk_box_pack_start (GTK_BOX (bbox),
button,
FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Change Icon");
g_signal_connect (button, "clicked", G_CALLBACK (change_icon_cb), dock);
- gtk_box_pack_start (GTK_BOX (bbox),
+ gtk_box_pack_start (GTK_BOX (bbox),
button,
FALSE, FALSE, 0);
@@ -646,28 +646,28 @@ create_window(const gchar *title)
FALSE, FALSE, 0);
gtk_widget_show_all (window);
-#if defined IGE_MAC_MENU || defined GTKOSXAPPLICATION
+#if defined GTK_MAC_MENU || defined GTKOSXAPPLICATION
gtk_widget_hide (menubar);
#ifdef GTKOSXAPPLICATION
/* Not really necessary unless quartz accelerator handling is turned off. */
#if !defined QUARTZ_HANDLERS && !defined BUILT_UI
- g_signal_connect(menubar, "can-activate-accel",
+ g_signal_connect(menubar, "can-activate-accel",
G_CALLBACK(can_activate_cb), NULL);
#endif // !defined QUARTZ_HANDLERS && !defined BUILT_UI
#endif //GTKOSXAPPLICATION
-#endif //defined IGE_MAC_MENU || defined GTKOSXAPPLICATION
-#ifdef IGEMACINTEGRATION
- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));
- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (items->quit_item));
- group = ige_mac_menu_add_app_menu_group ();
- ige_mac_menu_add_app_menu_item (group,
+#endif //defined GTK_MAC_MENU || defined GTKOSXAPPLICATION
+#ifdef GTKMACINTEGRATION
+ gtk_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));
+ gtk_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (items->quit_item));
+ group = gtk_mac_menu_add_app_menu_group ();
+ gtk_mac_menu_add_app_menu_item (group,
GTK_MENU_ITEM (items->about_item),
"About");
- group = ige_mac_menu_add_app_menu_group ();
- ige_mac_menu_add_app_menu_item (group,
+ group = gtk_mac_menu_add_app_menu_group ();
+ gtk_mac_menu_add_app_menu_item (group,
GTK_MENU_ITEM (items->preferences_item),
"Preferences");
-#endif //IGEMACINTEGRATION
+#endif //GTKMACINTEGRATION
#ifdef GTKOSXAPPLICATION
GtkWidget *sep;
gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
@@ -688,7 +688,7 @@ create_window(const gchar *title)
#endif //GTKOSXAPPLICATION
if (!menu_items_quark)
menu_items_quark = g_quark_from_static_string("MenuItem");
- g_object_set_qdata_full(G_OBJECT(window), menu_items_quark,
+ g_object_set_qdata_full(G_OBJECT(window), menu_items_quark,
items, (GDestroyNotify)menu_items_destroy);
return window;
}
@@ -700,19 +700,19 @@ main (int argc, char **argv)
#ifndef BUILT_UI
GtkWidget *window2;
#endif
-#ifdef IGEMACINTEGRATION
- IgeMacDock *dock;
-#endif //IGEMACINTEGRATION
+#ifdef GTKMACINTEGRATION
+ GtkMacDock *dock;
+#endif //GTKMACINTEGRATION
#ifdef GTKOSXAPPLICATION
GtkOSXApplication *theApp;
#endif //GTKOSXAPPLICATION
g_thread_init(NULL);
gdk_threads_init();
gtk_init (&argc, &argv);
-#ifdef IGEMACINTEGRATION
- dock = ige_mac_dock_get_default ();
- window1 = create_window(dock, "Test Integration Window 1");
- dock = ige_mac_dock_new ();
+#ifdef GTKMACINTEGRATION
+ dock = gtk_mac_dock_get_default ();
+ window1 = create_window(dock, "Test Integration Window 1");
+ dock = gtk_mac_dock_new ();
g_signal_connect (dock,
"clicked",
G_CALLBACK (dock_clicked_cb),
@@ -722,7 +722,7 @@ main (int argc, char **argv)
"quit-activate",
G_CALLBACK (gtk_main_quit),
window1);
-#endif //IGEMACINTEGRATION
+#endif //GTKMACINTEGRATION
#ifdef GTKOSXAPPLICATION
theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
window1 = create_window("Test Integration Window 1");
@@ -750,7 +750,7 @@ main (int argc, char **argv)
{
const gchar *id = quartz_application_get_bundle_id();
if (id != NULL) {
- g_print ("TestIntegration Error! Bundle Has ID %s\n", id);
+ g_print ("TestIntegration Error! Bundle Has ID %s\n", id);
}
}
#endif //GTKOSXAPPLICATION
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
