github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10289 from electron/fix-compile

Browse Source 
Fix compilation on mac
This commit is contained in:
Cheng Zhao
2017-08-17 17:41:13 +09:00
committed by GitHub
parent f6792c0232 9c552644d8
commit 4bc4a0c45b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/browser/native_window_mac.h
View File

@@ -85,7 +85,7 @@ class NativeWindowMac : public NativeWindow,
std::string GetRepresentedFilename() override;
void SetDocumentEdited(bool edited) override;
bool IsDocumentEdited() override;
void SetIgnoreMouseEvents(bool ignore) override;
void SetIgnoreMouseEvents(bool ignore, bool) override;
void SetContentProtection(bool enable) override;
void SetBrowserView(NativeBrowserView* browser_view) override;
void SetParentWindow(NativeWindow* parent) override;

2
atom/browser/native_window_mac.mm
View File

@@ -1412,7 +1412,7 @@ bool NativeWindowMac::IsDocumentEdited() {
return [window_ isDocumentEdited];
}
void NativeWindowMac::SetIgnoreMouseEvents(bool ignore) {
void NativeWindowMac::SetIgnoreMouseEvents(bool ignore, bool) {
[window_ setIgnoresMouseEvents:ignore];
}