diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/FilePicker.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index cb3d98138..c9c7fa357 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -38,7 +38,7 @@ #include <nsString.h> #include <nsReadableUtils.h> -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 #include <nsIDOMWindowInternal.h> #endif @@ -80,7 +80,7 @@ GFilePicker::~GFilePicker() } /* void init (in nsIDOMWindow parent, in AString title, in short mode); */ -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode) #else NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PRInt16 mode) @@ -161,7 +161,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) if (filterMask & nsIFilePicker::filterAll) { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 AppendFilter (NS_ConvertUTF8toUCS2 (_("All files")).get(), NS_LITERAL_STRING ("*").get()); #else @@ -171,7 +171,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) } if (filterMask & nsIFilePicker::filterHTML) { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 AppendFilter (NS_ConvertUTF8toUCS2 (_("HTML files")).get(), NS_LITERAL_STRING ("*.html; *.htm; *.shtml; *.xhtml").get()); #else @@ -181,7 +181,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) } if (filterMask & nsIFilePicker::filterText) { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 AppendFilter (NS_ConvertUTF8toUCS2 (_("Text files")).get(), NS_LITERAL_STRING ("*.txt; *.text").get()); #else @@ -191,7 +191,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) } if (filterMask & nsIFilePicker::filterImages) { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 AppendFilter (NS_ConvertUTF8toUCS2 (_("Image files")).get(), NS_LITERAL_STRING ("*.png; *.gif; *.jpeg; *.jpg").get()); #else @@ -201,7 +201,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) } if (filterMask & nsIFilePicker::filterXML) { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 AppendFilter (NS_ConvertUTF8toUCS2 (_("XML files")).get(), NS_LITERAL_STRING ("*.xml").get()); #else @@ -211,7 +211,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) } if (filterMask & nsIFilePicker::filterXUL) { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 AppendFilter (NS_ConvertUTF8toUCS2 (_("XUL files")).get(), NS_LITERAL_STRING ("*.xul").get()); #else @@ -224,7 +224,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) } /* void appendFilter (in AString title, in AString filter); */ -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar *filter) #else NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString& filter) @@ -264,7 +264,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString& } /* attribute AString defaultString; */ -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString) #else NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString) @@ -279,7 +279,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString) { converted = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 *aDefaultString = ToNewUnicode (NS_ConvertUTF8toUTF16 (converted)); #else CopyUTF8toUTF16 (converted, aDefaultString); @@ -292,7 +292,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString) return NS_OK; } -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString) #else NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString) @@ -301,7 +301,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString) LOG ("GFilePicker::SetDefaultString to %s", NS_ConvertUCS2toUTF8 (aDefaultString).get()) -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 if (aDefaultString) #else if (aDefaultString.Length()) @@ -323,7 +323,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString) } /* attribute AString defaultExtension; */ -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension) #else NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension) @@ -334,7 +334,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension) return NS_ERROR_NOT_IMPLEMENTED; } -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension) #else NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension) |