diff options
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webcursor.h | 8 | ||||
| -rw-r--r-- | webkit/glue/webcursor_gtk.cc | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h index 32c8a2b..8697f731 100644 --- a/webkit/glue/webcursor.h +++ b/webkit/glue/webcursor.h @@ -16,10 +16,7 @@ typedef struct HINSTANCE__* HINSTANCE; typedef struct HICON__* HICON; typedef HICON HCURSOR; #elif defined(USE_X11) -// GdkCursorType is an enum, which we can't forward-declare. :( -// If you work around this, be sure to fix webkit_glue.gyp:glue to not put -// GTK in the export_dependent_settings section! -#include <gdk/gdkcursor.h> +typedef struct _GdkCursor GdkCursor; #elif defined(OS_MACOSX) #ifdef __OBJC__ @class NSCursor; @@ -81,7 +78,8 @@ class WebCursor { // Return the stock GdkCursorType for this cursor, or GDK_CURSOR_IS_PIXMAP // if it's a custom cursor. Return GDK_LAST_CURSOR to indicate that the cursor // should be set to the system default. - GdkCursorType GetCursorType() const; + // Returns an int so we don't need to include GDK headers in this header file. + int GetCursorType() const; // Return a new GdkCursor* for this cursor. Only valid if GetCursorType // returns GDK_CURSOR_IS_PIXMAP. diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc index abcbaec..011005f 100644 --- a/webkit/glue/webcursor_gtk.cc +++ b/webkit/glue/webcursor_gtk.cc @@ -40,7 +40,7 @@ GdkCursor* GetInlineCustomCursor(CustomCursorType type) { } // end anonymous namespace -GdkCursorType WebCursor::GetCursorType() const { +int WebCursor::GetCursorType() const { // http://library.gnome.org/devel/gdk/2.12/gdk-Cursors.html has images // of the default X theme, but beware that the user's cursor theme can // change everything. |