static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
{
- ui_psensor_quit();
+ ui_psensor_quit((struct ui_psensor *)data);
}
static void cb_preferences(GtkMenuItem *mi, gpointer data)
ui_pref_dialog_run((struct ui_psensor *)data);
}
+static void cb_about(GtkMenuItem *mi, gpointer data)
+{
+ ui_show_about_dialog();
+}
+
static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
{
struct ui_psensor *ui = data;
" <menuitem name='Preferences' action='PreferencesAction' />"
" <menuitem name='SensorPreferences' action='SensorPreferencesAction' />"
" <separator />"
+" <menuitem name='About' action='AboutAction' />"
+" <separator />"
" <menuitem name='Quit' action='QuitAction' />"
" </popup>"
"</ui>";
"Sensor Preferences", /* tooltip */
G_CALLBACK(cb_sensor_preferences) },
+ { "AboutAction", NULL,
+ "_About", NULL,
+ "About",
+ G_CALLBACK(cb_about) },
+
{ "QuitAction",
GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
};
}
-static int
+static int
on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
GtkWidget *menu;
w_graph = gtk_drawing_area_new();
- g_signal_connect(GTK_WIDGET(w_graph),
- "expose-event", G_CALLBACK(on_expose_event), ui);
+ if (GTK_MAJOR_VERSION == 2)
+ g_signal_connect(GTK_WIDGET(w_graph),
+ "expose-event",
+ G_CALLBACK(on_expose_event),
+ ui);
+ else
+ g_signal_connect(GTK_WIDGET(w_graph),
+ "draw",
+ G_CALLBACK(on_expose_event),
+ ui);
gtk_widget_add_events(w_graph, GDK_BUTTON_PRESS_MASK);