Changeset 22121 for branches/swt/include/win/gdiplus.h

Timestamp:

Feb 14, 2016, 2:28:41 PM (10 years ago)

Author:

rousseau

Message:

Odin modifications needed for 'gdiplus' [odin]

Modifications:
o dcdata.h

Use 'typedef' for the enum so its more compatible with plain C.

o gdiplus.h

Disabling the namespaces is a quick-hack to get 'gdiplus.dll' to
build. A more proper fix would probably be using '-xc' for g++
when building the 'gdiplus' module.

o gdiplusflat.h

Temporarily remove the majority of prototypes so yet undefined types
do not get introduced already.

o gdiplusimaging.h

Possibly revert this mod after it is clear how to properly handle the
namespaces in 'gdiplus.h'.

o shtypes.h

Includes 'wtypes.h' which defines 'PROPID'.

o windef.h

Not sure why these 'IN','OUT','...' definitions only got defined when
WINE was *not* defined.

o winnt.h

Park Wine macros here for now. Proper include ordering needs to be
revisited anyway.

Note:
The headers for GDI+ headers were already added in rev. #22082 to
satisfy building 'swt.dll'. They also came from the wine-repo.

File:

• branches/swt/include/win/gdiplus.h (modified) (2 diffs)

branches/swt/include/win/gdiplus.h

@@ -22 +22 @@
 #ifdef __cplusplus
 
-namespace Gdiplus
-{
-    namespace DllExports
-    {
+// rousseau.201602132022
+// Wine uses mostly '.c' extensions and gcc, while Odin uses '.cpp' and g++.
+// So under Odin, the namespaces below would be active, causing the 'Status'
+// enum to become 'Gdiplus::Status'. For now we will disable the namespaces.
+///namespace Gdiplus
+///{
+///    namespace DllExports
+///    {
 #include "gdiplusmem.h"
-    };
+///    };
 
 #include "gdiplusenums.h"
@@ -39 +43 @@
 #include "gdiplusgpstubs.h"
 
-    namespace DllExports
-    {
+///    namespace DllExports
+///    {
 #include "gdiplusflat.h"
-    };
-};
+///    };
+///};
 
 #else /* end c++ includes */