F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2008-10-02 17:16:04 +01:00
parent 03e1a6bae5 2160b31237
commit 3997faf477
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/contrib/gtk-config-store.cc
View File

@@ -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);
@@ -518,8 +520,8 @@ 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");
g_signal_connect (exit, "clicked", (GCallback) exit_clicked_callback, 0);
GtkWidget *exit = gtk_button_new_with_label ("Run Simulation");
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);

1
src/devices/wifi/adhoc-wifi-mac.h
View File

@@ -85,6 +85,7 @@ private:
/* invoked by the MacLows. */
void ForwardUp (Ptr<Packet> packet, WifiMacHeader const*hdr);
AdhocWifiMac (const AdhocWifiMac & ctor_arg);
AdhocWifiMac &operator = (const AdhocWifiMac &o);
Mac48Address GetBssid (void) const;
Ptr<DcaTxop> m_dca;

1
src/devices/wifi/nqap-wifi-mac.h
View File

@@ -112,6 +112,7 @@ private:
bool GetBeaconGeneration (void) const;
virtual void DoDispose (void);
NqapWifiMac (const NqapWifiMac & ctor_arg);
NqapWifiMac &operator = (const NqapWifiMac &o);
Ptr<DcaTxop> m_dca;
Ptr<DcaTxop> m_beaconDca;

1
src/devices/wifi/nqsta-wifi-mac.h
View File

@@ -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,