diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-01-13 06:28:51 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-01-13 06:28:51 +0400 |
| commit | 717bf85545989eb91d429108202294da24cbb565 (patch) | |
| tree | b58ac43b27cedb08d1cd39e47c50efb30d0d2f31 /intern/ghost | |
| parent | c925b5bbb29f2a7d698037d21cdeefc8b613149b (diff) | |
Fix some harmless warnings that mostly appeared on MinGW64
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_DropTargetWin32.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_TaskbarWin32.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.h | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h index 56bae1fd1b2..fb85feffde0 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.h +++ b/intern/ghost/intern/GHOST_DropTargetWin32.h @@ -89,7 +89,7 @@ public: * Destructor * Do NOT destroy directly. Use Release() instead to make COM happy. */ - ~GHOST_DropTargetWin32(); + virtual ~GHOST_DropTargetWin32(); private: diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 2aef4ba16a5..18aadfbdca6 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -37,7 +37,9 @@ #error WIN32 only! #endif // WIN32 +#ifndef __MINGW64__ #define _WIN32_WINNT 0x501 // require Windows XP or newer +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <ole2.h> // for drag-n-drop diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h index 34908a59b3a..4351b387e48 100644 --- a/intern/ghost/intern/GHOST_TaskbarWin32.h +++ b/intern/ghost/intern/GHOST_TaskbarWin32.h @@ -8,7 +8,9 @@ #error WIN32 only! #endif // WIN32 +#ifndef __MINGW64__ #define _WIN32_WINNT 0x501 // require Windows XP or newer +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <shlobj.h> diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 8290f4ee205..f5b716618e3 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -128,6 +128,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( : GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual, false, numOfAASamples), + m_inLiveResize(false), m_system(system), m_hDC(0), m_hGlRc(0), @@ -151,8 +152,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( m_normal_state(GHOST_kWindowStateNormal), m_stereo(stereoVisual), m_nextWindow(NULL), - m_parentWindowHwnd(parentwindowhwnd), - m_inLiveResize(false) + m_parentWindowHwnd(parentwindowhwnd) { OSVERSIONINFOEX versionInfo; bool hasMinVersionForTaskbar = false; diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index 6fdc963f30a..4ccb24c6216 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -40,7 +40,9 @@ #include "GHOST_Window.h" #include "GHOST_TaskbarWin32.h" +#ifndef __MINGW64__ #define _WIN32_WINNT 0x501 // require Windows XP or newer +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> |