diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-29 12:39:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-29 12:42:20 +0300 |
| commit | db57823374ee65b80cd53c5fd4234ad3bf6e287d (patch) | |
| tree | cad38db2eba038c56591ab4c3662c19810183935 /bean/native/win32 | |
| parent | 1b13657acfdc1613ca54841a8f09afad07e925b1 (diff) | |
Don't use the (win32) jawt_md.h as we don't have that when cross-compiling
Just insert the trivial JAWT_GetAWT declaration and
JAWT_Win32DrawingSurfaceInfo struct definition.
Diffstat (limited to 'bean/native/win32')
| -rw-r--r-- | bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c index e86aa6fbdef0..65078c849b4d 100644 --- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -34,12 +34,33 @@ #pragma warning(pop) #endif +#include <windows.h> +#define JAWT_GetAWT hidden_JAWT_GetAWT #include "jawt.h" +#undef JAWT_GetAWT #if defined _MSC_VER #pragma warning(push, 1) #endif -#include "jawt_md.h" +/* When cross-compiling to Windows we don't have any Windows JDK + * available. Copying this short snippet from win32/jawt_md.h can + * surely not be against its license. The intent is to enable + * interoperation with real Oracle Java after all. We leave out the + * informative comments that might have "artistic merit" and be more + * copyrightable. Use this also for native Windows compilation for + * simplicity. + */ +typedef struct jawt_Win32DrawingSurfaceInfo { + union { + HWND hwnd; + HBITMAP hbitmap; + void* pbits; + }; + HDC hdc; + HPALETTE hpalette; +} JAWT_Win32DrawingSurfaceInfo; + +extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT *); #if defined _MSC_VER #pragma warning(pop) #endif |