1.1 --- a/src/contrib/gtk-config-store.cc	Thu Oct 02 17:15:09 2008 +0100
     1.2 +++ b/src/contrib/gtk-config-store.cc	Thu Oct 02 17:16:04 2008 +0100
     1.3 @@ -452,6 +452,7 @@
     1.4  		       gpointer   user_data)
     1.5  {
     1.6    gtk_main_quit ();
     1.7 +  gtk_widget_hide (GTK_WIDGET (user_data));
     1.8  }
     1.9  
    1.10  static gboolean
    1.11 @@ -460,6 +461,7 @@
    1.12  		       gpointer   user_data)
    1.13  {
    1.14    gtk_main_quit ();
    1.15 +  gtk_widget_hide (GTK_WIDGET (user_data));
    1.16    return TRUE;
    1.17  }
    1.18  
    1.19 @@ -494,9 +496,9 @@
    1.20  
    1.21    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
    1.22    gtk_window_set_title (GTK_WINDOW (window), "ns-3 Object attributes.");
    1.23 -  gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
    1.24 +  gtk_window_set_default_size (GTK_WINDOW (window), 600, 600);
    1.25    
    1.26 -  g_signal_connect (window, "delete_event", (GCallback)delete_event_callback, 0);
    1.27 +  g_signal_connect (window, "delete_event", (GCallback)delete_event_callback, window);
    1.28  
    1.29  
    1.30    GtkTreeStore *model = gtk_tree_store_new (COL_LAST, G_TYPE_POINTER);
    1.31 @@ -518,8 +520,8 @@
    1.32    GtkWidget *load = gtk_button_new_with_label ("Load");
    1.33    g_signal_connect (load, "clicked",  (GCallback) load_clicked, window);
    1.34    gtk_box_pack_end (GTK_BOX (hbox), load, FALSE, FALSE, 0);
    1.35 -  GtkWidget *exit = gtk_button_new_with_label ("Exit");
    1.36 -  g_signal_connect (exit, "clicked",  (GCallback) exit_clicked_callback, 0);
    1.37 +  GtkWidget *exit = gtk_button_new_with_label ("Run Simulation");
    1.38 +  g_signal_connect (exit, "clicked",  (GCallback) exit_clicked_callback, window);
    1.39    gtk_box_pack_end (GTK_BOX (hbox), exit, FALSE, FALSE, 0);
    1.40  
    1.41    gtk_container_add (GTK_CONTAINER (window), vbox);

     2.1 --- a/src/devices/wifi/adhoc-wifi-mac.h	Thu Oct 02 17:15:09 2008 +0100
     2.2 +++ b/src/devices/wifi/adhoc-wifi-mac.h	Thu Oct 02 17:16:04 2008 +0100
     2.3 @@ -85,6 +85,7 @@
     2.4    /* invoked by the MacLows. */
     2.5    void ForwardUp (Ptr<Packet> packet, WifiMacHeader const*hdr);
     2.6    AdhocWifiMac (const AdhocWifiMac & ctor_arg);
     2.7 +  AdhocWifiMac &operator = (const AdhocWifiMac &o);
     2.8    Mac48Address GetBssid (void) const;
     2.9  
    2.10    Ptr<DcaTxop> m_dca;

     3.1 --- a/src/devices/wifi/nqap-wifi-mac.h	Thu Oct 02 17:15:09 2008 +0100
     3.2 +++ b/src/devices/wifi/nqap-wifi-mac.h	Thu Oct 02 17:16:04 2008 +0100
     3.3 @@ -112,6 +112,7 @@
     3.4    bool GetBeaconGeneration (void) const;
     3.5    virtual void DoDispose (void);
     3.6    NqapWifiMac (const NqapWifiMac & ctor_arg);
     3.7 +  NqapWifiMac &operator = (const NqapWifiMac &o);
     3.8  
     3.9    Ptr<DcaTxop> m_dca;
    3.10    Ptr<DcaTxop> m_beaconDca;

     4.1 --- a/src/devices/wifi/nqsta-wifi-mac.h	Thu Oct 02 17:15:09 2008 +0100
     4.2 +++ b/src/devices/wifi/nqsta-wifi-mac.h	Thu Oct 02 17:16:04 2008 +0100
     4.3 @@ -129,6 +129,7 @@
     4.4    Mac48Address GetBssid (void) const;
     4.5    virtual void DoDispose (void);
     4.6    NqstaWifiMac (const NqstaWifiMac & ctor_arg);
     4.7 +  NqstaWifiMac &operator = (const NqstaWifiMac & ctor_arg);
     4.8  
     4.9    enum {
    4.10      ASSOCIATED,