diff options
| author | Xerxes Rånby <[email protected]> | 2012-08-06 21:17:11 +0000 |
|---|---|---|
| committer | Xerxes Rånby <[email protected]> | 2012-08-06 21:17:11 +0000 |
| commit | ab671729fd4b50127d8dcb95bd5fd13ce0a4078b (patch) | |
| tree | 3a3a4a73a3eda0531dc73f556587683b9c979e0e /make/stub_includes | |
| parent | 6e4051d8c9faeec003b15b68bd01e3caf22869fb (diff) | |
| parent | 9e87acd921bcb357f1ec88d166bde672b54b02c8 (diff) | |
Merge remote-tracking branch 'github-sgothel/master' into armv6hf
Diffstat (limited to 'make/stub_includes')
| -rw-r--r-- | make/stub_includes/opengl/macosx-window-system.h | 2 | ||||
| -rw-r--r-- | make/stub_includes/win32/wingdi.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/make/stub_includes/opengl/macosx-window-system.h b/make/stub_includes/opengl/macosx-window-system.h index e7fe13553..47b51a509 100644 --- a/make/stub_includes/opengl/macosx-window-system.h +++ b/make/stub_includes/opengl/macosx-window-system.h @@ -31,7 +31,7 @@ NSView* getNSView(NSOpenGLContext* ctx); NSOpenGLContext* createContext(NSOpenGLContext* shareContext, NSView* nsView, - Bool isBackingLayerView, + Bool allowIncompleteView, NSOpenGLPixelFormat* pixelFormat, Bool opaque, int* viewNotReady); diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h index 2d3e33275..7a88582c2 100644 --- a/make/stub_includes/win32/wingdi.h +++ b/make/stub_includes/win32/wingdi.h @@ -44,6 +44,8 @@ WINUSERAPI BOOL WINAPI DestroyWindow(HWND hWnd); WINUSERAPI DWORD WINAPI GetObjectType(HGDIOBJ h); WINUSERAPI BOOL WINAPI IsWindowVisible(HWND hWnd); WINUSERAPI BOOL WINAPI IsWindow(HWND hWnd); +WINUSERAPI HWND WINAPI GetParent(HWND hWnd); +WINUSERAPI HWND WINAPI SetParent(HWND hWndChild,HWND hWndNewParent); WINUSERAPI HANDLE WINAPI GetCurrentProcess(void); WINUSERAPI BOOL WINAPI GetProcessAffinityMask(HANDLE hProcess,PDWORD_PTR lpProcessAffinityMask,PDWORD_PTR lpSystemAffinityMask); |