diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-09-10 01:15:30 +0400 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-09-10 01:15:30 +0400 |
| commit | f305bb22b7e5f809063539cdb76a24727f41a11a (patch) | |
| tree | 6d5f2e7e71b3123063563c957f28c32423e1013d /intern/ghost/GHOST_Types.h | |
| parent | fede495c073a7369a61e668dae95cf8c7b99a068 (diff) | |
Patch 17508: Blender Web Plugin - XEmbed. Enable XEmbed integration of blenderplayer, using -i as input parameter to pass embedder window id. create a minimal web plugin to embed blenderplayer on web pages (using gecko/mozilla as browser). Only for *nix.
Diffstat (limited to 'intern/ghost/GHOST_Types.h')
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index f81192f1887..6b1295f649b 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -100,6 +100,7 @@ typedef enum { GHOST_kWindowStateMaximized, GHOST_kWindowStateMinimized, GHOST_kWindowStateFullScreen, + GHOST_kWindowStateEmbedded, GHOST_kWindowState8Normal = 8, GHOST_kWindowState8Maximized, GHOST_kWindowState8Minimized, @@ -392,6 +393,15 @@ typedef struct { } GHOST_DisplaySetting; +#ifdef _WIN32 +typedef long GHOST_TEmbedderWindowID; +#endif // _WIN32 + +#ifndef _WIN32 +// I can't use "Window" from "<X11/Xlib.h>" because it conflits with Window defined in winlay.h +typedef int GHOST_TEmbedderWindowID; +#endif // _WIN32 + /** * A timer task callback routine. * @param task The timer task object. |