mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 13:08:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Beta-3 Release Candidate branch (#753)

Browse Source 
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
This commit is contained in:
Alexander Bock
2018-11-05 20:51:48 -05:00
committed by GitHub
parent 7181de4673
commit 267879878b
27 changed files with 101 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/webbrowser/include/browserinstance.h
+4 -4
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H
#define __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H
#ifndef __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H__
#define __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H__
#ifdef _MSC_VER
#pragma warning (push)
@@ -47,7 +47,7 @@ class WebKeyboardHandler;
class BrowserInstance {
public:
BrowserInstance(WebRenderHandler* renderer, WebKeyboardHandler *keyboardHandler);
BrowserInstance(WebRenderHandler* renderer, WebKeyboardHandler* keyboardHandler);
~BrowserInstance();
void loadUrl(const std::string& url);
@@ -106,4 +106,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H
#endif // __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H__