Simplify backend enum naming, we do not need separate values for gtk and osx webkit backends. Simplify factory creation code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-05 15:33:42 +00:00
parent 05552dd726
commit 9df97be2c1
3 changed files with 20 additions and 42 deletions

View File

@@ -97,11 +97,8 @@ enum wxWebViewBackend
* engine for the current platform*/
wxWEB_VIEW_BACKEND_DEFAULT,
/** The OSX-native WebKit web engine */
wxWEB_VIEW_BACKEND_OSX_WEBKIT,
/** The GTK port of the WebKit engine */
wxWEB_VIEW_BACKEND_GTK_WEBKIT,
/** The WebKit web engine */
wxWEB_VIEW_BACKEND_WEBKIT,
/** Use Microsoft Internet Explorer as web engine */
wxWEB_VIEW_BACKEND_IE

View File

@@ -79,11 +79,8 @@ enum wxWebViewBackend
* engine for the current platform*/
wxWEB_VIEW_BACKEND_DEFAULT,
/** The OSX-native WebKit web engine */
wxWEB_VIEW_BACKEND_OSX_WEBKIT,
/** The GTK port of the WebKit engine */
wxWEB_VIEW_BACKEND_GTK_WEBKIT,
/** The WebKit web engine */
wxWEB_VIEW_BACKEND_WEBKIT,
/** Use Microsoft Internet Explorer as web engine */
wxWEB_VIEW_BACKEND_IE

View File

@@ -42,13 +42,9 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
{
switch (backend)
{
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
return new wxWebViewWebKit();
#endif
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
#if defined(wxUSE_WEBVIEW_WEBKIT) && \
(defined(__WXGTK__) || defined(__WXOSX__))
case wxWEB_VIEW_BACKEND_WEBKIT:
return new wxWebViewWebKit();
#endif
@@ -59,11 +55,8 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
case wxWEB_VIEW_BACKEND_DEFAULT:
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
return new wxWebViewWebKit();
#endif
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
#if defined(wxUSE_WEBVIEW_WEBKIT) && \
(defined(__WXGTK__) || defined(__WXOSX__))
return new wxWebViewWebKit();
#endif
@@ -89,16 +82,10 @@ wxWebView* wxWebView::New(wxWindow* parent,
{
switch (backend)
{
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
return new wxWebViewWebKit(parent, id, url, pos, size, style,
name);
#endif
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
return new wxWebViewWebKit(parent, id, url, pos, size, style,
name);
#if defined(wxUSE_WEBVIEW_WEBKIT) && \
(defined(__WXGTK__) || defined(__WXOSX__))
case wxWEB_VIEW_BACKEND_WEBKIT:
return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
#endif
#if wxUSE_WEBVIEW_IE
@@ -108,11 +95,8 @@ wxWebView* wxWebView::New(wxWindow* parent,
case wxWEB_VIEW_BACKEND_DEFAULT:
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
#endif
#if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
#if defined(wxUSE_WEBVIEW_WEBKIT) && \
(defined(__WXGTK__) || defined(__WXOSX__))
return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
#endif