Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove defined values from wxWebView enums. We probably don't want people relying on these as they may well end up changing and there is no benefit to fixing them.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-05-19 19:42:01 +00:00
parent dec53e5a56
commit 70554c327e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/webview.h
View File

@@ -46,29 +46,29 @@ enum wxWebViewZoomType
enum wxWebNavigationError enum wxWebNavigationError
{ {
/** Connection error (timeout, etc.) */ /** Connection error (timeout, etc.) */
wxWEB_NAV_ERR_CONNECTION = 1, wxWEB_NAV_ERR_CONNECTION,
/** Invalid certificate */ /** Invalid certificate */
wxWEB_NAV_ERR_CERTIFICATE = 2, wxWEB_NAV_ERR_CERTIFICATE,
/** Authentication required */ /** Authentication required */
wxWEB_NAV_ERR_AUTH = 3, wxWEB_NAV_ERR_AUTH,
/** Other security error */ /** Other security error */
wxWEB_NAV_ERR_SECURITY = 4, wxWEB_NAV_ERR_SECURITY,
/** Requested resource not found */ /** Requested resource not found */
wxWEB_NAV_ERR_NOT_FOUND = 5, wxWEB_NAV_ERR_NOT_FOUND,
/** Invalid request/parameters (e.g. bad URL, bad protocol, /** Invalid request/parameters (e.g. bad URL, bad protocol,
* unsupported resource type) */ * unsupported resource type) */
wxWEB_NAV_ERR_REQUEST = 6, wxWEB_NAV_ERR_REQUEST,
/** The user cancelled (e.g. in a dialog) */ /** The user cancelled (e.g. in a dialog) */
wxWEB_NAV_ERR_USER_CANCELLED = 7, wxWEB_NAV_ERR_USER_CANCELLED,
/** Another (exotic) type of error that didn't fit in other categories*/ /** Another (exotic) type of error that didn't fit in other categories*/
wxWEB_NAV_ERR_OTHER = 8 wxWEB_NAV_ERR_OTHER
}; };
/** Type of refresh */ /** Type of refresh */
enum wxWebViewReloadFlags enum wxWebViewReloadFlags
{ {
/** Default reload, will access cache */ /** Default reload, will access cache */
wxWEB_VIEW_RELOAD_DEFAULT = 0, wxWEB_VIEW_RELOAD_DEFAULT,
/** Reload the current view without accessing the cache */ /** Reload the current view without accessing the cache */
wxWEB_VIEW_RELOAD_NO_CACHE wxWEB_VIEW_RELOAD_NO_CACHE
}; };

18
interface/wx/webview.h
View File

@@ -40,22 +40,22 @@ enum wxWebViewZoomType
enum wxWebNavigationError enum wxWebNavigationError
{ {
/** Connection error (timeout, etc.) */ /** Connection error (timeout, etc.) */
wxWEB_NAV_ERR_CONNECTION = 1, wxWEB_NAV_ERR_CONNECTION,
/** Invalid certificate */ /** Invalid certificate */
wxWEB_NAV_ERR_CERTIFICATE = 2, wxWEB_NAV_ERR_CERTIFICATE,
/** Authentication required */ /** Authentication required */
wxWEB_NAV_ERR_AUTH = 3, wxWEB_NAV_ERR_AUTH,
/** Other security error */ /** Other security error */
wxWEB_NAV_ERR_SECURITY = 4, wxWEB_NAV_ERR_SECURITY,
/** Requested resource not found */ /** Requested resource not found */
wxWEB_NAV_ERR_NOT_FOUND = 5, wxWEB_NAV_ERR_NOT_FOUND,
/** Invalid request/parameters (e.g. bad URL, bad protocol, /** Invalid request/parameters (e.g. bad URL, bad protocol,
unsupported resource type) */ unsupported resource type) */
wxWEB_NAV_ERR_REQUEST = 6, wxWEB_NAV_ERR_REQUEST,
/** The user cancelled (e.g. in a dialog) */ /** The user cancelled (e.g. in a dialog) */
wxWEB_NAV_ERR_USER_CANCELLED = 7, wxWEB_NAV_ERR_USER_CANCELLED,
/** Another (exotic) type of error that didn't fit in other categories*/ /** Another (exotic) type of error that didn't fit in other categories*/
wxWEB_NAV_ERR_OTHER = 8 wxWEB_NAV_ERR_OTHER
}; };
/** /**
@@ -64,7 +64,7 @@ enum wxWebNavigationError
enum wxWebViewReloadFlags enum wxWebViewReloadFlags
{ {
/** Default reload, will access cache */ /** Default reload, will access cache */
wxWEB_VIEW_RELOAD_DEFAULT = 0, wxWEB_VIEW_RELOAD_DEFAULT,
/** Reload the current view without accessing the cache */ /** Reload the current view without accessing the cache */
wxWEB_VIEW_RELOAD_NO_CACHE wxWEB_VIEW_RELOAD_NO_CACHE
}; };