custom color chooser; misc patches

[xournal.git] / src / xo-callbacks.h

diff --git a/src/xo-callbacks.h b/src/xo-callbacks.h
index 0b67562c6b89cdb8b174aced1735f1d6882fb1cc..c371ddd88143af14d712ac2474967054b31659f3 100644 (file)
--- a/src/xo-callbacks.h
+++ b/src/xo-callbacks.h
@@ -403,6 +403,11 @@ on_canvas_enter_notify_event           (GtkWidget       *widget,
                                         GdkEventCrossing *event,
                                         gpointer         user_data);
 
+gboolean
+on_canvas_leave_notify_event           (GtkWidget       *widget,
+                                        GdkEventCrossing *event,
+                                        gpointer         user_data);
+
 gboolean
 on_canvas_expose_event                 (GtkWidget       *widget,
                                         GdkEventExpose  *event,
@@ -471,15 +476,10 @@ void
 on_optionsButtonMappings_activate      (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
-void
-on_optionsAntialiasBG_activate         (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
 void
 on_optionsProgressiveBG_activate       (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
-
 void
 on_mru_activate                        (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
@@ -596,3 +596,39 @@ on_button3Hand_activate                (GtkMenuItem     *menuitem,
 void
 on_optionsPrintRuling_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
+
+void
+on_optionsDiscardCore_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_fontButton_font_set                 (GtkFontButton   *fontbutton,
+                                        gpointer         user_data);
+
+void
+on_optionsLeftHanded_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_optionsShortenMenus_activate        (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_optionsAutoSavePrefs_activate       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_toolsReco_activate                  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_optionsPressureSensitive_activate   (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_buttonColorChooser_set              (GtkColorButton  *colorbutton,
+                                        gpointer         user_data);
+
+void
+on_optionsButtonsSwitchMappings_activate(GtkMenuItem    *menuitem,
+                                        gpointer         user_data);