+5
-1283
lines changedFilter options
+5
-1283
lines changed Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ UNAME_S = $(shell uname -s)
12 12
CCFLAGS = -fPIC $(CEF_CCFLAGS)
13 13 14 14
ifeq ($(UNAME_S), Linux)
15 -
SRC_MORE = x11.cpp dialog_handler_gtk.cpp
15 +
SRC_MORE = x11.cpp
16 16
else ifeq ($(UNAME_S), Darwin)
17 17
SRC_MORE = util_mac.mm
18 18
endif
@@ -32,24 +32,13 @@ OBJ = $(filter %.o, $(SRC:.cpp=.o) $(SRC:.mm=.o))
32 32
OUT = libclient_handler.a
33 33 34 34
INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
35 -
-I/usr/include/gtk-2.0 \
36 -
-I/usr/include/gtk-unix-print-2.0 \
37 35
-I/usr/include/glib-2.0 \
38 36
-I/usr/include/cairo \
39 37
-I/usr/include/pango-1.0 \
40 -
-I/usr/include/gdk-pixbuf-2.0 \
41 38
-I/usr/include/atk-1.0 \
42 -
-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
43 -
-I/usr/lib/x86_64-linux-gnu/gtk-unix-print-2.0 \
44 39
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
45 -
-I/usr/lib/i386-linux-gnu/gtk-2.0/include \
46 -
-I/usr/lib/i386-linux-gnu/gtk-unix-print-2.0 \
47 40
-I/usr/lib/i386-linux-gnu/glib-2.0/include \
48 -
-I/usr/lib64/gtk-2.0/include \
49 -
-I/usr/lib64/gtk-unix-print-2.0 \
50 41
-I/usr/lib64/glib-2.0/include \
51 -
-I/usr/lib/gtk-2.0/include \
52 -
-I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \
53 42
-I/usr/lib/glib-2.0/include
54 43 55 44
@@ -7,10 +7,6 @@
7 7 8 8
DialogHandler::DialogHandler()
9 9
{
10 -
#if defined(OS_LINUX)
11 -
// Provide the GTK-based default dialog implementation on Linux.
12 -
dialog_handler_ = new ClientDialogHandlerGtk();
13 -
#endif
14 10
}
15 11 16 12
@@ -22,16 +18,6 @@ bool DialogHandler::OnFileDialog(CefRefPtr<CefBrowser> browser,
22 18
int selected_accept_filter,
23 19
CefRefPtr<CefFileDialogCallback> callback)
24 20
{
25 -
#if defined(OS_LINUX)
26 -
return dialog_handler_->OnFileDialog(browser,
27 -
mode,
28 -
title,
29 -
default_file_path,
30 -
accept_filters,
31 -
selected_accept_filter,
32 -
callback);
33 -
#else
34 21
return false;
35 -
#endif
36 22 37 23
}
Original file line number Diff line number Diff line change
@@ -7,10 +7,6 @@
7 7
#include "common/cefpython_public_api.h"
8 8
#include "include/cef_dialog_handler.h"
9 9 10 -
#if defined(OS_LINUX)
11 -
#include "dialog_handler_gtk.h"
12 -
#endif
13 - 14 10 15 11
class DialogHandler : public CefDialogHandler
16 12
{
@@ -28,10 +24,6 @@ class DialogHandler : public CefDialogHandler
28 24
override;
29 25 30 26
public:
31 -
#if defined(OS_LINUX)
32 -
// Default dialog handler impl for GTK.
33 -
CefRefPtr<ClientDialogHandlerGtk> dialog_handler_;
34 -
#endif
35 27 36 28
private:
37 29
IMPLEMENT_REFCOUNTING(DialogHandler);
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4