* Boston, MA 02111-1307, USA.
*/
+#include <sigc++/signal.h>
+#include <sigc++/slot.h>
+
+#include <string.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtkmm2ext/gtkapplication.h>
+#include <gtkmm2ext/gtkapplication-private.h>
+
#import <AppKit/NSMenu.h>
#import <AppKit/NSMenuItem.h>
#import <AppKit/NSCell.h>
#import <Foundation/NSString.h>
#import <Foundation/NSNotification.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtkmm2ext/gtkapplication.h>
-#include <gtkmm2ext/gtkapplication-private.h>
+#define UNUSED_PARAMETER(a) (void) (a)
// #define DEBUG(format, ...) g_printerr ("%s: " format, G_STRFUNC, ## __VA_ARGS__)
#define DEBUG(format, ...)
}
- (void) activate:(id) sender
{
+ UNUSED_PARAMETER(sender);
g_idle_add (idle_call_activate, gtk_menu_item);
}
@end
}
static gboolean
-accel_find_func (GtkAccelKey *key,
+accel_find_func (GtkAccelKey * /*key*/,
GClosure *closure,
gpointer data)
{
is still done by GTK, so this is more cosmetic than it may
appear.
*/
-
- const gchar* ltxt = get_menu_label_text (widget, &label);
-
+
+ get_menu_label_text (widget, &label);
+
if (GTK_IS_ACCEL_LABEL (label) &&
GTK_ACCEL_LABEL (label)->accel_closure)
{
}
static void
-cocoa_menu_item_accel_changed (GtkAccelGroup *accel_group,
- guint keyval,
- GdkModifierType modifier,
+cocoa_menu_item_accel_changed (GtkAccelGroup* /*accel_group*/,
+ guint /*keyval*/,
+ GdkModifierType /*modifier*/,
GClosure *accel_closure,
GtkWidget *widget)
{
static void
cocoa_menu_item_notify_label (GObject *object,
- GParamSpec *pspec,
- gpointer data)
+ GParamSpec *pspec,
+ gpointer)
{
GNSMenuItem *cocoa_item;
static void
push_menu_shell_to_nsmenu (GtkMenuShell *menu_shell,
NSMenu* cocoa_menu,
- gboolean toplevel,
- gboolean debug)
+ gboolean /*toplevel*/,
+ gboolean /*debug*/)
{
GList *children;
GList *l;
static gulong emission_hook_id = 0;
static gboolean
-parent_set_emission_hook (GSignalInvocationHint *ihint,
- guint n_param_values,
- const GValue *param_values,
+parent_set_emission_hook (GSignalInvocationHint* /*ihint*/,
+ guint /*n_param_values*/,
+ const GValue* param_values,
gpointer data)
{
GtkWidget *instance = (GtkWidget*) g_value_get_object (param_values);
}
static void
-parent_set_emission_hook_remove (GtkWidget *widget,
- gpointer data)
+parent_set_emission_hook_remove (GtkWidget*, gpointer)
{
- g_signal_remove_emission_hook (g_signal_lookup ("parent-set",
- GTK_TYPE_WIDGET),
- emission_hook_id);
+ g_signal_remove_emission_hook (g_signal_lookup ("parent-set", GTK_TYPE_WIDGET),
+ emission_hook_id);
}
/* Building "standard" Cocoa/OS X menus */
return 0;
}
+#if 0
static int
add_to_app_menu (NSMenu *menu)
{
[dummyItem release];
return 0;
}
-
-static int
-add_to_window_menu (NSMenu *menu)
-{
- NSMenuItem *dummyItem = [[NSMenuItem alloc] initWithTitle:@""
- action:nil keyEquivalent:@""];
- [dummyItem setSubmenu:menu];
- [_window_menu addItem:dummyItem];
- [dummyItem release];
- return 0;
-}
+#endif
static int
create_apple_menu ()
return 0;
}
+#if 0
+static int
+add_to_window_menu (NSMenu *menu)
+{
+ NSMenuItem *dummyItem = [[NSMenuItem alloc] initWithTitle:@""
+ action:nil keyEquivalent:@""];
+ [dummyItem setSubmenu:menu];
+ [_window_menu addItem:dummyItem];
+ [dummyItem release];
+ return 0;
+}
+
static int
create_window_menu ()
{
return 0;
}
+#endif
/*
* public functions
return self;
}
-- (void)appDidBecomeActive:(NSNotification *)notification
+- (void)appDidBecomeActive:(NSNotification *) notification
{
+ UNUSED_PARAMETER(notification);
Gtkmm2ext::Application::instance()->ActivationChanged (true);
}
-- (void)appDidBecomeInactive:(NSNotification *)notification
+- (void)appDidBecomeInactive:(NSNotification *) notification
{
+ UNUSED_PARAMETER(notification);
Gtkmm2ext::Application::instance()->ActivationChanged (false);
}
@end
@implementation GtkApplicationDelegate
--(BOOL) application:(NSApplication*) theApplication openFile:(NSString*) file
+-(BOOL) application:(NSApplication*) app :(NSString*) file
{
+ UNUSED_PARAMETER(app);
Glib::ustring utf8_path ([file UTF8String]);
Gtkmm2ext::Application::instance()->ShouldLoad (utf8_path);
return 1;
}
-- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *)sender
+- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *) app
{
+ UNUSED_PARAMETER(app);
Gtkmm2ext::Application::instance()->ShouldQuit ();
return NSTerminateCancel;
}