diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2002-12-31 21:52:44 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2002-12-31 21:52:44 +0800 |
| commit | 6afec98b2cc4c33cd4128d045035a0ec7d43629c (patch) | |
| tree | fbca72a16cc232b59b16adbe365f29f8bba1b010 /embed/mozilla/FilePicker.h | |
| parent | beec33b028bdeb5f0da6ed51305f32e3b8041f6e (diff) | |
| download | gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.tar gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.tar.gz gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.tar.bz2 gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.tar.lz gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.tar.xz gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.tar.zst gsoc2013-epiphany-6afec98b2cc4c33cd4128d045035a0ec7d43629c.zip | |
Resync with galeon.
2002-12-31 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/FilePicker.h:
* embed/mozilla/mozilla-embed-shell.cpp:
Resync with galeon.
* data/epiphany.schemas.in:
* lib/ephy-bonobo-extensions.c: (ephy_bonobo_add_numbered_widget):
* lib/ephy-bonobo-extensions.h:
* lib/toolbar/Makefile.am:
* lib/toolbar/ephy-tbi-std-toolitem.c:
(ephy_tbi_std_toolitem_init),
(ephy_tbi_std_toolitem_get_icon_impl),
(ephy_tbi_std_toolitem_get_name_human_impl),
(ephy_tbi_std_toolitem_to_string_impl),
(ephy_tbi_std_toolitem_add_to_bonobo_tb_impl),
(ephy_tbi_std_toolitem_parse_properties_impl),
(ephy_tbi_std_toolitem_set_item):
* lib/toolbar/ephy-tbi-std-toolitem.h:
* lib/toolbar/ephy-toolbar-item-factory.c:
(ephy_tb_item_factory_init),
(ephy_toolbar_item_create_from_string),
(ephy_toolbar_item_register_type):
* lib/toolbar/ephy-toolbar-item-factory.h:
* src/Makefile.am:
* src/toolbar.c: (toolbar_class_init), (toolbar_set_property),
(toolbar_get_widgets), (toolbar_init), (toolbar_finalize),
(toolbar_navigation_button_set_sensitive),
(toolbar_button_set_sensitive):
* src/window-commands.c:
Resync with galeon. Now we use a widget for navigation
buttons.
Diffstat (limited to 'embed/mozilla/FilePicker.h')
| -rw-r--r-- | embed/mozilla/FilePicker.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/embed/mozilla/FilePicker.h b/embed/mozilla/FilePicker.h index 93c025637..7433b8b2d 100644 --- a/embed/mozilla/FilePicker.h +++ b/embed/mozilla/FilePicker.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef FILE_PICKER_H -#define FILE_PICKER_H +#ifndef __FilePicker_h +#define __FilePicker_h #include "nsIFilePicker.h" #include "nsError.h" @@ -47,21 +47,20 @@ extern nsresult NS_NewFilePickerFactory(nsIFactory** aFactory); /* Header file */ class GFilePicker : public nsIFilePicker { - friend void filePicker_save_content_cb(GtkToggleButton *aButton, - GFilePicker *aFilePicker); public: NS_DECL_ISUPPORTS NS_DECL_NSIFILEPICKER - enum { returnOK = nsIFilePicker::returnOK, + enum { returnOK = nsIFilePicker::returnOK, returnCancel = nsIFilePicker::returnCancel, returnReplace = nsIFilePicker::returnReplace, returnOKSaveContent = 256 }; - GFilePicker(PRBool aShowContentCheck = PR_FALSE, FileFormat *aFileFormats = NULL); + GFilePicker(PRBool aShowContentCheck = PR_FALSE, + FileFormat *aFileFormats = nsnull); virtual ~GFilePicker(); /* additional members */ - NS_METHOD InitWithGtkWidget(GtkWidget *aParentWidget, + NS_METHOD InitWithGtkWidget(GtkWidget *aParentWidget, const char *aTitle, PRInt16 aMode); NS_METHOD SanityCheck(PRBool *retIsSane); @@ -82,11 +81,11 @@ class GFilePicker : public nsIFilePicker PRInt16 mMode; PRBool mShowContentCheck; - PRBool mSaveContent; - GtkWidget *mParentWidget; + GtkWidget *mParentWidget; GtkWidget *mFileSelector; GtkWidget *mFormatChooser; + GtkWidget *mSaveContentCheck; FileFormat *mFileFormats; }; |