aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/e-canvas-background.c16
-rw-r--r--widgets/misc/e-canvas-vbox.c14
-rw-r--r--widgets/misc/e-canvas.c15
-rw-r--r--widgets/misc/e-colors.c4
-rw-r--r--widgets/misc/e-cursors.c5
-rw-r--r--widgets/misc/e-gui-utils.c10
-rw-r--r--widgets/misc/e-popup-menu.c16
-rw-r--r--widgets/misc/e-printable.c5
-rw-r--r--widgets/misc/e-reflow-model.c4
-rw-r--r--widgets/misc/e-reflow.c17
-rw-r--r--widgets/misc/e-selection-model-array.c7
-rw-r--r--widgets/misc/e-selection-model-simple.c4
-rw-r--r--widgets/misc/e-selection-model.c5
-rw-r--r--widgets/misc/e-unicode.c21
-rw-r--r--widgets/misc/gal-combo-box.c16
-rw-r--r--widgets/misc/gal-combo-text.c11
-rw-r--r--widgets/misc/test-color.c8
17 files changed, 95 insertions, 83 deletions
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 26d9d37de2..ad9f2b002b 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -23,18 +23,20 @@
#include <config.h>
-#include "e-canvas-background.h"
-
#include <math.h>
#include <stdio.h>
-#include <gtk/gtksignal.h>
+#include <string.h>
+
#include <gdk/gdkkeysyms.h>
-#include "gal/widgets/e-hsv-utils.h"
+#include <gtk/gtk.h>
+
+#include "gal/util/e-i18n.h"
+#include "gal/util/e-util.h"
#include "gal/widgets/e-canvas.h"
#include "gal/widgets/e-canvas-utils.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-i18n.h"
-#include <string.h>
+#include "gal/widgets/e-hsv-utils.h"
+
+#include "e-canvas-background.h"
#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 354da5d872..4c7969ff66 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -22,14 +22,18 @@
*/
#include <config.h>
+
#include <math.h>
+
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include "e-canvas-vbox.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "gal/util/e-util.h"
+#include <gtk/gtk.h>
+
#include "gal/util/e-i18n.h"
+#include "gal/util/e-util.h"
+
+#include "e-canvas.h"
+#include "e-canvas-utils.h"
+#include "e-canvas-vbox.h"
static void e_canvas_vbox_init (ECanvasVbox *CanvasVbox);
static void e_canvas_vbox_class_init (ECanvasVboxClass *klass);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 8be100fb4a..d7c2832e9b 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -21,12 +21,13 @@
* 02111-1307, USA.
*/
-#include <gtk/gtksignal.h>
-#include "e-canvas.h"
+#include <config.h>
+
+#include <gtk/gtk.h>
+
#include "gal/util/e-util.h"
-#include <X11/Xlib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkimmulticontext.h>
+
+#include "e-canvas.h"
static void e_canvas_init (ECanvas *card);
static void e_canvas_dispose (GObject *object);
@@ -1061,10 +1062,10 @@ e_canvas_item_grab (ECanvas *canvas,
gpointer cancelled_data)
{
if (gtk_grab_get_current ()) {
- return AlreadyGrabbed;
+ return GDK_GRAB_ALREADY_GRABBED;
} else {
int ret_val = gnome_canvas_item_grab (item, event_mask, cursor, etime);
- if (ret_val == GrabSuccess) {
+ if (ret_val == GDK_GRAB_SUCCESS) {
canvas->grab_cancelled_cb = cancelled_cb;
canvas->grab_cancelled_check_id =
g_timeout_add_full (G_PRIORITY_LOW,
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
index 3f16437bee..3db1aac633 100644
--- a/widgets/misc/e-colors.c
+++ b/widgets/misc/e-colors.c
@@ -26,7 +26,9 @@
*/
#include <config.h>
-#include <gtk/gtkwidget.h>
+
+#include <gtk/gtk.h>
+
#include "e-colors.h"
GdkColor e_white, e_dark_gray, e_black;
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index 3b44ab809e..25a37b8b6e 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -23,15 +23,16 @@
#include <config.h>
-#include "e-cursors.h"
+#include <stdio.h>
#include "e-colors.h"
+#include "e-cursors.h"
+
#include "pixmaps/cursor_cross.xpm"
#include "pixmaps/cursor_zoom_in.xpm"
#include "pixmaps/cursor_zoom_out.xpm"
#include "pixmaps/cursor_hand_open.xpm"
#include "pixmaps/cursor_hand_closed.xpm"
-#include <stdio.h>
#define GDK_INTERNAL_CURSOR -1
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index 886fb3d7ca..af6fa31083 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -21,18 +21,14 @@
* 02111-1307, USA.
*/
-
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-#include "e-gui-utils.h"
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
+#include "e-gui-utils.h"
+
void
e_auto_kill_popup_menu_on_selection_done (GtkMenu *menu)
{
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 8607cd1b01..86e2e20021 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -24,21 +24,15 @@
*/
#include <config.h>
+
+#include <libintl.h>
#include <string.h>
-#include <gtk/gtkimage.h>
+
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtk.h>
-#include "e-popup-menu.h"
#include "e-gui-utils.h"
-
-#include <gal/util/e-i18n.h>
+#include "e-popup-menu.h"
/*
* Creates an item with an optional icon
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 534f153823..d4f2da36c9 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -22,8 +22,11 @@
*/
#include <config.h>
-#include <gtk/gtksignal.h>
+
+#include <gtk/gtk.h>
+
#include "gal/util/e-util.h"
+
#include "e-printable.h"
#define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 33a5498df5..340cd04736 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -22,9 +22,11 @@
*/
#include <config.h>
-#include "e-reflow-model.h"
+
#include "gal/util/e-util.h"
+#include "e-reflow-model.h"
+
#define PARENT_TYPE G_TYPE_OBJECT
#define d(x)
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 4c48505c38..afbc3ca781 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -23,20 +23,21 @@
#include <config.h>
-#include "e-reflow.h"
-
#include <math.h>
+#include <string.h>
+
#include <gdk/gdkkeysyms.h>
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
+#include <gtk/gtk.h>
+
#include "gal/e-text/e-text.h"
-#include "gal/util/e-util.h"
#include "gal/util/e-i18n.h"
+#include "gal/util/e-util.h"
#include "gal/widgets/e-unicode.h"
-#include <gtk/gtksignal.h>
-#include "e-selection-model-simple.h"
-#include <string.h>
+#include "e-canvas.h"
+#include "e-canvas-utils.h"
+#include "e-reflow.h"
+#include "e-selection-model-simple.h"
static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event);
static void e_reflow_realize (GnomeCanvasItem *item);
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index e6e96702a3..782dd30d69 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -22,11 +22,14 @@
*/
#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-selection-model-array.h"
+
+#include <gtk/gtk.h>
+
#include "gal/util/e-i18n.h"
#include "gal/util/e-util.h"
+#include "e-selection-model-array.h"
+
#define PARENT_TYPE e_selection_model_get_type ()
static ESelectionModelClass *parent_class;
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index 51a0d86623..ea03b74b75 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -22,7 +22,9 @@
*/
#include <config.h>
-#include <gal/util/e-util.h>
+
+#include "gal/util/e-util.h"
+
#include "e-selection-model-array.h"
#include "e-selection-model-simple.h"
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 7694b90432..8ab880f848 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -22,11 +22,14 @@
*/
#include <config.h>
+
#include <gdk/gdkkeysyms.h>
-#include "e-selection-model.h"
+
#include "gal/util/e-i18n.h"
#include "gal/util/e-util.h"
+#include "e-selection-model.h"
+
#define PARENT_TYPE G_TYPE_OBJECT
static GObjectClass *e_selection_model_parent_class;
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index d7bd33caa7..1d41c28e25 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -27,24 +27,23 @@
#include <config.h>
-#include "e-unicode.h"
-
-#include "gal/util/e-i18n.h"
-#include <ctype.h>
+#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <ctype.h>
#include <iconv.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
#include <libxml/xmlmemory.h>
-#include <stdlib.h>
+
+#include "gal/util/e-i18n.h"
#include "gal/util/e-iconv.h"
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
+#include "e-unicode.h"
#define d(x) x
diff --git a/widgets/misc/gal-combo-box.c b/widgets/misc/gal-combo-box.c
index ad941a7133..c27ead20bf 100644
--- a/widgets/misc/gal-combo-box.c
+++ b/widgets/misc/gal-combo-box.c
@@ -25,20 +25,14 @@
*/
#include <config.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktearoffmenuitem.h>
+
#include <gdk/gdkkeysyms.h>
-#include "gal-combo-box.h"
+#include <gtk/gtk.h>
+
#include "gal/util/e-util.h"
+#include "gal-combo-box.h"
+
#define PARENT_TYPE GTK_TYPE_HBOX
static GObjectClass *gal_combo_box_parent_class;
diff --git a/widgets/misc/gal-combo-text.c b/widgets/misc/gal-combo-text.c
index ba3b4ad7c5..41d61145b6 100644
--- a/widgets/misc/gal-combo-text.c
+++ b/widgets/misc/gal-combo-text.c
@@ -21,12 +21,13 @@
*/
#include <config.h>
+
#include <ctype.h>
-#include <gal/util/e-util.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtkscrolledwindow.h>
+
+#include <gtk/gtk.h>
+
+#include "gal/util/e-util.h"
+
#include "gal-combo-text.h"
#define PARENT_TYPE GAL_COMBO_BOX_TYPE
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 364e0644de..9bb6fe1cf2 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -21,11 +21,15 @@
*/
#include <config.h>
-#include <gal/util/e-i18n.h>
+
#include <gnome.h>
-#include "widget-color-combo.h"
+
+#include "gal/util/e-i18n.h"
+
#include "color-palette.h"
#include "e-colors.h"
+#include "widget-color-combo.h"
+
#include "pixmaps/cursor_hand_open.xpm"
/* To compile (from src/widgets):
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 13:24:56 +0800