X Tutup
Skip to content

Commit fd7fc4a

Browse files
cztomczakcztomczak
committed
cef1 directories restructured.
LifeSpan renamed to Lifespan.
1 parent 6d1c83a commit fd7fc4a

30 files changed

+50
-682
lines changed

‎cefpython/.gitignore‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/build/
2-
/setup/build/
1+
/cef1/windows/setup/build/
32
*.pyc
43

54
# If you want to ignore an already commited directory run:
65
# git rm --cached -r .idea
6+
77
/.idea/
8-
/windows_example/debug.log
9-
/windows_example/error.log
8+
debug.log
9+
error.log
1010

1111
# WingIDE project files
1212
/wingide.wpr
@@ -21,4 +21,4 @@
2121
Debug*/
2222
Release*/
2323

24-
*.pdb
24+
*.pdb

‎cefpython/browser.pyx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class PyBrowser:
122122
allowedHandlers += ["OnAddressChange", "OnConsoleMessage", "OnContentsSizeChange", "OnNavStateChange",
123123
"OnStatusMessage", "OnTitleChange", "OnTooltip"]
124124

125-
# LifeSpanHandler.
125+
# LifespanHandler.
126126
allowedHandlers += ["DoClose", "OnAfterCreated", "OnBeforeClose", "RunModal"]
127127

128128
for key in handlers:

cefpython/cef1/windows/client_handler/client_handler.cpp renamed to cefpython/cef1/client_handler/client_handler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ bool ClientHandler::OnTooltip(CefRefPtr<CefBrowser> browser,
212212
//
213213

214214
bool ClientHandler::DoClose(CefRefPtr<CefBrowser> browser) {
215-
return LifeSpanHandler_DoClose(browser);
215+
return LifespanHandler_DoClose(browser);
216216
}
217217

218218
void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
219-
LifeSpanHandler_OnAfterCreated(browser);
219+
LifespanHandler_OnAfterCreated(browser);
220220
}
221221

222222
void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
223-
LifeSpanHandler_OnBeforeClose(browser);
223+
LifespanHandler_OnBeforeClose(browser);
224224
}
225225

226226
bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> parentBrowser,
@@ -234,6 +234,6 @@ bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> parentBrowser,
234234
}
235235

236236
bool ClientHandler::RunModal(CefRefPtr<CefBrowser> browser) {
237-
return LifeSpanHandler_RunModal(browser);
237+
return LifespanHandler_RunModal(browser);
238238
}
239239

cefpython/cef1/windows/client_handler/client_handler.h renamed to cefpython/cef1/client_handler/client_handler.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#define DL_EXPORT(RTYPE) RTYPE
2323
#endif
2424

25-
#include "setup/cefpython.h"
25+
#if defined(OS_WIN)
26+
#include "windows/setup/cefpython.h"
27+
#endif
2628

2729
class ClientHandler : public CefClient,
2830
public CefLoadHandler,

cefpython/cef1/windows/client_handler/client_handler.sln renamed to cefpython/cef1/client_handler/client_handler.sln

File renamed without changes.

cefpython/cef1/windows/client_handler/client_handler_py27.vcproj renamed to cefpython/cef1/client_handler/client_handler_py27.vcproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
/>
101101
<Tool
102102
Name="VCCLCompilerTool"
103-
AdditionalIncludeDirectories="../;../../;c:\python27_32bit\include"
103+
AdditionalIncludeDirectories="../;c:\python27_32bit\include"
104104
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
105105
ExceptionHandling="1"
106106
RuntimeLibrary="2"

cefpython/cef1/windows/client_handler/client_handler_py32.vcproj renamed to cefpython/cef1/client_handler/client_handler_py32.vcproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
/>
100100
<Tool
101101
Name="VCCLCompilerTool"
102-
AdditionalIncludeDirectories="../;../../;c:\python32_32bit\include"
102+
AdditionalIncludeDirectories="../;c:\python32_32bit\include"
103103
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
104104
ExceptionHandling="1"
105105
RuntimeLibrary="2"

cefpython/cef1/windows/http_authentication/AuthCredentials.cpp renamed to cefpython/cef1/http_authentication/AuthCredentials.cpp

File renamed without changes.

cefpython/cef1/windows/http_authentication/AuthCredentials.h renamed to cefpython/cef1/http_authentication/AuthCredentials.h

File renamed without changes.

cefpython/cef1/windows/http_authentication/AuthDialog.cpp renamed to cefpython/cef1/http_authentication/AuthDialog.cpp

File renamed without changes.

0 commit comments

Comments
 (0)
X Tutup