diff options
| author | bdibello@chromium.org <bdibello@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 20:39:18 +0000 |
|---|---|---|
| committer | bdibello@chromium.org <bdibello@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 20:39:18 +0000 |
| commit | d43bec80985cab1ca2a80152cac11403b5346f3c (patch) | |
| tree | 4b7b4840c2854013325d57aebee7cabdbb44b9f6 | |
| parent | cec92b67923e3bdcd9716db0512fac92dc349ab5 (diff) | |
| download | chromium_src-d43bec80985cab1ca2a80152cac11403b5346f3c.zip chromium_src-d43bec80985cab1ca2a80152cac11403b5346f3c.tar.gz chromium_src-d43bec80985cab1ca2a80152cac11403b5346f3c.tar.bz2 | |
Define native widget types for iOS.
Review URL: https://chromiumcodereview.appspot.com/10861011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153722 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/native_widget_types.h | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h index 7e33950..3858c11 100644 --- a/ui/gfx/native_widget_types.h +++ b/ui/gfx/native_widget_types.h @@ -57,6 +57,23 @@ class Event; #include <windows.h> // NOLINT typedef struct HFONT__* HFONT; struct IAccessible; +#elif defined(OS_IOS) +struct CGContext; +#ifdef __OBJC__ +@class UIEvent; +@class UIFont; +@class UIImage; +@class UIView; +@class UIWindow; +@class UITextField; +#else +class UIEvent; +class UIFont; +class UIImage; +class UIView; +class UIWindow; +class UITextField; +#endif // __OBJC__ #elif defined(OS_MACOSX) struct CGContext; #ifdef __OBJC__ @@ -110,6 +127,11 @@ typedef HWND NativeView; typedef HWND NativeWindow; typedef HRGN NativeRegion; typedef MSG NativeEvent; +#elif defined(OS_IOS) +typedef void* NativeCursor; +typedef UIView* NativeView; +typedef UIWindow* NativeWindow; +typedef UIEvent* NativeEvent; #elif defined(OS_MACOSX) typedef NSCursor* NativeCursor; typedef NSView* NativeView; @@ -135,6 +157,11 @@ typedef HWND NativeEditView; typedef HDC NativeDrawingContext; typedef HMENU NativeMenu; typedef IAccessible* NativeViewAccessible; +#elif defined(OS_IOS) +typedef UIFont* NativeFont; +typedef UITextField* NativeEditView; +typedef CGContext* NativeDrawingContext; +typedef void* NativeMenu; #elif defined(OS_MACOSX) typedef NSFont* NativeFont; typedef NSTextField* NativeEditView; @@ -168,7 +195,9 @@ const int kNullCursor = 0; const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL); #endif -#if defined(OS_MACOSX) +#if defined(OS_IOS) +typedef UIImage NativeImageType; +#elif defined(OS_MACOSX) typedef NSImage NativeImageType; #elif defined(TOOLKIT_GTK) typedef GdkPixbuf NativeImageType; @@ -279,6 +308,9 @@ const AcceleratedWidget kNullAcceleratedWidget = NULL; #elif defined(USE_X11) typedef unsigned long AcceleratedWidget; const AcceleratedWidget kNullAcceleratedWidget = 0; +#elif defined(OS_IOS) +typedef UIView* AcceleratedWidget; +const AcceleratedWidget kNullAcceleratedWidget = 0; #elif defined(OS_MACOSX) typedef NSView* AcceleratedWidget; const AcceleratedWidget kNullAcceleratedWidget = 0; |