From 5cd9a601e10b617163bcfccdcb1e497b4a427592 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 2 Oct 2008 14:57:39 +0200 Subject: [PATCH 1/3] change button label to be more explicit --- src/contrib/gtk-config-store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contrib/gtk-config-store.cc b/src/contrib/gtk-config-store.cc index 772d764dc..47aaad555 100644 --- a/src/contrib/gtk-config-store.cc +++ b/src/contrib/gtk-config-store.cc @@ -518,7 +518,7 @@ GtkConfigStore::Configure (void) GtkWidget *load = gtk_button_new_with_label ("Load"); g_signal_connect (load, "clicked", (GCallback) load_clicked, window); gtk_box_pack_end (GTK_BOX (hbox), load, FALSE, FALSE, 0); - GtkWidget *exit = gtk_button_new_with_label ("Exit"); + GtkWidget *exit = gtk_button_new_with_label ("Run Simulation"); g_signal_connect (exit, "clicked", (GCallback) exit_clicked_callback, 0); gtk_box_pack_end (GTK_BOX (hbox), exit, FALSE, FALSE, 0); From 35c25f995ecf9a2066a9d48aeeee03af011799ed Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 2 Oct 2008 15:04:28 +0200 Subject: [PATCH 2/3] hide window when starting simulation. --- src/contrib/gtk-config-store.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/contrib/gtk-config-store.cc b/src/contrib/gtk-config-store.cc index 47aaad555..996e08f88 100644 --- a/src/contrib/gtk-config-store.cc +++ b/src/contrib/gtk-config-store.cc @@ -452,6 +452,7 @@ exit_clicked_callback (GtkButton *button, gpointer user_data) { gtk_main_quit (); + gtk_widget_hide (GTK_WIDGET (user_data)); } static gboolean @@ -460,6 +461,7 @@ delete_event_callback (GtkWidget *widget, gpointer user_data) { gtk_main_quit (); + gtk_widget_hide (GTK_WIDGET (user_data)); return TRUE; } @@ -494,9 +496,9 @@ GtkConfigStore::Configure (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "ns-3 Object attributes."); - gtk_window_set_default_size (GTK_WINDOW (window), 400, 600); + gtk_window_set_default_size (GTK_WINDOW (window), 600, 600); - g_signal_connect (window, "delete_event", (GCallback)delete_event_callback, 0); + g_signal_connect (window, "delete_event", (GCallback)delete_event_callback, window); GtkTreeStore *model = gtk_tree_store_new (COL_LAST, G_TYPE_POINTER); @@ -519,7 +521,7 @@ GtkConfigStore::Configure (void) g_signal_connect (load, "clicked", (GCallback) load_clicked, window); gtk_box_pack_end (GTK_BOX (hbox), load, FALSE, FALSE, 0); GtkWidget *exit = gtk_button_new_with_label ("Run Simulation"); - g_signal_connect (exit, "clicked", (GCallback) exit_clicked_callback, 0); + g_signal_connect (exit, "clicked", (GCallback) exit_clicked_callback, window); gtk_box_pack_end (GTK_BOX (hbox), exit, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER (window), vbox); From 2160b3123738f5883315751eb4e33357ff2f77db Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 2 Oct 2008 17:05:16 +0200 Subject: [PATCH 3/3] add private operator = to disable it --- src/devices/wifi/adhoc-wifi-mac.h | 1 + src/devices/wifi/nqap-wifi-mac.h | 1 + src/devices/wifi/nqsta-wifi-mac.h | 1 + 3 files changed, 3 insertions(+) diff --git a/src/devices/wifi/adhoc-wifi-mac.h b/src/devices/wifi/adhoc-wifi-mac.h index 7535ca2b0..5805ae709 100644 --- a/src/devices/wifi/adhoc-wifi-mac.h +++ b/src/devices/wifi/adhoc-wifi-mac.h @@ -85,6 +85,7 @@ private: /* invoked by the MacLows. */ void ForwardUp (Ptr packet, WifiMacHeader const*hdr); AdhocWifiMac (const AdhocWifiMac & ctor_arg); + AdhocWifiMac &operator = (const AdhocWifiMac &o); Mac48Address GetBssid (void) const; Ptr m_dca; diff --git a/src/devices/wifi/nqap-wifi-mac.h b/src/devices/wifi/nqap-wifi-mac.h index 48b9a2e7d..5b1948255 100644 --- a/src/devices/wifi/nqap-wifi-mac.h +++ b/src/devices/wifi/nqap-wifi-mac.h @@ -112,6 +112,7 @@ private: bool GetBeaconGeneration (void) const; virtual void DoDispose (void); NqapWifiMac (const NqapWifiMac & ctor_arg); + NqapWifiMac &operator = (const NqapWifiMac &o); Ptr m_dca; Ptr m_beaconDca; diff --git a/src/devices/wifi/nqsta-wifi-mac.h b/src/devices/wifi/nqsta-wifi-mac.h index 4ca01e84f..16e2064c4 100644 --- a/src/devices/wifi/nqsta-wifi-mac.h +++ b/src/devices/wifi/nqsta-wifi-mac.h @@ -129,6 +129,7 @@ private: Mac48Address GetBssid (void) const; virtual void DoDispose (void); NqstaWifiMac (const NqstaWifiMac & ctor_arg); + NqstaWifiMac &operator = (const NqstaWifiMac & ctor_arg); enum { ASSOCIATED,