Context Navigation

Changeset 181

Timestamp:

Nov 26, 2010, 8:03:20 PM (15 years ago)

Author:

dmik

Message:

jdk: Building awt in progress (2).

Location:

trunk/openjdk/jdk/src

Files:

-              r2
+              r181
 #include <stdint.h>                     /* for uintptr_t */
 #include <malloc.h>                     /* for ptrdiff_t */
+#elif defined(OS2)
+#include <sys/types.h>                  /* for uintptr_t */
+#include <stddef.h>                     /* for ptrdiff_t */
 #else
 #include <link.h>                       /* for uintptr_t */

r2	r181
105	105	* glut.h or gl.h.
106	106	*/
107		#if ~~defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN~~__)
	107	#if (defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)) \|\| defined(__WIN32OS2__)
108	108	#define WIN32_LEAN_AND_MEAN 1
109	109	#include <windows.h>

r2	r181
58	58	*/
59	59
60		#if ~~defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN~~__)
	60	#if (defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)) \|\| defined(__WIN32OS2__)
61	61	#define WIN32_LEAN_AND_MEAN 1
62	62	#include <windows.h>

-              r2
+              r181
            InstanceAccess* operator&();
        };
 friend                          InstanceAccess;
+friend class                    InstanceAccess;
 private:
 …
 };
 #endif _DEVICES_H_
+#endif // _DEVICES_H_

-              r2
+              r181
 class awt_toolkit_shutdown {};
+#ifndef __WIN32OS2__
 // Disable "C++ Exception Specification ignored" warnings.
 // These warnings are generated because VC++ 5.0 allows, but does not enforce,
 …
 // is updated to enforce exception specifications.
 #pragma warning(disable : 4290)
+#endif
 #ifdef TRY

r2	r181
448	448	static void JavaKeyToWindowsKey(UINT javaKey, UINT windowsKey, UINT modifiers, UINT originalWindowsKey);
449	449
450		INLINE static void ~~AwtComponent::~~JavaKeyToWindowsKey(UINT javaKey,
	450	INLINE static void JavaKeyToWindowsKey(UINT javaKey,
451	451	UINT windowsKey, UINT modifiers)
452	452	{

-              r2
+              r181
     /* Disable inlining. */
+    #ifdef INLINE
+    #undef INLINE
+    #endif
     #define INLINE
 #else
 …
     /* Enable inlining. */
+    #ifdef INLINE
+    #undef INLINE
+    #endif
     #define INLINE inline
 #endif // DEBUG

r2	r181
79	79	virtual LPCTSTR GetClassName();
80	80
81		void ~~AwtMenuItem::~~LinkObjects(jobject peer);
	81	void LinkObjects(jobject peer);
82	82	static AwtMenuItem* Create(jobject self, jobject menu);
83	83

-              r2
+              r181
 class AwtPrintDialog {
 public:
     static jfieldID AwtPrintDialog::controlID;
     static jfieldID AwtPrintDialog::parentID;
     static jfieldID AwtPrintDialog::pageID;
     static jmethodID AwtPrintDialog::setHWndMID;
+    static jfieldID controlID;
+    static jfieldID parentID;
+    static jfieldID pageID;
+    static jmethodID setHWndMID;
     static BOOL PrintDlg(LPPRINTDLG);

r2	r181
107	107	const CriticalSection& critSec;
108	108	};
109		friend Lock;
	109	friend class Lock;
110	110
111	111	private:

r2	r181
116	116	};
117	117
118		#endif AWT_WIN32GRAPHICSDEVICE_H
	118	#endif // AWT_WIN32GRAPHICSDEVICE_H

Note: See TracChangeset for help on using the changeset viewer.