Provide native implementation of wx{Date,Time}PickerCtrl for wxOSX/Cocoa.

[wxWidgets.git] / interface / wx / webview.h

diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 1cb188593d16b45363770f7a8390708b53df3be9..e5892a67959f56a34e59b1153aec42c6d9cf6b9a 100644 (file)
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -92,6 +92,7 @@ enum wxWebViewBackend
     A simple class that contains the URL and title of an element of the history
     of a wxWebView. 
    
     A simple class that contains the URL and title of an element of the history
     of a wxWebView. 
    

+    @since 2.9.3

     @library{wxwebview}
     @category{webview}
     
     @library{wxwebview}
     @category{webview}
     


@@ -122,6 +123,7 @@ public:
     The base class for handling custom schemes in wxWebView, for example to 
     allow virtual file system support.
    
     The base class for handling custom schemes in wxWebView, for example to 
     allow virtual file system support.
    

+    @since 2.9.3

     @library{wxwebview}
     @category{webview}
     
     @library{wxwebview}
     @category{webview}
     


@@ -144,7 +146,7 @@ public:
     /**
         @return The name of the scheme, as passed to the constructor.
     */
     /**
         @return The name of the scheme, as passed to the constructor.
     */

-    virtual wxString GetName() const = 0;
+    virtual wxString GetName() const;

 };
 
 /**
 };
 
 /**


@@ -209,7 +211,7 @@ public:
     wxWebFileHandler is provided to allow the navigation of pages inside a zip
     archive. It overrides the @c file scheme and provides support for the 
     standard @c file syntax as well as paths to archives of the form 
     wxWebFileHandler is provided to allow the navigation of pages inside a zip
     archive. It overrides the @c file scheme and provides support for the 
     standard @c file syntax as well as paths to archives of the form 

-    @c file:///C:/exmaple/docs.zip;protocol=zip/main.htm 
+    @c file:///C:/example/docs.zip;protocol=zip/main.htm

   
     @beginEventEmissionTable{wxWebViewEvent}
     @event{EVT_WEB_VIEW_NAVIGATING(id, func)}
   
     @beginEventEmissionTable{wxWebViewEvent}
     @event{EVT_WEB_VIEW_NAVIGATING(id, func)}


@@ -226,7 +228,7 @@ public:
        Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
        is fully loaded and displayed. Note that if the displayed HTML document has 
        several frames, one such event will be generated per frame.
        Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
        is fully loaded and displayed. Note that if the displayed HTML document has 
        several frames, one such event will be generated per frame.

-    @event{EVT_WEB_VIEW_ERRROR(id, func)}
+    @event{EVT_WEB_VIEW_ERROR(id, func)}

        Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
        error occurs.
        The integer associated with this event will be a wxWebNavigationError item.
        Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
        error occurs.
        The integer associated with this event will be a wxWebNavigationError item.


@@ -241,6 +243,7 @@ public:
        the page title changes. Use GetString to get the title.
     @endEventTable
    
        the page title changes. Use GetString to get the title.
     @endEventTable
    

+    @since 2.9.3

     @library{wxwebview}
     @category{ctrl,webview}
     @see wxWebViewHandler, wxWebViewEvent
     @library{wxwebview}
     @category{ctrl,webview}
     @see wxWebViewHandler, wxWebViewEvent


@@ -254,11 +257,11 @@ public:
     */
     virtual bool Create(wxWindow* parent,
                         wxWindowID id,
     */
     virtual bool Create(wxWindow* parent,
                         wxWindowID id,

-                        const wxString& url,
-                        const wxPoint& pos,
-                        const wxSize& size,
-                        long style,
-                        const wxString& name) = 0;
+                        const wxString& url = wxWebViewDefaultURLStr,
+                        const wxPoint& pos = wxDefaultPosition,
+                        const wxSize& size = wxDefaultSize,
+                        long style = 0,
+                        const wxString& name = wxWebViewNameStr) = 0;

 
     /**
         Factory function to create a new wxWebView for two-step creation
 
     /**
         Factory function to create a new wxWebView for two-step creation


@@ -606,7 +609,7 @@ public:
        Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
        is fully loaded and displayed. Note that if the displayed HTML document has 
        several frames, one such event will be generated per frame.
        Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
        is fully loaded and displayed. Note that if the displayed HTML document has 
        several frames, one such event will be generated per frame.

-    @event{EVT_WEB_VIEW_ERRROR(id, func)}
+    @event{EVT_WEB_VIEW_ERROR(id, func)}

        Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
        error occurs.
        The integer associated with this event will be a wxWebNavigationError item.
        Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
        error occurs.
        The integer associated with this event will be a wxWebNavigationError item.


@@ -620,7 +623,8 @@ public:
        Process a @c wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event, generated when 
        the page title changes. Use GetString to get the title.
     @endEventTable
        Process a @c wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event, generated when 
        the page title changes. Use GetString to get the title.
     @endEventTable

-
+    
+    @since 2.9.3

     @library{wxwebview}
     @category{events,webview}
 
     @library{wxwebview}
     @category{events,webview}
 


@@ -644,4 +648,12 @@ public:
         Get the URL being visited
     */
     const wxString& GetURL() const;
         Get the URL being visited
     */
     const wxString& GetURL() const;

-};
\ No newline at end of file
+};
+
+
+wxEventType wxEVT_COMMAND_WEB_VIEW_NAVIGATING;
+wxEventType wxEVT_COMMAND_WEB_VIEW_NAVIGATED;
+wxEventType wxEVT_COMMAND_WEB_VIEW_LOADED;
+wxEventType wxEVT_COMMAND_WEB_VIEW_ERROR;
+wxEventType wxEVT_COMMAND_WEB_VIEW_NEWWINDOW;
+wxEventType wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED;