summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libgdl/gdl-dock-item.c35
-rw-r--r--src/libgdl/gdl-dock-master.c11
-rw-r--r--src/libgdl/gdl-dock-notebook.c9
-rw-r--r--src/libgdl/gdl-dock-object.c7
-rw-r--r--src/libgdl/gdl-dock.c38
-rw-r--r--src/libgdl/gdl-switcher.c18
-rw-r--r--src/libgdl/gdl-tools.h4
7 files changed, 89 insertions, 33 deletions
diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c
index 3d746fa7c..138265034 100644
--- a/src/libgdl/gdl-dock-item.c
+++ b/src/libgdl/gdl-dock-item.c
@@ -82,8 +82,7 @@ static void gdl_dock_item_forall (GtkContainer *container,
static GType gdl_dock_item_child_type (GtkContainer *container);
static void gdl_dock_item_set_focus_child (GtkContainer *container,
- GtkWidget *widget,
- gpointer callback_data);
+ GtkWidget *widget);
static void gdl_dock_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
@@ -697,13 +696,13 @@ gdl_dock_item_child_type (GtkContainer *container)
static void
gdl_dock_item_set_focus_child (GtkContainer *container,
- GtkWidget *child,
- gpointer callback_data)
+ GtkWidget *child)
{
g_return_if_fail (GDL_IS_DOCK_ITEM (container));
- if (GTK_CONTAINER_CLASS (parent_class)->set_focus_child)
+ if (GTK_CONTAINER_CLASS (parent_class)->set_focus_child) {
(* GTK_CONTAINER_CLASS (parent_class)->set_focus_child) (container, child);
+ }
gdl_dock_item_showhide_grip (GDL_DOCK_ITEM (container));
}
@@ -920,6 +919,8 @@ static void
gdl_dock_item_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
+ (void)previous_style;
+
g_return_if_fail (widget != NULL);
g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
@@ -1454,9 +1455,10 @@ static void
gdl_dock_item_detach_menu (GtkWidget *widget,
GtkMenu *menu)
{
- GdlDockItem *item;
-
- item = GDL_DOCK_ITEM (widget);
+ GdlDockItem *item = GDL_DOCK_ITEM(widget);
+
+ (void)menu;
+
item->_priv->menu = NULL;
}
@@ -1539,12 +1541,13 @@ gdl_dock_item_tab_button (GtkWidget *widget,
GdkEventButton *event,
gpointer data)
{
- GdlDockItem *item;
+ GdlDockItem *item = GDL_DOCK_ITEM(data);
- item = GDL_DOCK_ITEM (data);
+ (void)widget;
- if (!GDL_DOCK_ITEM_NOT_LOCKED (item))
+ if (!GDL_DOCK_ITEM_NOT_LOCKED (item)) {
return;
+ }
switch (event->button) {
case 1:
@@ -1577,7 +1580,9 @@ gdl_dock_item_hide_cb (GtkWidget *widget,
GdlDockItem *item)
{
GdlDockMaster *master;
-
+
+ (void)widget;
+
g_return_if_fail (item != NULL);
master = GDL_DOCK_OBJECT_GET_MASTER (item);
@@ -1590,6 +1595,8 @@ gdl_dock_item_lock_cb (GtkWidget *widget,
{
g_return_if_fail (item != NULL);
+ (void)widget;
+
gdl_dock_item_lock (item);
}
@@ -1599,6 +1606,8 @@ gdl_dock_item_unlock_cb (GtkWidget *widget,
{
g_return_if_fail (item != NULL);
+ (void)widget;
+
gdl_dock_item_unlock (item);
}
@@ -1705,6 +1714,8 @@ gdl_dock_item_dock_to (GdlDockItem *item,
GdlDockPlacement position,
gint docking_param)
{
+ (void)docking_param;
+
g_return_if_fail (item != NULL);
g_return_if_fail (item != target);
g_return_if_fail (target != NULL || position == GDL_DOCK_FLOATING);
diff --git a/src/libgdl/gdl-dock-master.c b/src/libgdl/gdl-dock-master.c
index 1c362ed16..4b36e4f8b 100644
--- a/src/libgdl/gdl-dock-master.c
+++ b/src/libgdl/gdl-dock-master.c
@@ -262,6 +262,7 @@ ht_foreach_build_slist (gpointer key,
gpointer value,
GSList **slist)
{
+ (void)key;
*slist = g_slist_prepend (*slist, value);
}
@@ -718,7 +719,11 @@ item_dock_cb (GdlDockObject *object,
gpointer user_data)
{
GdlDockMaster *master = user_data;
-
+
+ (void)object;
+ (void)position;
+ (void)other_data;
+
g_return_if_fail (requestor && GDL_IS_DOCK_OBJECT (requestor));
g_return_if_fail (master && GDL_IS_DOCK_MASTER (master));
@@ -740,6 +745,8 @@ item_detach_cb (GdlDockObject *object,
{
GdlDockMaster *master = user_data;
+ (void)recursive;
+
g_return_if_fail (object && GDL_IS_DOCK_OBJECT (object));
g_return_if_fail (master && GDL_IS_DOCK_MASTER (master));
@@ -760,6 +767,8 @@ item_notify_cb (GdlDockObject *object,
gint locked = COMPUTE_LOCKED (master);
gboolean item_locked;
+ (void)pspec;
+
g_object_get (object, "locked", &item_locked, NULL);
if (item_locked) {
diff --git a/src/libgdl/gdl-dock-notebook.c b/src/libgdl/gdl-dock-notebook.c
index 79bebd1f2..f6e0aeeef 100644
--- a/src/libgdl/gdl-dock-notebook.c
+++ b/src/libgdl/gdl-dock-notebook.c
@@ -157,6 +157,7 @@ gdl_dock_notebook_notify_cb (GObject *g_object,
gpointer user_data)
{
g_return_if_fail (user_data != NULL && GDL_IS_DOCK_NOTEBOOK (user_data));
+ (void)g_object;
/* chain the notify signal */
g_object_notify (G_OBJECT (user_data), pspec->name);
@@ -167,10 +168,12 @@ gdl_dock_notebook_button_cb (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- if (event->type == GDK_BUTTON_PRESS)
+ (void)widget;
+ if (event->type == GDK_BUTTON_PRESS) {
GDL_DOCK_ITEM_SET_FLAGS (user_data, GDL_DOCK_USER_ACTION);
- else
+ } else {
GDL_DOCK_ITEM_UNSET_FLAGS (user_data, GDL_DOCK_USER_ACTION);
+ }
return FALSE;
}
@@ -267,6 +270,7 @@ gdl_dock_notebook_switch_page_cb (GtkNotebook *nb,
{
GdlDockNotebook *notebook;
GtkWidget *tablabel;
+ (void)page_num;
notebook = GDL_DOCK_NOTEBOOK (data);
@@ -332,6 +336,7 @@ gdl_dock_notebook_forall (GtkContainer *container,
static GType
gdl_dock_notebook_child_type (GtkContainer *container)
{
+ (void)container;
return GDL_TYPE_DOCK_ITEM;
}
diff --git a/src/libgdl/gdl-dock-object.c b/src/libgdl/gdl-dock-object.c
index dadf072a0..233d03b3b 100644
--- a/src/libgdl/gdl-dock-object.c
+++ b/src/libgdl/gdl-dock-object.c
@@ -289,6 +289,7 @@ static void
gdl_dock_object_foreach_detach (GdlDockObject *object,
gpointer user_data)
{
+ (void)user_data;
gdl_dock_object_detach (object, TRUE);
}
@@ -431,6 +432,9 @@ gdl_dock_object_dock_unimplemented (GdlDockObject *object,
GdlDockPlacement position,
GValue *other_data)
{
+ (void)requestor;
+ (void)position;
+ (void)other_data;
g_warning (_("Call to gdl_dock_object_dock in a dock object %p "
"(object type is %s) which hasn't implemented this method"),
object, G_OBJECT_TYPE_NAME (object));
@@ -440,6 +444,7 @@ static void
gdl_dock_object_real_present (GdlDockObject *object,
GdlDockObject *child)
{
+ (void)child;
gtk_widget_show (GTK_WIDGET (object));
}
@@ -830,7 +835,7 @@ gdl_dock_param_get_type (void)
static GType our_type = 0;
if (our_type == 0) {
- GTypeInfo tinfo = { 0, };
+ GTypeInfo tinfo = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
our_type = g_type_register_static (G_TYPE_STRING, "GdlDockParam", &tinfo, 0);
/* register known transform functions */
diff --git a/src/libgdl/gdl-dock.c b/src/libgdl/gdl-dock.c
index 5f0d7c66d..d80a47a1f 100644
--- a/src/libgdl/gdl-dock.c
+++ b/src/libgdl/gdl-dock.c
@@ -275,6 +275,8 @@ gdl_dock_floating_configure_event_cb (GtkWidget *widget,
{
GdlDock *dock;
+ (void)widget;
+
g_return_val_if_fail (user_data != NULL && GDL_IS_DOCK (user_data), TRUE);
dock = GDL_DOCK (user_data);
@@ -510,7 +512,10 @@ gdl_dock_notify_cb (GObject *object,
gpointer user_data)
{
GdlDock *dock;
-
+
+ (void)pspec;
+ (void)user_data;
+
g_return_if_fail (object != NULL || GDL_IS_DOCK (object));
dock = GDL_DOCK (object);
@@ -561,7 +566,7 @@ gdl_dock_size_request (GtkWidget *widget,
border_width = container->border_width;
/* make request to root */
- if (dock->root && gtk_widget_get_visible (dock->root))
+ if (dock->root && gtk_widget_get_visible( GTK_WIDGET(dock->root) ))
gtk_widget_size_request (GTK_WIDGET (dock->root), requisition);
else {
requisition->width = 0;
@@ -597,8 +602,9 @@ gdl_dock_size_allocate (GtkWidget *widget,
allocation->width = MAX (1, allocation->width - 2 * border_width);
allocation->height = MAX (1, allocation->height - 2 * border_width);
- if (dock->root && gtk_widget_get_visible (dock->root))
+ if (dock->root && gtk_widget_get_visible( GTK_WIDGET(dock->root) )) {
gtk_widget_size_allocate (GTK_WIDGET (dock->root), allocation);
+ }
}
static void
@@ -740,6 +746,8 @@ gdl_dock_forall (GtkContainer *container,
{
GdlDock *dock;
+ (void)include_internals;
+
g_return_if_fail (container != NULL);
g_return_if_fail (GDL_IS_DOCK (container));
g_return_if_fail (callback != NULL);
@@ -753,6 +761,7 @@ gdl_dock_forall (GtkContainer *container,
static GType
gdl_dock_child_type (GtkContainer *container)
{
+ (void)container;
return GDL_TYPE_DOCK_ITEM;
}
@@ -927,15 +936,16 @@ gdl_dock_dock (GdlDockObject *object,
/* Realize the item (create its corresponding GdkWindow) when
GdlDock has been realized. */
- if (gtk_widget_get_realized (dock))
+ if ( gtk_widget_get_realized( GTK_WIDGET(dock) )) {
gtk_widget_realize (widget);
-
+ }
+
/* Map the widget if it's visible and the parent is visible and has
been mapped. This is done to make sure that the GdkWindow is
visible. */
- if (gtk_widget_get_visible (dock) &&
+ if (gtk_widget_get_visible( GTK_WIDGET(dock) ) &&
gtk_widget_get_visible (widget)) {
- if (gtk_widget_get_mapped (dock))
+ if (gtk_widget_get_mapped( GTK_WIDGET(dock) ))
gtk_widget_map (widget);
/* Make the widget resize. */
@@ -1023,8 +1033,11 @@ gdl_dock_present (GdlDockObject *object,
{
GdlDock *dock = GDL_DOCK (object);
- if (dock->_priv->floating)
+ (void)child;
+
+ if (dock->_priv->floating) {
gtk_window_present (GTK_WINDOW (dock->_priv->window));
+ }
}
@@ -1097,6 +1110,8 @@ gdl_dock_select_larger_item (GdlDockItem *dock_item_1,
gint level /* for debugging */)
{
GtkRequisition size_1, size_2;
+
+ (void)level;
g_return_val_if_fail (dock_item_1 != NULL, dock_item_2);
g_return_val_if_fail (dock_item_2 != NULL, dock_item_1);
@@ -1218,7 +1233,7 @@ gdl_dock_add_item (GdlDock *dock,
/* Non-floating item. */
if (dock->root) {
GdlDockPlacement local_placement;
- GtkRequisition preferred_size;
+ /* GtkRequisition preferred_size; */
best_dock_item =
gdl_dock_find_best_placement_item (GDL_DOCK_ITEM (dock->root),
@@ -1258,10 +1273,11 @@ gdl_dock_add_floating_item (GdlDock *dock,
"floaty", y,
NULL));
- if (gtk_widget_get_visible (dock)) {
+ if (gtk_widget_get_visible( GTK_WIDGET(dock) )) {
gtk_widget_show (GTK_WIDGET (new_dock));
- if (gtk_widget_get_mapped (dock))
+ if (gtk_widget_get_mapped( GTK_WIDGET(dock) )) {
gtk_widget_map (GTK_WIDGET (new_dock));
+ }
/* Make the widget resize. */
gtk_widget_queue_resize (GTK_WIDGET (new_dock));
diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c
index 779895056..eccd66ce2 100644
--- a/src/libgdl/gdl-switcher.c
+++ b/src/libgdl/gdl-switcher.c
@@ -609,6 +609,8 @@ gdl_switcher_notify_cb (GObject *g_object, GParamSpec *pspec,
GdlSwitcher *switcher)
{
gboolean show_tabs;
+ (void)g_object;
+ (void)pspec;
g_return_if_fail (switcher != NULL && GDL_IS_SWITCHER (switcher));
show_tabs = gtk_notebook_get_show_tabs (GTK_NOTEBOOK (switcher));
gdl_switcher_set_show_buttons (switcher, !show_tabs);
@@ -619,7 +621,9 @@ gdl_switcher_switch_page_cb (GtkNotebook *nb, GtkWidget *page_widget,
gint page_num, GdlSwitcher *switcher)
{
gint switcher_id;
-
+
+ (void)nb;
+ (void)page_num;
/* Change switcher button */
switcher_id = gdl_switcher_get_page_id (page_widget);
gdl_switcher_select_button (GDL_SWITCHER (switcher), switcher_id);
@@ -630,7 +634,9 @@ gdl_switcher_page_added_cb (GtkNotebook *nb, GtkWidget *page,
gint page_num, GdlSwitcher *switcher)
{
gint switcher_id;
-
+
+ (void)nb;
+ (void)page_num;
switcher_id = gdl_switcher_get_page_id (page);
gdl_switcher_add_button (GDL_SWITCHER (switcher), NULL, NULL, NULL, NULL,
@@ -676,6 +682,7 @@ gdl_switcher_class_init (GdlSwitcherClass *klass)
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ (void)notebook_class;
container_class->forall = gdl_switcher_forall;
container_class->remove = gdl_switcher_remove;
@@ -755,12 +762,13 @@ gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
gtk_container_add (GTK_CONTAINER (button_widget), hbox);
gtk_widget_show (hbox);
- if (stock_id)
+ if (stock_id) {
icon_widget = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
- else if (pixbuf_icon)
+ } else if (pixbuf_icon) {
icon_widget = gtk_image_new_from_pixbuf (pixbuf_icon);
- else
+ } else {
icon_widget = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_BUTTON);
+ }
gtk_widget_show (icon_widget);
diff --git a/src/libgdl/gdl-tools.h b/src/libgdl/gdl-tools.h
index 0cfc9fb95..2cc68c035 100644
--- a/src/libgdl/gdl-tools.h
+++ b/src/libgdl/gdl-tools.h
@@ -104,6 +104,7 @@ static void
type_as_function ## _class_init_trampoline (gpointer klass, \
gpointer data) \
{ \
+ (void)data; \
parent_class = (parent_type ## Class *)g_type_class_ref ( \
parent_type_macro); \
type_as_function ## _class_init ((type ## Class *)klass); \
@@ -122,7 +123,8 @@ type_as_function ## _get_type (void)
NULL, /* class_data */ \
sizeof (type), \
0, /* n_preallocs */ \
- (GInstanceInitFunc) type_as_function ## _instance_init \
+ (GInstanceInitFunc) type_as_function ## _instance_init , \
+ NULL, /* value_table */ \
}; \
object_type = register_type_macro \
(type, type_as_function, corba_type, \
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-30 11:37:08 +0000