invalidate m_selection in DoRemovePage(), not in DeletePage() (replaces patch 998984)

[wxWidgets.git] / include / wx / html / htmlwin.h

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index e789eb5d11d7c4bb1ee5b330c5258f19c7ba1d0e..adefe1fce27001d7cb5b623815ebffb385321c42 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -120,9 +120,11 @@ public:
     void SetRelatedFrame(wxFrame* frame, const wxString& format);
     wxFrame* GetRelatedFrame() const {return m_RelatedFrame;}
 
     void SetRelatedFrame(wxFrame* frame, const wxString& format);
     wxFrame* GetRelatedFrame() const {return m_RelatedFrame;}
 

+#if wxUSE_STATUSBAR

     // After(!) calling SetRelatedFrame, this sets statusbar slot where messages
     // will be displayed. Default is -1 = no messages.
     void SetRelatedStatusBar(int bar);
     // After(!) calling SetRelatedFrame, this sets statusbar slot where messages
     // will be displayed. Default is -1 = no messages.
     void SetRelatedStatusBar(int bar);

+#endif // wxUSE_STATUSBAR

 
     // Sets fonts to be used when displaying HTML page.
     void SetFonts(wxString normal_face, wxString fixed_face,
 
     // Sets fonts to be used when displaying HTML page.
     void SetFonts(wxString normal_face, wxString fixed_face,


@@ -190,7 +192,23 @@ public:
                                              const wxString& WXUNUSED(url),
                                              wxString *WXUNUSED(redirect)) const
         { return wxHTML_OPEN; }
                                              const wxString& WXUNUSED(url),
                                              wxString *WXUNUSED(redirect)) const
         { return wxHTML_OPEN; }

+   
+#if wxUSE_CLIPBOARD
+    // Helper functions to select parts of page:
+    void SelectWord(const wxPoint& pos);
+    void SelectLine(const wxPoint& pos);
+    void SelectAll();
+    
+    // Convert selection to text:
+    wxString SelectionToText() { return DoSelectionToText(m_selection); }
+
+    // Converts current page to text:
+    wxString ToText();
+#endif

 
 

+    virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
+        { /* do nothing */ }
+    

 protected:
     void Init();
 
 protected:
     void Init();
 


@@ -237,21 +255,18 @@ protected:
     };
 
     // Copies selection to clipboard if the clipboard support is available
     };
 
     // Copies selection to clipboard if the clipboard support is available

+    //
+    // returns true if anything was copied to clipboard, false otherwise

     bool CopySelection(ClipboardType t = Secondary);
 
 #if wxUSE_CLIPBOARD
     bool CopySelection(ClipboardType t = Secondary);
 
 #if wxUSE_CLIPBOARD

-    // Convert selection to text:
-    wxString SelectionToText();
-
-    // Helper functions to select parts of page:
-    void SelectWord(const wxPoint& pos);
-    void SelectLine(const wxPoint& pos);
-

     // Automatic scrolling during selection:
     void StopAutoScrolling();
 #endif // wxUSE_CLIPBOARD
 
 protected:
     // Automatic scrolling during selection:
     void StopAutoScrolling();
 #endif // wxUSE_CLIPBOARD
 
 protected:

+    wxString DoSelectionToText(wxHtmlSelection *sel);
+    

     // This is pointer to the first cell in parsed data.  (Note: the first cell
     // is usually top one = all other cells are sub-cells of this one)
     wxHtmlContainerCell *m_Cell;
     // This is pointer to the first cell in parsed data.  (Note: the first cell
     // is usually top one = all other cells are sub-cells of this one)
     wxHtmlContainerCell *m_Cell;


@@ -270,9 +285,11 @@ protected:
 
     wxFrame *m_RelatedFrame;
     wxString m_TitleFormat;
 
     wxFrame *m_RelatedFrame;
     wxString m_TitleFormat;

+#if wxUSE_STATUSBAR

     // frame in which page title should be displayed & number of it's statusbar
     // reserved for usage with this html window
     int m_RelatedStatusBar;
     // frame in which page title should be displayed & number of it's statusbar
     // reserved for usage with this html window
     int m_RelatedStatusBar;

+#endif // wxUSE_STATUSBAR

 
     // borders (free space between text and window borders)
     // defaults to 10 pixels.
 
     // borders (free space between text and window borders)
     // defaults to 10 pixels.