diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-08-11 19:06:18 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-08-11 19:06:18 +0000 |
| commit | ca7082a04ac2305c354e1b2cdbe1468ba8749413 (patch) | |
| tree | 940fab03cb31813d0b7ce295a3e871b20e4310bf /gtk/gtkfilesel.c | |
| parent | b46f089b6f4c1f0dbcb490b22e982ddbcea3627d (diff) | |
| download | gtk+-ca7082a04ac2305c354e1b2cdbe1468ba8749413.tar.gz | |
Removed has_cursor, set the cursor beginning of Text when creating the
Tue Aug 11 15:04:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.[ch]: Removed has_cursor, set the cursor
beginning of Text when creating the Text widget.
* gtk/testgtk.c: Grab the focus on the text widget so
as to test out the above.
Tue Aug 11 14:55:00 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c: Reverted part of timj's change of Jul 16.
::changed is a notification signal and should have no default
handler. A complete redraw of the Text widget does _not_ need to
be done on every text insertion.
Tue Aug 11 13:07:29 1998 Owen Taylor <otaylor@redhat.com>
(gtk-abilleira-072198-patch)
* gtk/gtkwindow.[ch]:
Add gtk_window_set_modal() which sets a flag; when
set the window does a gtk_grab_add() when the window
is shown, and a gtk_grab_remove() when the window
is hidden.
* gtk/gtkfilesel.[ch]: Test if it is running in modal form and in
that case will run "Create Dir","Delete File" and "Rename File"
dialogs as modal too.
* gtk/testgtk.c: Added a button with an example of creating modal
dialog boxes. Including file selection and color selection standard
dialogs.
Tue Aug 11 00:44:47 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkhscrollbar.c gtk/gtkvscrollbar.c gtk/gtktoolbar.c:
Removed CAN_FOCUS by default from scrollbars, button
children of toolbar. (But not GDK_TOOLBAR_CHILD_WIDGET children)
(Scrollbar definitely good change, toolbar bit more questionable)
Diffstat (limited to 'gtk/gtkfilesel.c')
| -rw-r--r-- | gtk/gtkfilesel.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 9ee6ea9f7c..f8903fbea8 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -772,8 +772,12 @@ gtk_file_selection_create_dir (GtkWidget *widget, gpointer data) (gpointer) fs); gtk_window_set_title (GTK_WINDOW (dialog), "Create Directory"); gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); - gtk_widget_show (dialog); - + + /* If file dialog is grabbed, grab option dialog */ + /* When option dialog is closed, file dialog will be grabbed again */ + if (GTK_WINDOW(fs)->modal) + gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); + vbox = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(vbox), 8); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, @@ -811,6 +815,8 @@ gtk_file_selection_create_dir (GtkWidget *widget, gpointer data) GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_widget_grab_default(button); gtk_widget_show (button); + + gtk_widget_show (dialog); } static void @@ -871,6 +877,11 @@ gtk_file_selection_delete_file (GtkWidget *widget, gpointer data) (gpointer) fs); gtk_window_set_title (GTK_WINDOW (dialog), "Delete File"); gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); + + /* If file dialog is grabbed, grab option dialog */ + /* When option dialog is closed, file dialog will be grabbed again */ + if (GTK_WINDOW(fs)->modal) + gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); vbox = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(vbox), 8); @@ -906,6 +917,7 @@ gtk_file_selection_delete_file (GtkWidget *widget, gpointer data) gtk_widget_show (button); gtk_widget_show (dialog); + } static void @@ -969,7 +981,11 @@ gtk_file_selection_rename_file (GtkWidget *widget, gpointer data) (gpointer) fs); gtk_window_set_title (GTK_WINDOW (dialog), "Rename File"); gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); - gtk_widget_show (dialog); + + /* If file dialog is grabbed, grab option dialog */ + /* When option dialog closed, file dialog will be grabbed again */ + if (GTK_WINDOW(fs)->modal) + gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); vbox = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(vbox), 8); @@ -1014,6 +1030,8 @@ gtk_file_selection_rename_file (GtkWidget *widget, gpointer data) GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_widget_grab_default(button); gtk_widget_show (button); + + gtk_widget_show (dialog); } |