Make GdiPlus initialization independent of static initialization order.

Author: kovacsv

Sources/WindowsAppSupport/WAS_BitmapContextGdiplus.cpp

@@ -6,30 +6,22 @@
 namespace WAS
 {
 
-class GdiplusInitializer
-{
-public:
-	GdiplusInitializer ()
-	{
-		Gdiplus::GdiplusStartupInput input;
-		Gdiplus::GdiplusStartupOutput output;
-		DBGONLY (Gdiplus::Status status =) Gdiplus::GdiplusStartup (&gdiPlusToken, &input, &output);
-		DBGASSERT (status == Gdiplus::Ok);
-	}
-
-	~GdiplusInitializer ()
-	{
-		Gdiplus::GdiplusShutdown (gdiPlusToken);
-	}
-
-private:
-	ULONG_PTR	gdiPlusToken;
-};
+GdiplusInitializer::GdiplusInitializer ()
+{
+	Gdiplus::GdiplusStartupInput input;
+	Gdiplus::GdiplusStartupOutput output;
+	DBGONLY (Gdiplus::Status status =) Gdiplus::GdiplusStartup (&gdiPlusToken, &input, &output);
+	DBGASSERT (status == Gdiplus::Ok);
+}
 
-static GdiplusInitializer gdiplusInitializer;
+GdiplusInitializer::~GdiplusInitializer ()
+{
+	Gdiplus::GdiplusShutdown (gdiPlusToken);
+}
 
 BitmapContextGdiplus::BitmapContextGdiplus () :
 	NUIE::NativeDrawingContext (),
+	gdiplusInitializer (),
 	width (0),
 	height (0),
 	bitmap (new Gdiplus::Bitmap (width, height)),

Sources/WindowsAppSupport/WAS_BitmapContextGdiplus.hpp

@@ -9,6 +9,16 @@
 namespace WAS
 {
 
+class GdiplusInitializer
+{
+public:
+	GdiplusInitializer ();
+	~GdiplusInitializer ();
+
+private:
+	ULONG_PTR	gdiPlusToken;
+};
+
 class BitmapContextGdiplus : public NUIE::NativeDrawingContext
 {
 public:
@@ -50,6 +60,7 @@ class BitmapContextGdiplus : public NUIE::NativeDrawingContext
 	Gdiplus::RectF		CreateRectF (const NUIE::Rect& rect) const;
 	void				InitGraphics ();
 
+	GdiplusInitializer					gdiplusInitializer;
 	int									width;
 	int									height;
 	std::unique_ptr<Gdiplus::Bitmap>	bitmap;