Define WIN32_LEAN_AND_MEAN globally

This commit is contained in:
Birunthan Mohanathas
2013-12-24 11:20:19 +00:00
parent c196396ad0
commit da92def9fc
26 changed files with 27 additions and 14 deletions

View File

@ -22,6 +22,7 @@
#include "FontCollection.h"
#include "TextFormat.h"
#include <Windows.h>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
namespace Gfx {

View File

@ -25,6 +25,7 @@
#include "Util/WICBitmapDIB.h"
#include <memory>
#include <string>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
#include <d2d1_1.h>
#include <d2d1helper.h>

View File

@ -24,6 +24,7 @@
#include "TextFormatGDIP.h"
#include <memory>
#include <string>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
namespace Gfx {

View File

@ -19,6 +19,7 @@
#include "FontCollectionD2D.h"
#include "CanvasD2D.h"
#include "Util/DWriteFontCollectionLoader.h"
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
namespace Gfx {

View File

@ -17,6 +17,7 @@
*/
#include "FontCollectionGDIP.h"
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
namespace Gfx {

View File

@ -21,6 +21,7 @@
#include "TextFormat.h"
#include <memory>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
namespace Gfx {

View File

@ -20,6 +20,7 @@
#define RM_GFX_UTIL_WICBITMAPDIB_H_
#include <Windows.h>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
#include <wincodec.h>

View File

@ -20,6 +20,7 @@
#define RM_GFX_UTIL_WICBITMAPLOCKDIB_H_
#include <Windows.h>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
#include <wincodec.h>
#include "WICBitmapDIB.h"

View File

@ -20,6 +20,7 @@
#define RM_GFX_UTIL_WICBITMAPLOCKGDIP_H_
#include <Windows.h>
#include <ole2.h> // For Gdiplus.h.
#include <GdiPlus.h>
#include <wincodec.h>

View File

@ -19,7 +19,7 @@
#ifndef RM_COMMON_RAWSTRING_H_
#define RM_COMMON_RAWSTRING_H_
#include <windows.h>
#include <malloc.h>
class RawString
{
@ -29,7 +29,7 @@ public:
{
}
RawString(const WCHAR* str) :
RawString(const wchar_t* str) :
m_String(str_alloc(str))
{
}
@ -44,7 +44,7 @@ public:
clear();
}
RawString& operator=(const WCHAR* rhs)
RawString& operator=(const wchar_t* rhs)
{
clear();
m_String = str_alloc(rhs);
@ -61,7 +61,7 @@ public:
return *this;
}
const WCHAR* c_str() const
const wchar_t* c_str() const
{
return m_String ? m_String : L"";
}
@ -81,12 +81,12 @@ public:
}
private:
WCHAR* str_alloc(const WCHAR* str)
wchar_t* str_alloc(const wchar_t* str)
{
return str ? _wcsdup(str) : nullptr;
}
WCHAR* m_String;
wchar_t* m_String;
};
#endif