Added wxRichToolTip class.

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

diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 1b266bb013c799a8a17746ed3aa8325349520734..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
 {


@@ -393,21 +396,21 @@ 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() const = 0;
 
     /**
         Returns @true if the current selection can be cut.
         
     */
     virtual bool CanCopy() const = 0;
 
     /**
         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() const = 0;
 
     /**
         Returns @true if data can be pasted.
         
     */
     virtual bool CanCut() const = 0;
 
     /**
         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() const = 0;
 
     */
     virtual bool CanPaste() const = 0;
 


@@ -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