Merge branch 'master' into TheNormalnij/fix_parser

multitheftauto · Jun 16, 2024 · a1e94e8 · a1e94e8
2 parents 5fb153c + e3f9099
commit a1e94e8
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 120 deletions.
diff --git a/Client/cefweb/CWebView.cpp b/Client/cefweb/CWebView.cpp
@@ -996,8 +996,9 @@ bool CWebView::OnJSDialog(CefRefPtr<CefBrowser> browser, const CefString& origin
 // //
 //                                                                //
 ////////////////////////////////////////////////////////////////////
-bool CWebView::OnFileDialog(CefRefPtr<CefBrowser> browser, CefDialogHandler::FileDialogMode mode, const CefString& title, const CefString& default_file_path,
-                            const std::vector<CefString>& accept_filters, CefRefPtr<CefFileDialogCallback> callback)
+bool CWebView::OnFileDialog(CefRefPtr<CefBrowser> browser, FileDialogMode mode, const CefString& title, const CefString& default_file_path,
+        const std::vector<CefString>& accept_filters, const std::vector<CefString>& accept_extensions, const std::vector<CefString>& accept_descriptions,
+        CefRefPtr<CefFileDialogCallback> callback)
 {
     // Don't show the dialog
     return true;

diff --git a/Client/cefweb/CWebView.h b/Client/cefweb/CWebView.h
@@ -164,8 +164,9 @@ class CWebView : public CWebViewInterface,
                             bool& suppress_message) override;
 
     // CefDialogHandler methods
-    virtual bool OnFileDialog(CefRefPtr<CefBrowser> browser, CefDialogHandler::FileDialogMode mode, const CefString& title, const CefString& default_file_path,
-                              const std::vector<CefString>& accept_filters, CefRefPtr<CefFileDialogCallback> callback) override;
+    virtual bool OnFileDialog(CefRefPtr<CefBrowser> browser, FileDialogMode mode, const CefString& title, const CefString& default_file_path,
+        const std::vector<CefString>& accept_filters, const std::vector<CefString>& accept_extensions, const std::vector<CefString>& accept_descriptions,
+        CefRefPtr<CefFileDialogCallback> callback) override;
 
     // CefDisplayHandler methods
     virtual void OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title) override;