summaryrefslogtreecommitdiff
path: root/libs/gtkmm2ext
diff options
context:
space:
mode:
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r--libs/gtkmm2ext/bindings.cc12
-rw-r--r--libs/gtkmm2ext/cairocell.cc4
-rw-r--r--libs/gtkmm2ext/gtkapplication_quartz.mm15
-rw-r--r--libs/gtkmm2ext/gtkapplication_x11.c5
-rw-r--r--libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h7
-rw-r--r--libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h7
-rw-r--r--libs/gtkmm2ext/gtkmm2ext/dndvbox.h6
-rw-r--r--libs/gtkmm2ext/keyboard.cc2
-rw-r--r--libs/gtkmm2ext/motionfeedback.cc6
-rw-r--r--libs/gtkmm2ext/treeutils.cc4
10 files changed, 28 insertions, 40 deletions
diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc
index 6002f16371..92004e4d27 100644
--- a/libs/gtkmm2ext/bindings.cc
+++ b/libs/gtkmm2ext/bindings.cc
@@ -217,7 +217,7 @@ Bindings::set_action_map (ActionMap& am)
bool
Bindings::activate (KeyboardKey kb, Operation op)
{
- KeybindingMap* kbm;
+ KeybindingMap* kbm = 0;
switch (op) {
case Press:
@@ -244,7 +244,7 @@ Bindings::activate (KeyboardKey kb, Operation op)
void
Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
{
- KeybindingMap* kbm;
+ KeybindingMap* kbm = 0;
switch (op) {
case Press:
@@ -269,7 +269,7 @@ Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
void
Bindings::remove (KeyboardKey kb, Operation op)
{
- KeybindingMap* kbm;
+ KeybindingMap* kbm = 0;
switch (op) {
case Press:
@@ -290,7 +290,7 @@ Bindings::remove (KeyboardKey kb, Operation op)
bool
Bindings::activate (MouseButton bb, Operation op)
{
- MouseButtonBindingMap* bbm;
+ MouseButtonBindingMap* bbm = 0;
switch (op) {
case Press:
@@ -317,7 +317,7 @@ Bindings::activate (MouseButton bb, Operation op)
void
Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
{
- MouseButtonBindingMap* bbm;
+ MouseButtonBindingMap* bbm = 0;
switch (op) {
case Press:
@@ -342,7 +342,7 @@ Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
void
Bindings::remove (MouseButton bb, Operation op)
{
- MouseButtonBindingMap* bbm;
+ MouseButtonBindingMap* bbm = 0;
switch (op) {
case Press:
diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc
index 5a7f4309ed..86dac26f2c 100644
--- a/libs/gtkmm2ext/cairocell.cc
+++ b/libs/gtkmm2ext/cairocell.cc
@@ -232,13 +232,13 @@ CairoEditableText::on_scroll_event (GdkEventScroll* ev)
}
bool
-CairoEditableText::on_focus_in_event (GdkEventFocus* ev)
+CairoEditableText::on_focus_in_event (GdkEventFocus*)
{
return false;
}
bool
-CairoEditableText::on_focus_out_event (GdkEventFocus* ev)
+CairoEditableText::on_focus_out_event (GdkEventFocus*)
{
if (editing_cell) {
queue_draw_cell (editing_cell);
diff --git a/libs/gtkmm2ext/gtkapplication_quartz.mm b/libs/gtkmm2ext/gtkapplication_quartz.mm
index 694bfedd50..045db98a95 100644
--- a/libs/gtkmm2ext/gtkapplication_quartz.mm
+++ b/libs/gtkmm2ext/gtkapplication_quartz.mm
@@ -24,6 +24,15 @@
* 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>
@@ -32,12 +41,6 @@
#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__)
diff --git a/libs/gtkmm2ext/gtkapplication_x11.c b/libs/gtkmm2ext/gtkapplication_x11.c
index dd16e36c09..8ab590fb54 100644
--- a/libs/gtkmm2ext/gtkapplication_x11.c
+++ b/libs/gtkmm2ext/gtkapplication_x11.c
@@ -34,13 +34,12 @@ void gtk_application_cleanup ()
}
void
-gtk_application_set_menu_bar (GtkMenuShell *menu_shell)
+gtk_application_set_menu_bar (GtkMenuShell* menushell)
{
}
void
-gtk_application_add_app_menu_item (GtkApplicationMenuGroup *group,
- GtkMenuItem *menu_item)
+gtk_application_add_app_menu_item (GtkApplicationMenuGroup* group, GtkMenuItem* item)
{
}
diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
index dfa81cffe0..c856414150 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
@@ -20,13 +20,6 @@
#ifndef __gtkmm2ext_cell_renderer_pixbuf_multi_h__
#define __gtkmm2ext_cell_renderer_pixbuf_multi_h__
-#ifdef GTKOSX
-#include <MacTypes.h>
-#if defined(Style)
-#undef style
-#endif
-#endif
-
#include <map>
#include <stdint.h>
diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
index 4a1bbb9051..7bc5d80685 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
@@ -17,13 +17,6 @@
*/
-#ifdef GTKOSX
-#include <MacTypes.h>
-#if defined(Style)
-#undef style
-#endif
-#endif
-
#ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__
#define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__
diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
index e0b1c6ea13..649455e86b 100644
--- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
+++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
@@ -283,7 +283,7 @@ private:
}
/* Draw the drag icon */
- bool icon_expose (GdkEventExpose* ev)
+ bool icon_expose (GdkEventExpose*)
{
/* Just grab the child's widget and use that */
@@ -307,7 +307,7 @@ private:
}
void drag_data_received (
- Glib::RefPtr<Gdk::DragContext> const & context, int x, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time
+ Glib::RefPtr<Gdk::DragContext> const & context, int /*x*/, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time
)
{
/* work out where it was dropped */
@@ -374,7 +374,7 @@ private:
}
}
- bool drag_motion (Glib::RefPtr<Gdk::DragContext> const &, int x, int y, guint)
+ bool drag_motion (Glib::RefPtr<Gdk::DragContext> const &, int /*x*/, int y, guint)
{
if (_children.empty ()) {
return false;
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 20380d5b01..10c9723696 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -69,7 +69,7 @@ const char* Keyboard::primary_modifier_name() { return _("Command"); }
const char* Keyboard::secondary_modifier_name() { return _("Option"); }
const char* Keyboard::tertiary_modifier_name() { return _("Shift"); }
const char* Keyboard::level4_modifier_name() { return _("Control"); }
-const char* Keyboard::copy_modifier_name() { return _("Mod1"; ); }
+const char* Keyboard::copy_modifier_name() { return _("Mod1"); }
const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
#else
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index c3152d7616..6b85913d0c 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -253,14 +253,14 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev)
}
bool
-MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing *ev)
+MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing*)
{
pixwin.grab_focus();
return false;
}
bool
-MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing *ev)
+MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing*)
{
pixwin.unset_flags (HAS_FOCUS);
return false;
@@ -316,7 +316,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev)
}
bool
-MotionFeedback::pixwin_expose_event (GdkEventExpose* ev)
+MotionFeedback::pixwin_expose_event (GdkEventExpose*)
{
if (!_controllable) {
return true;
diff --git a/libs/gtkmm2ext/treeutils.cc b/libs/gtkmm2ext/treeutils.cc
index 0ed8a9d5f9..d509ff6796 100644
--- a/libs/gtkmm2ext/treeutils.cc
+++ b/libs/gtkmm2ext/treeutils.cc
@@ -25,8 +25,8 @@ using namespace Glib;
using namespace Gtk;
void
-Gtkmm2ext::treeview_select_one (RefPtr<TreeSelection> selection, RefPtr<TreeModel> model, TreeView& view,
- TreeIter iter, TreePath path, TreeViewColumn* col)
+Gtkmm2ext::treeview_select_one (RefPtr<TreeSelection> selection, RefPtr<TreeModel> /*model*/, TreeView& view,
+ TreeIter /*iter*/, TreePath path, TreeViewColumn* col)
{
if (!view.row_expanded (path)) {
// cerr << "!! selecting a row that isn't expanded! " << path.to_string() << endl;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 11:55:19 +0000