diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-10-11 03:24:33 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-10-11 03:24:33 +0800 |
| commit | 44592d8463a27f756746201136a97e2d47dcc4f8 (patch) | |
| tree | 05c53587966742bd4be74dc3217904ac026ff120 /embed/mozilla/FilePicker.cpp | |
| parent | 63c8906e7436c3910348a6549dfd8d6199772624 (diff) | |
| download | gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.tar gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.tar.gz gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.tar.bz2 gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.tar.lz gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.tar.xz gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.tar.zst gsoc2013-epiphany-44592d8463a27f756746201136a97e2d47dcc4f8.zip | |
Reenable deprecated api where necessary, fixup some header inclusions.
2003-10-10 Marco Pesenti Gritti <marco@gnome.org>
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/FilePicker.h:
* embed/mozilla/mozilla-embed-single.cpp:
* lib/Makefile.am:
* lib/ephy-dialog.c: (get_pref_type_from_widget),
(prefs_connect_signals), (load_props), (save_props):
* lib/ephy-gui.h:
* lib/widgets/Makefile.am:
* src/Makefile.am:
* src/bookmarks/Makefile.am:
* src/bookmarks/ephy-topic-action.c:
* src/ephy-history-window.c:
Reenable deprecated api where necessary, fixup some
header inclusions.
Remove unused color picker control in ephy-dialog.
Remove unused file types optionmenu in Filepicker.
Diffstat (limited to 'embed/mozilla/FilePicker.cpp')
| -rw-r--r-- | embed/mozilla/FilePicker.cpp | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 537a66d7b..42c17be06 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -79,8 +79,7 @@ /* Implementation file */ NS_IMPL_ISUPPORTS1(GFilePicker, nsIFilePicker) -GFilePicker::GFilePicker(FileFormat *aFileFormats) : - mFileFormats(aFileFormats) +GFilePicker::GFilePicker() { NS_INIT_ISUPPORTS(); @@ -247,33 +246,6 @@ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) gtk_window_set_transient_for(GTK_WINDOW(mFileSelector), GTK_WINDOW(mParentWidget)); - if (mFileFormats) - { - mFormatChooser = gtk_option_menu_new(); - GtkMenu *options = GTK_MENU(gtk_menu_new()); - - FileFormat *current = mFileFormats; - while (current->description != NULL) - { - /* FIXME: the label should include the extensions too */ - gchar *label = current->description; - GtkWidget *item = gtk_menu_item_new_with_label(label); - gtk_widget_show(item); - gtk_menu_shell_append(GTK_MENU_SHELL(options), item); - current++; - } - gtk_option_menu_set_menu(GTK_OPTION_MENU(mFormatChooser), - GTK_WIDGET(options)); - gtk_widget_show(mFormatChooser); - gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION (mFileSelector)->action_area), - mFormatChooser, - FALSE, TRUE, 0); - } - else - { - mFormatChooser = NULL; - } - if (mMode == nsIFilePicker::modeGetFolder) { gtk_widget_set_sensitive(GTK_FILE_SELECTION(mFileSelector) @@ -432,24 +404,6 @@ NS_METHOD GFilePicker::HandleFilePickerResult() mFile->GetNativeLeafName(mDefaultString); } - if (mFormatChooser) - { - GtkWidget *menu = gtk_option_menu_get_menu - (GTK_OPTION_MENU(mFormatChooser)); - GtkWidget *selected = gtk_menu_get_active (GTK_MENU(menu)); - - gint i(0); - for (GList *iterator = GTK_MENU_SHELL(menu)->children ; - iterator ; iterator = iterator->next, i++) - { - if (iterator->data == selected) - { - mSelectedFileFormat = i; - break; - } - } - } - return NS_OK; } |