equal
deleted
inserted
replaced
3245 } |
3245 } |
3246 } |
3246 } |
3247 #endif |
3247 #endif |
3248 |
3248 |
3249 // Now look up our extensions |
3249 // Now look up our extensions |
3250 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3250 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3251 --- a/widget/src/gtk2/Makefile.in |
3251 --- a/widget/gtk2/Makefile.in |
3252 +++ b/widget/src/gtk2/Makefile.in |
3252 +++ b/widget/gtk2/Makefile.in |
3253 @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX |
3253 @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX |
3254 |
3254 |
3255 INCLUDES += \ |
3255 INCLUDES += \ |
3256 -I$(srcdir)/../xpwidgets \ |
3256 -I$(srcdir)/../xpwidgets \ |
3257 -I$(srcdir)/../shared \ |
3257 -I$(srcdir)/../shared \ |
3263 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3263 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3264 + |
3264 + |
3265 ifdef MOZ_X11 |
3265 ifdef MOZ_X11 |
3266 INCLUDES += -I$(srcdir)/../shared/x11 |
3266 INCLUDES += -I$(srcdir)/../shared/x11 |
3267 endif |
3267 endif |
3268 diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp |
3268 diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp |
3269 --- a/widget/src/gtk2/nsFilePicker.cpp |
3269 --- a/widget/gtk2/nsFilePicker.cpp |
3270 +++ b/widget/src/gtk2/nsFilePicker.cpp |
3270 +++ b/widget/gtk2/nsFilePicker.cpp |
3271 @@ -33,16 +33,17 @@ |
3271 @@ -33,16 +33,17 @@ |
3272 * the provisions above, a recipient may use your version of this file under |
3272 * the provisions above, a recipient may use your version of this file under |
3273 * the terms of any one of the MPL, the GPL or the LGPL. |
3273 * the terms of any one of the MPL, the GPL or the LGPL. |
3274 * |
3274 * |
3275 * ***** END LICENSE BLOCK ***** */ |
3275 * ***** END LICENSE BLOCK ***** */ |
3578 + { |
3578 + { |
3579 + *aReturn = nsIFilePicker::returnCancel; |
3579 + *aReturn = nsIFilePicker::returnCancel; |
3580 + } |
3580 + } |
3581 + return NS_OK; |
3581 + return NS_OK; |
3582 + } |
3582 + } |
3583 diff --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h |
3583 diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h |
3584 --- a/widget/src/gtk2/nsFilePicker.h |
3584 --- a/widget/gtk2/nsFilePicker.h |
3585 +++ b/widget/src/gtk2/nsFilePicker.h |
3585 +++ b/widget/gtk2/nsFilePicker.h |
3586 @@ -89,11 +89,17 @@ protected: |
3586 @@ -89,11 +89,17 @@ protected: |
3587 nsString mDefault; |
3587 nsString mDefault; |
3588 nsString mDefaultExtension; |
3588 nsString mDefaultExtension; |
3589 |
3589 |
3590 nsTArray<nsCString> mFilters; |
3590 nsTArray<nsCString> mFilters; |