Document wxDataViewModelNotifier callbacks return values.

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

diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 47f7abadb0fbee526e8e0a4798419146bfbac6cc..94d3c68bb1147d920a9bf9ea14ffceda9097630e 100644 (file)
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -92,8 +92,9 @@ 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. 
    

-    @library{wxweb}
-    @category{web}
+    @since 2.9.3
+    @library{wxwebview}
+    @category{webview}

     
     @see wxWebView
  */
     
     @see wxWebView
  */


@@ -122,8 +123,9 @@ 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.
    

-    @library{wxweb}
-    @category{web}
+    @since 2.9.3
+    @library{wxwebview}
+    @category{webview}

     
     @see wxWebView
  */
     
     @see wxWebView
  */


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

-    @library{wxweb}
-    @category{ctrl,web}
-    @see wxWebHandler, wxWebViewEvent
+    @since 2.9.3
+    @library{wxwebview}
+    @category{ctrl,webview}
+    @see wxWebViewHandler, wxWebViewEvent

  */
 class wxWebView : public wxControl
 {
  */
 class wxWebView : public wxControl
 {


@@ -295,34 +298,34 @@ public:
         Get the title of the current web page, or its URL/path if title is not
         available.
     */
         Get the title of the current web page, or its URL/path if title is not
         available.
     */

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

 
    /**
         Get the URL of the currently displayed document.
     */
 
    /**
         Get the URL of the currently displayed document.
     */

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

 
     /**
         Get the HTML source code of the currently displayed document.
         @return The HTML source code, or an empty string if no page is currently
                 shown.
     */
 
     /**
         Get the HTML source code of the currently displayed document.
         @return The HTML source code, or an empty string if no page is currently
                 shown.
     */

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

     
     /**
         Get the text of the current page.
     */
     
     /**
         Get the text of the current page.
     */

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

     
     /**
         Returns whether the web control is currently busy (e.g. loading a page).
     */
     
     /**
         Returns whether the web control is currently busy (e.g. loading a page).
     */

-    virtual bool IsBusy() = 0;
+    virtual bool IsBusy() const = 0;

 
     /**
         Returns whether the web control is currently editable
     */
 
     /**
         Returns whether the web control is currently editable
     */

-    virtual bool IsEditable() = 0;
+    virtual bool IsEditable() const = 0;

 
     /**
         Load a web page from a URL
 
     /**
         Load a web page from a URL


@@ -331,7 +334,7 @@ public:
             to know whether loading the URL was successful, register to receive
             navigation error events.
     */
             to know whether loading the URL was successful, register to receive
             navigation error events.
     */

-    virtual void LoadUrl(const wxString& url) = 0;
+    virtual void LoadURL(const wxString& url) = 0;

 
     /**
         Opens a print dialog so that the user may print the currently
 
     /**
         Opens a print dialog so that the user may print the currently


@@ -393,23 +396,23 @@ public:
     /**
         Returns @true if the current selection can be copied.
         
     /**
         Returns @true if the current selection can be copied.
         

-        @note This always returns @c false on the OSX WebKit backend.
+        @note This always returns @c true on the OSX WebKit backend.

     */
     */

-    virtual bool CanCopy() = 0;
+    virtual bool CanCopy() const = 0;

 
     /**
         Returns @true if the current selection can be cut.
         
 
     /**
         Returns @true if the current selection can be cut.
         

-         @note This always returns @c false on the OSX WebKit backend.
+         @note This always returns @c true on the OSX WebKit backend.

     */
     */

-    virtual bool CanCut() = 0;
+    virtual bool CanCut() const = 0;

 
     /**
         Returns @true if data can be pasted.
         
 
     /**
         Returns @true if data can be pasted.
         

-        @note This always returns @c false on the OSX WebKit backend.
+        @note This always returns @c true on the OSX WebKit backend.

     */
     */

-    virtual bool CanPaste() = 0;
+    virtual bool CanPaste() const = 0;

 
     /**
         Copies the current selection. 
 
     /**
         Copies the current selection. 


@@ -434,13 +437,13 @@ public:
         Returns @true if it is possible to navigate backward in the history of
         visited pages.
     */
         Returns @true if it is possible to navigate backward in the history of
         visited pages.
     */

-    virtual bool CanGoBack() = 0;
+    virtual bool CanGoBack() const = 0;

 
     /** 
         Returns @true if it is possible to navigate forward in the history of
         visited pages.
     */
 
     /** 
         Returns @true if it is possible to navigate forward in the history of
         visited pages.
     */

-    virtual bool CanGoForward() = 0;
+    virtual bool CanGoForward() const = 0;

 
     /**
         Clear the history, this will also remove the visible page.
 
     /**
         Clear the history, this will also remove the visible page.


@@ -501,17 +504,17 @@ public:
     /**
         Returns the currently selected source, if any.
     */
     /**
         Returns the currently selected source, if any.
     */

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

     
     /**
         Returns the currently selected text, if any.
     */
     
     /**
         Returns the currently selected text, if any.
     */

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

 
     /**
         Returns @true if there is a current selection.
     */
 
     /**
         Returns @true if there is a current selection.
     */

-    virtual bool HasSelection() = 0;
+    virtual bool HasSelection() const = 0;

 
     /**
         Selects the entire page.
 
     /**
         Selects the entire page.


@@ -525,12 +528,12 @@ public:
     /**
         Returns @true if there is an action to redo.
     */
     /**
         Returns @true if there is an action to redo.
     */

-    virtual bool CanRedo() = 0;
+    virtual bool CanRedo() const = 0;

 
     /**
         Returns @true if there is an action to undo.
     */
 
     /**
         Returns @true if there is an action to undo.
     */

-    virtual bool CanUndo() = 0;
+    virtual bool CanUndo() const = 0;

 
     /**
         Redos the last action.
 
     /**
         Redos the last action.


@@ -558,7 +561,7 @@ public:
         Get the zoom factor of the page.
         @return The current level of zoom.
     */
         Get the zoom factor of the page.
         @return The current level of zoom.
     */

-    virtual wxWebViewZoom GetZoom() = 0;
+    virtual wxWebViewZoom GetZoom() const = 0;

 
     /**
         Get how the zoom factor is currently interpreted.
 
     /**
         Get how the zoom factor is currently interpreted.


@@ -620,18 +623,19 @@ 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

-
-    @library{wxweb}
-    @category{events,web}
+    
+    @since 2.9.3
+    @library{wxwebview}
+    @category{events,webview}

 
     @see wxWebView
 */
 
     @see wxWebView
 */

-class wxWebViewEvent : public wxCommandEvent
+class wxWebViewEvent : public wxNotifyEvent

 {
 public:
     wxWebViewEvent();
     wxWebViewEvent(wxEventType type, int id, const wxString href,
 {
 public:
     wxWebViewEvent();
     wxWebViewEvent(wxEventType type, int id, const wxString href,

-                   const wxString target, bool canVeto);
+                   const wxString target);

 
     /**
         Get the name of the target frame which the url of this event
 
     /**
         Get the name of the target frame which the url of this event


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

-
-    virtual wxEvent* Clone() const;
-
-    /** 
-        Get whether this event may be vetoed (stopped/prevented). Only
-        meaningful for events fired before navigation takes place.
-     */
-    bool CanVeto() const;
-
-    /** 
-        Whether this event was vetoed (stopped/prevented). Only meaningful for
-        events fired before navigation takes place or new window events.
-     */
-    bool IsVetoed() const;
-
-    /** 
-        Veto (prevent/stop) this event. Only meaningful for events fired
-        before navigation takes place. Only valid if CanVeto() returned true.
-     */
-    void Veto();

 };
\ No newline at end of file
 };
\ No newline at end of file