From 21c068f1916330e90f814bed461fe0821d1665ec Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 9 Oct 2011 16:36:37 +0000
Subject: checked in pd-0.43-0.src.tar.gz

svn path=/trunk/; revision=15557
---
 pd/tcl/dialog_gatom.tcl | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'pd/tcl/dialog_gatom.tcl')

diff --git a/pd/tcl/dialog_gatom.tcl b/pd/tcl/dialog_gatom.tcl
index b59751bf..200a631e 100644
--- a/pd/tcl/dialog_gatom.tcl
+++ b/pd/tcl/dialog_gatom.tcl
@@ -44,8 +44,8 @@ proc ::dialog_gatom::apply {mytoplevel} {
                  [$mytoplevel.limits.upper.entry get] \
                  [::dialog_gatom::escape [$mytoplevel.gatomlabel.name.entry get]] \
                  $gatomlabel_radio($mytoplevel) \
-                 [::dialog_gatom::escape [$mytoplevel.s_r.send.entry get]] \
-                 [::dialog_gatom::escape [$mytoplevel.s_r.receive.entry get]]"
+                 [::dialog_gatom::escape [$mytoplevel.s_r.receive.entry get]] \
+                 [::dialog_gatom::escape [$mytoplevel.s_r.send.entry get]]"
 }
 
 proc ::dialog_gatom::cancel {mytoplevel} {
@@ -60,7 +60,7 @@ proc ::dialog_gatom::ok {mytoplevel} {
 # set up the panel with the info from pd
 proc ::dialog_gatom::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \
                                      initgatomlabel_radio \
-                                     initgatomlabel initsend initreceive} {
+                                     initgatomlabel initreceive initsend} {
     global gatomlabel_radio
     set gatomlabel_radio($mytoplevel) $initgatomlabel_radio
 
@@ -91,7 +91,11 @@ proc ::dialog_gatom::create_dialog {mytoplevel} {
 
     toplevel $mytoplevel -class DialogWindow
     wm title $mytoplevel [_ "Atom Box Properties"]
-    if {$::windowingsystem eq "aqua"} {$mytoplevel configure -menu .menubar}
+    wm group $mytoplevel .
+    wm resizable $mytoplevel 0 0
+    wm transient $mytoplevel $::focused_window
+    $mytoplevel configure -menu $::dialog_menubar
+    $mytoplevel configure -padx 0 -pady 0
     ::pd_bindings::dialog_bindings $mytoplevel "gatom"
 
     frame $mytoplevel.width -height 7
@@ -149,16 +153,18 @@ proc ::dialog_gatom::create_dialog {mytoplevel} {
     pack $mytoplevel.s_r.receive.entry $mytoplevel.s_r.receive.label -side right
     
     frame $mytoplevel.buttonframe -pady 5
-    pack $mytoplevel.buttonframe -side top -fill x -pady 2m
+    pack $mytoplevel.buttonframe -side top -fill x -expand 1 -pady 2m
     button $mytoplevel.buttonframe.cancel -text [_ "Cancel"] \
         -command "::dialog_gatom::cancel $mytoplevel"
-    pack $mytoplevel.buttonframe.cancel -side left -expand 1
-    button $mytoplevel.buttonframe.apply -text [_ "Apply"] \
-        -command "::dialog_gatom::apply $mytoplevel"
-    pack $mytoplevel.buttonframe.apply -side left -expand 1
+    pack $mytoplevel.buttonframe.cancel -side left -expand 1 -fill x -padx 10
+    if {$::windowingsystem ne "aqua"} {
+        button $mytoplevel.buttonframe.apply -text [_ "Apply"] \
+            -command "::dialog_gatom::apply $mytoplevel"
+    pack $mytoplevel.buttonframe.apply -side left -expand 1 -fill x -padx 10
+    }
     button $mytoplevel.buttonframe.ok -text [_ "OK"] \
         -command "::dialog_gatom::ok $mytoplevel"
-    pack $mytoplevel.buttonframe.ok -side left -expand 1
+    pack $mytoplevel.buttonframe.ok -side left -expand 1 -fill x -padx 10
 
     $mytoplevel.width.entry select from 0
     $mytoplevel.width.entry select adjust end
-- 
cgit v1.2.1