Don't use gtk_menu_item_set_submenu() with NULL menu with GTK+ < 2.12.

[wxWidgets.git] / include / wx / gtk / webview_webkit.h

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index 63e45346feae7febf2cf8d3028de20b434e9aee3..2cef91f1c62ae3ef2a39d8986677bb5bc8324404 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -12,9 +12,8 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
-#include "webkit/webkit.h"
 #include "wx/sharedptr.h"
 #include "wx/webview.h"
 
@@ -22,7 +21,7 @@
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
     wxWebViewWebKit() { Init(); }
@@ -54,12 +53,6 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-    // helper to allow access to protected member from GTK callback
-    void MoveWindow(int x, int y, int width, int height)
-    {
-        DoMoveWindow(x, y, width, height);
-    }
-
     virtual void Stop();
     virtual void LoadURL(const wxString& url);
     virtual void GoBack();
@@ -153,13 +146,13 @@ private:
     void GTKOnFocus(wxFocusEvent& event);
 
     GtkWidget *web_view;
-    gint m_historyLimit;
+    int m_historyLimit;
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 
-#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #endif