Browse Source

fix gdiplus include order

Kolja Strohm 1 year ago
parent
commit
41378d2a32
3 changed files with 22 additions and 14 deletions
  1. 10 6
      Bild.cpp
  2. 11 8
      Global.cpp
  3. 1 0
      Globals.h

+ 10 - 6
Bild.cpp

@@ -1,13 +1,11 @@
 //---Include---
-#ifdef WIN32
-
-#    include <GdiPlus.h>
-#    include <Windows.h>
-#    pragma comment(lib, "gdiplus.lib")
+#include "Bild.h"
 
+#ifdef WIN32
+#    include <objidl.h>
 #endif
+
 #include "AlphaFeld.h"
-#include "Bild.h"
 #include "DateiSystem.h"
 #include "Globals.h"
 #include "MausEreignis.h"
@@ -15,6 +13,12 @@
 #include "Scroll.h"
 #include "Text.h"
 #include "ToolTip.h"
+
+#ifdef WIN32
+#    include <gdiplus.h>
+#    pragma comment(lib, "gdiplus.lib")
+#endif
+
 #ifndef WIN32
 #    include <math.h>
 #    include <stdlib.h>

+ 11 - 8
Global.cpp

@@ -1,13 +1,9 @@
-#ifdef WIN32
-
-#    include <GdiPlus.h>
-#    include <Windows.h>
-#    pragma comment(lib, "gdiplus.lib")
-#    include "Fenster.h"
-#    include "Maus.h"
+#define Global
 
+#ifdef WIN32
+#    include <objidl.h>
 #endif
-#define Global
+
 #include "Datei.h"
 #include "DLLRegister.h"
 #include "Fenster.h"
@@ -17,6 +13,13 @@
 #include "Thread.h"
 #include "Zeit.h"
 
+#ifdef WIN32
+#    include <GdiPlus.h>
+#    pragma comment(lib, "gdiplus.lib")
+#    include "Fenster.h"
+#    include "Maus.h"
+#endif
+
 void Framework::initFramework(HINSTANCE__* hInst)
 {
     if (istInitialisiert) return;

+ 1 - 0
Globals.h

@@ -3,6 +3,7 @@
 
 #include "Critical.h"
 #include "Punkt.h"
+#include "Maus.h"
 
 #ifndef Global
 #    define Global extern