Changeset 2157 for trunk/jons-gtk-gui

Timestamp:

07/18/00 05:20:39 (8 years ago)

Author:

emojon

Message:

Go back to using gtk_main_quit()

Location:

trunk/jons-gtk-gui/src

Files:

• main_window.cpp (modified) (1 diff)
• menu.cpp (modified) (3 diffs)

trunk/jons-gtk-gui/src/main_window.cpp

@@ -29 +29 @@
 void main_window_delete_event(GtkWidget *mainwindow, gpointer data)
 {
-    icq_daemon->Shutdown();
+    gtk_main_quit();
 }
 

trunk/jons-gtk-gui/src/menu.cpp

@@ -26 +26 @@
 GtkWidget *user_list_menu;
 
-GtkWidget *menu_new_item(GtkWidget *_menu, const char *str, GtkSignalFunc s_func)
+GtkWidget *menu_new_item(GtkWidget *_menu, const char *str,
+    GtkSignalFunc s_func)
 {
     GtkWidget *menu_item;
@@ -49 +50 @@
     }
 
+    return menu_item;
+}
+
+GtkWidget * menu_new_item_with_pixmap(GtkWidget *_menu, const char *text,
+    GtkSignalFunc s_func, struct status_icon *icon)
+{
+    GtkWidget *h_box = gtk_hbox_new(false, 0);
+
+    GtkWidget *pixmap = gtk_pixmap_new(icon->pm, icon->bm);
+    GtkWidget *label = gtk_label_new(text);
+    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+
+    gtk_box_pack_start(GTK_BOX(h_box), pixmap, false, false, 3);
+    gtk_box_pack_start(GTK_BOX(h_box), label, true, true, 0);
+
+    GtkWidget *menu_item = gtk_menu_item_new();
+    gtk_container_add(GTK_CONTAINER(menu_item), h_box);
+
+    gtk_widget_show_all(menu_item);
+
+    gtk_menu_append(GTK_MENU(_menu), menu_item);
+
+    if(s_func)
+    {
+        gtk_signal_connect(GTK_OBJECT(menu_item), "activate",
+            s_func, NULL);
+    }
+    
     return menu_item;
 }
@@ -150 +179 @@
 void menu_system_quit(GtkWidget *blah, gpointer data)
 {
-    icq_daemon->Shutdown();
+    gtk_main_quit();
 }