expat define MACOS_CLASSIC added

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 6b1f0dd6a0604fc730fa84726ad34395bb545289..f23709848d2720df4b0305f6430d76931c175fa2 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -21,7 +21,6 @@
 #include "wx/window.h"
 #include "wx/scrolwin.h"
 #include "wx/config.h"
 #include "wx/window.h"
 #include "wx/scrolwin.h"
 #include "wx/config.h"

-#include "wx/treectrl.h"

 #include "wx/html/winpars.h"
 #include "wx/html/htmlcell.h"
 #include "wx/filesys.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlcell.h"
 #include "wx/filesys.h"


@@ -32,6 +31,7 @@ class wxHtmlProcessor;
 class wxHtmlWinModule;
 class wxHtmlHistoryArray;
 class wxHtmlProcessorList;
 class wxHtmlWinModule;
 class wxHtmlHistoryArray;
 class wxHtmlProcessorList;

+class WXDLLIMPEXP_HTML wxHtmlWinAutoScrollTimer;

 
 
 // wxHtmlWindow flags:
 
 
 // wxHtmlWindow flags:


@@ -61,7 +61,7 @@ enum wxHtmlOpeningStatus
 //                  SetPage(text) or LoadPage(filename).
 // ----------------------------------------------------------------------------
 
 //                  SetPage(text) or LoadPage(filename).
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
+class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
     friend class wxHtmlWinModule;
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
     friend class wxHtmlWinModule;


@@ -207,16 +207,21 @@ protected:
     // actual size of window. This method also setup scrollbars
     void CreateLayout();
 
     // actual size of window. This method also setup scrollbars
     void CreateLayout();
 

-    void OnDraw(wxDC& dc);
+    void OnEraseBackground(wxEraseEvent& event);
+    void OnPaint(wxPaintEvent& event);

     void OnSize(wxSizeEvent& event);
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);

-    void OnIdle(wxIdleEvent& event);

 #if wxUSE_CLIPBOARD
     void OnKeyUp(wxKeyEvent& event);
 #if wxUSE_CLIPBOARD
     void OnKeyUp(wxKeyEvent& event);

+    void OnDoubleClick(wxMouseEvent& event);

     void OnCopy(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);

-#endif
+    void OnMouseEnter(wxMouseEvent& event);
+    void OnMouseLeave(wxMouseEvent& event);
+#endif // wxUSE_CLIPBOARD
+
+    virtual void OnInternalIdle();

 
     // Returns new filter (will be stored into m_DefaultFilter variable)
     virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
 
     // Returns new filter (will be stored into m_DefaultFilter variable)
     virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}


@@ -228,21 +233,30 @@ protected:
     // and wxHW_NO_SELECTION not used)
     bool IsSelectionEnabled() const;
 
     // and wxHW_NO_SELECTION not used)
     bool IsSelectionEnabled() const;
 

-    // Convert selection to text:
-    wxString SelectionToText();
-

     enum ClipboardType
     {
         Primary,
         Secondary
     };
     enum ClipboardType
     {
         Primary,
         Secondary
     };

-    
-    // Copies selection to clipboard:
+
+    // Copies selection to clipboard if the clipboard support is available

     void CopySelection(ClipboardType t = Secondary);
 
     void 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:
 protected:

-    // 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)
+    // 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;
     // parser which is used to parse HTML input.
     // Each wxHtmlWindow has it's own parser because sharing one global
     wxHtmlContainerCell *m_Cell;
     // parser which is used to parse HTML input.
     // Each wxHtmlWindow has it's own parser because sharing one global


@@ -275,11 +289,24 @@ protected:
     // true if the user is dragging mouse to select text
     bool m_makingSelection;
 
     // true if the user is dragging mouse to select text
     bool m_makingSelection;
 

+#if wxUSE_CLIPBOARD
+    // time of the last doubleclick event, used to detect tripleclicks
+    // (tripleclicks are used to select whole line):
+    wxLongLong m_lastDoubleClick;
+
+    // helper class to automatically scroll the window if the user is selecting
+    // text and the mouse leaves wxHtmlWindow:
+    wxHtmlWinAutoScrollTimer *m_timerAutoScroll;
+#endif // wxUSE_CLIPBOARD
+

 private:
 private:

+    // window content for double buffered rendering:
+    wxBitmap *m_backBuffer;
+

     // variables used when user is selecting text
     wxPoint     m_tmpSelFromPos;
     wxHtmlCell *m_tmpSelFromCell;
     // variables used when user is selecting text
     wxPoint     m_tmpSelFromPos;
     wxHtmlCell *m_tmpSelFromCell;

-    
+

     // a flag indicated if mouse moved
     // (if TRUE we will try to change cursor in last call to OnIdle)
     bool m_tmpMouseMoved;
     // a flag indicated if mouse moved
     // (if TRUE we will try to change cursor in last call to OnIdle)
     bool m_tmpMouseMoved;


@@ -296,9 +323,6 @@ private:
     // this filter is used when no filter is able to read some file
     static wxHtmlFilter *m_DefaultFilter;
 
     // this filter is used when no filter is able to read some file
     static wxHtmlFilter *m_DefaultFilter;
 

-    static wxCursor *s_cur_hand;
-    static wxCursor *s_cur_arrow;
-

     wxHtmlHistoryArray *m_History;
     // browser history
     int m_HistoryPos;
     wxHtmlHistoryArray *m_History;
     // browser history
     int m_HistoryPos;


@@ -314,7 +338,7 @@ private:
 };
 
 
 };
 
 

-#endif
+#endif // wxUSE_HTML

 
 #endif // _WX_HTMLWIN_H_
 
 
 #endif // _WX_HTMLWIN_H_