source: branches/swt/include/win/gdiplus.h@ 22121

Last change on this file since 22121 was 22121, checked in by rousseau, 10 years ago

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 size: 1.9 KB
Line 
1/*
2 * Copyright (C) 2007 Google (Evan Stade)
3 *
4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version.
8 *
9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details.
13 *
14 * You should have received a copy of the GNU Lesser General Public
15 * License along with this library; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
17 */
18
19#ifndef _GDIPLUS_H
20#define _GDIPLUS_H
21
22#ifdef __cplusplus
23
24// rousseau.201602132022
25// Wine uses mostly '.c' extensions and gcc, while Odin uses '.cpp' and g++.
26// So under Odin, the namespaces below would be active, causing the 'Status'
27// enum to become 'Gdiplus::Status'. For now we will disable the namespaces.
28///namespace Gdiplus
29///{
30/// namespace DllExports
31/// {
32#include "gdiplusmem.h"
33/// };
34
35#include "gdiplusenums.h"
36#include "gdiplustypes.h"
37#include "gdiplusinit.h"
38#include "gdipluspixelformats.h"
39#include "gdiplusmetaheader.h"
40#include "gdiplusimaging.h"
41#include "gdipluscolor.h"
42#include "gdipluscolormatrix.h"
43#include "gdiplusgpstubs.h"
44
45/// namespace DllExports
46/// {
47#include "gdiplusflat.h"
48/// };
49///};
50
51#else /* end c++ includes */
52
53#include "gdiplusmem.h"
54
55#include "gdiplusenums.h"
56#include "gdiplustypes.h"
57#include "gdiplusinit.h"
58#include "gdipluspixelformats.h"
59#include "gdiplusmetaheader.h"
60#include "gdiplusimaging.h"
61#include "gdipluscolor.h"
62#include "gdipluscolormatrix.h"
63#include "gdiplusgpstubs.h"
64
65#include "gdiplusflat.h"
66
67#endif /* end c includes */
68
69#endif /* _GDIPLUS_H_ */
Note: See TracBrowser for help on using the repository browser.