3 files changed, 28 insertions, 6 deletions
diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c
index 5f7352b2be..80ac2c29c5 100644
--- a/ui/gtk/dlg_utils.c
+++ b/ui/gtk/dlg_utils.c
@@ -229,12 +229,12 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
     gtk_box_pack_end(GTK_BOX(hbox), button_hbox, TRUE, TRUE, 0);
     g_object_set_data(G_OBJECT(hbox), BUTTON_HBOX_KEY, button_hbox);
     gtk_widget_show(button_hbox);
-    gtk_box_set_spacing(GTK_BOX(button_hbox), 5);
+    gtk_box_set_spacing(GTK_BOX(button_hbox), DLG_BUTTON_SPACING);
 
     help_hbox = gtk_hbutton_box_new();
     gtk_box_pack_end(GTK_BOX(hbox), help_hbox, FALSE, FALSE, 0);
     gtk_widget_show(help_hbox);
-    gtk_box_set_spacing(GTK_BOX(help_hbox), 5);
+    gtk_box_set_spacing(GTK_BOX(help_hbox), DLG_BUTTON_SPACING);
 
     if (buttons == 0) {
         /* if no buttons wanted, simply do nothing */
diff --git a/ui/gtk/dlg_utils.h b/ui/gtk/dlg_utils.h
index 78e538895d..720501d1f6 100644
--- a/ui/gtk/dlg_utils.h
+++ b/ui/gtk/dlg_utils.h
@@ -69,6 +69,28 @@
 #ifndef __DLG_UTILS_H__
 #define __DLG_UTILS_H__
 
+#if defined(_WIN32)
+/*
+ * We should calculate these values dynamically using MapDialogRect().
+ * Unfortunately that requires passing a valid dialog HWND, which we
+ * don't have in many cases.
+ * http://msdn.microsoft.com/en-us/library/windows/desktop/aa511279.aspx#sizingspacing
+ */
+
+#define DLG_OUTER_MARGIN 11
+#define DLG_BUTTON_SPACING 7
+#define DLG_UNRELATED_SPACING 11
+
+/* elif defined (__APPLE__) */
+#else /* Use the GNOME HIG */
+
+/* http://developer.gnome.org/hig-book/3.2/design-window.html.en */
+
+#define DLG_OUTER_MARGIN 12
+#define DLG_BUTTON_SPACING 6
+#define DLG_UNRELATED_SPACING 12
+
+#endif
 
 /** Create a dialog box window that belongs to Wireshark's main window.
  * If you want to create a window, use window_new() instead.
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index 65823707be..2fd7a1cc56 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -128,9 +128,9 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
   edit_or_add_pkt_comment_dlg = dlg_window_new ("Edit or Add Packet Comments");
   gtk_widget_set_size_request (edit_or_add_pkt_comment_dlg, 500, 160);
   gtk_window_set_resizable (GTK_WINDOW (edit_or_add_pkt_comment_dlg), TRUE);
-  gtk_container_set_border_width (GTK_CONTAINER (edit_or_add_pkt_comment_dlg), 0);
+  gtk_container_set_border_width (GTK_CONTAINER (edit_or_add_pkt_comment_dlg), DLG_OUTER_MARGIN);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_vbox_new (FALSE, DLG_UNRELATED_SPACING);
   gtk_container_add (GTK_CONTAINER (edit_or_add_pkt_comment_dlg), vbox);
   gtk_widget_show (vbox);
 
@@ -205,12 +205,12 @@ edit_capture_dlg_launch (void)
   edit_or_add_capture_comment_dlg = dlg_window_new ("Edit or Add Capture Comments");
   gtk_widget_set_size_request (edit_or_add_capture_comment_dlg, 500, 160);
   gtk_window_set_resizable (GTK_WINDOW (edit_or_add_capture_comment_dlg), TRUE);
-  gtk_container_set_border_width (GTK_CONTAINER (edit_or_add_capture_comment_dlg), 0);
+  gtk_container_set_border_width (GTK_CONTAINER (edit_or_add_capture_comment_dlg), DLG_OUTER_MARGIN);
 
   g_signal_connect(edit_or_add_capture_comment_dlg, "destroy",
                    G_CALLBACK(edit_capture_comment_destroy_cb), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_vbox_new (FALSE, DLG_UNRELATED_SPACING);
   gtk_container_add (GTK_CONTAINER (edit_or_add_capture_comment_dlg), vbox);
   gtk_widget_show (vbox);