fixed handling of the accelerators of menu items added to already attached submenus

[wxWidgets.git] / src / html / htmlctrl / webkit / webkit.mm

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 59661997fd0a8ee036bf56a2a2738b5f7e383bcc..b25b47c315100a95b22e2acd26658f28a7ba4975 100755 (executable)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -28,9 +28,9 @@
 #else
 #include "wx/mac/uma.h"
 #include <Carbon/Carbon.h>
+#include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>
 #include <WebKit/CarbonUtils.h>
-#include <WebKit/WebKit.h>
 #endif
 
 #include "wx/html/webkit.h"
@@ -41,9 +41,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl)
-#endif
 
 BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
     EVT_SIZE(wxWebKitCtrl::OnSize)
@@ -156,6 +154,10 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
     MacPostControlCreate(pos, size);
     HIViewSetVisible( m_peer->GetControlRef(), true );
     [m_webView setHidden:false];
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+       if ( UMAGetSystemVersion() >= 0x1030 )
+    HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
+#endif
 #endif
 
     // Register event listener interfaces