Merge branch 'master' into wm-drag-drop-rewrite

1 files changed, 17 insertions, 1 deletions

diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index b069e6cf3b6..e624cc83427 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -30,8 +30,8 @@
 #endif  // WIN32
 
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <ole2.h>  // for drag-n-drop
+#include <windows.h>
 
 #include "GHOST_System.h"
 
@@ -131,6 +131,13 @@ class GHOST_SystemWin32 : public GHOST_System {
   GHOST_IContext *createOffscreenContext();
 
   /**
+   * Create a new offscreen context.
+   * Never explicitly delete the window, use disposeContext() instead.
+   * \return  The new context (or 0 if creation failed).
+   */
+  GHOST_IContext *createOffscreenContext(GHOST_TDrawingContextType type);
+
+  /**
    * Dispose of a context.
    * \param   context Pointer to the context to be disposed.
    * \return  Indication of success.
@@ -249,6 +256,13 @@ class GHOST_SystemWin32 : public GHOST_System {
   GHOST_TSuccess exit();
 
   /**
+   * Create a new offscreen DirectX context.
+   * Never explicitly delete the window, use disposeContext() instead.
+   * \return  The new context (or 0 if creation failed).
+   */
+  GHOST_IContext *createOffscreenContextD3D();
+
+  /**
    * Converts raw WIN32 key codes from the wndproc to GHOST keys.
    * \param vKey      The virtual key from hardKey
    * \param ScanCode  The ScanCode of pressed key (similar to PS/2 Set 1)
@@ -400,6 +414,8 @@ class GHOST_SystemWin32 : public GHOST_System {
 
   /** The current state of the modifier keys. */
   GHOST_ModifierKeys m_modifierKeys;
+  /** The virtual-key code (VKey) of the last press event. Used to detect repeat events. */
+  unsigned short m_keycode_last_repeat_key;
   /** State variable set at initialization. */
   bool m_hasPerformanceCounter;
   /** High frequency timer variable. */