aboutsummaryrefslogtreecommitdiff
path: root/pd/tcl/dialog_array.tcl
diff options
context:
space:
mode:
Diffstat (limited to 'pd/tcl/dialog_array.tcl')
-rw-r--r--pd/tcl/dialog_array.tcl21
1 files changed, 13 insertions, 8 deletions
diff --git a/pd/tcl/dialog_array.tcl b/pd/tcl/dialog_array.tcl
index 87b2de8c..0f2696d2 100644
--- a/pd/tcl/dialog_array.tcl
+++ b/pd/tcl/dialog_array.tcl
@@ -239,7 +239,6 @@ proc ::dialog_array::ok {mytoplevel} {
}
proc ::dialog_array::pdtk_array_dialog {mytoplevel name size flags newone} {
-puts "::dialog_array::pdtk_array_dialog {$mytoplevel $name $size $flags $newone}"
if {[winfo exists $mytoplevel]} {
wm deiconify $mytoplevel
raise $mytoplevel
@@ -262,7 +261,11 @@ puts "::dialog_array::pdtk_array_dialog {$mytoplevel $name $size $flags $newone}
proc ::dialog_array::create_dialog {mytoplevel newone} {
toplevel $mytoplevel -class DialogWindow
wm title $mytoplevel [_ "Array 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 "array"
frame $mytoplevel.name
@@ -315,14 +318,16 @@ proc ::dialog_array::create_dialog {mytoplevel newone} {
}
# end jsarlo
frame $mytoplevel.buttonframe
- pack $mytoplevel.buttonframe -side bottom -fill x -pady 2m
+ pack $mytoplevel.buttonframe -side bottom -expand 1 -fill x -pady 2m
button $mytoplevel.buttonframe.cancel -text [_ "Cancel"] \
-command "::dialog_array::cancel $mytoplevel"
- if {$newone == 0} {button $mytoplevel.buttonframe.apply -text [_ "Apply"] \
- -command "::dialog_array::apply $mytoplevel"}
+ pack $mytoplevel.buttonframe.cancel -side left -expand 1 -fill x -padx 10
+ if {$newone == 0 && $::windowingsystem ne "aqua"} {
+ button $mytoplevel.buttonframe.apply -text [_ "Apply"] \
+ -command "::dialog_array::apply $mytoplevel"
+ pack $mytoplevel.buttonframe.apply -side left -expand 1 -fill x -padx 10
+ }
button $mytoplevel.buttonframe.ok -text [_ "OK"]\
-command "::dialog_array::ok $mytoplevel"
- pack $mytoplevel.buttonframe.cancel -side left -expand 1
- if {$newone == 0} {pack $mytoplevel.buttonframe.apply -side left -expand 1}
- pack $mytoplevel.buttonframe.ok -side left -expand 1
+ pack $mytoplevel.buttonframe.ok -side left -expand 1 -fill x -padx 10
}