Changeset 3384 for trunk/jons-gtk2-gui

Timestamp:

03/20/03 01:44:35 (6 years ago)

Author:

bostjanlah

Message:

Use buttonbox for buttons
Use gtk_window_present instead of gdk_window_raise

Files:

• trunk/jons-gtk2-gui/src/convo.cpp (modified) (4 diffs)

trunk/jons-gtk2-gui/src/convo.cpp

@@ -72 +72 @@
 
     if(c != 0)
-        gdk_window_raise(c->window->window);
+        gtk_window_present(GTK_WINDOW(c->window));
     else
     {
@@ -192 +192 @@
     /* Send the message urgently */
     c->send_urgent = gtk_check_button_new_with_mnemonic("U_rgent");
-    gtk_box_pack_start(GTK_BOX(options_box), c->send_urgent, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(options_box), c->send_urgent, FALSE, FALSE, 5);
 
     /* Send the message to contact list */
@@ -208 +208 @@
     
     /* Make new buttons with labels */
+  GtkWidget *hbbox = hbutton_box_new();
     c->send = gtk_button_new_with_mnemonic("_Send");
     c->close_or_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+  gtk_container_add(GTK_CONTAINER(hbbox), c->send);
+  gtk_container_add(GTK_CONTAINER(hbbox), c->close_or_cancel);
 
     /* Get the signals connected for the buttons */
@@ -218 +221 @@
     
     gtk_box_pack_start(GTK_BOX(button_box), c->etag->statusbar, TRUE, TRUE, 5);
-    GtkWidget *bbox = gtk_hbox_new(TRUE, 0);
-    gtk_box_pack_start(GTK_BOX(bbox), c->close_or_cancel, TRUE, TRUE, 5);
-    gtk_box_pack_start(GTK_BOX(bbox), c->send, TRUE, TRUE, 5);
-    gtk_box_pack_end(GTK_BOX(button_box), bbox, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(button_box), hbbox, FALSE, FALSE, 0);
 
     /* Take care of the rest of the widgets */