Moved wxGLCanvas to more normal positions

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index f394d696806f383d26e7b8cbab6059c508fb96a0..0fd05a4d01d97e490e1face4d3ab492400d60648 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -59,11 +59,13 @@ class WXDLLEXPORT HtmlHistoryItem : public wxObject
 
 WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
 
 
 WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
 

-
+class wxHtmlWinModule;

 
 class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
 
 class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)

+    
+    friend class wxHtmlWinModule;

 
     public:
         wxHtmlWindow() : wxScrolledWindow() {};
 
     public:
         wxHtmlWindow() : wxScrolledWindow() {};


@@ -92,7 +94,8 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 
         wxString GetOpenedPage() const {return m_OpenedPage;}
                 // Returns full location of opened page
 
         wxString GetOpenedPage() const {return m_OpenedPage;}
                 // Returns full location of opened page

-
+        wxString GetOpenedAnchor() const {return m_OpenedAnchor;}
+                // Returns anchor within opened page

         wxString GetOpenedPageTitle() const {return m_OpenedPageTitle;}
                 // Returns <TITLE> of opened page or empty string otherwise
 
         wxString GetOpenedPageTitle() const {return m_OpenedPageTitle;}
                 // Returns <TITLE> of opened page or empty string otherwise
 


@@ -136,13 +139,10 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         static void AddFilter(wxHtmlFilter *filter);
                 // Adds input filter
 
         static void AddFilter(wxHtmlFilter *filter);
                 // Adds input filter
 

-        virtual void OnLinkClicked(wxHtmlLinkInfo *link);
+        virtual void OnLinkClicked(const wxHtmlLinkInfo& link);

                 // called when users clicked on hypertext link. Default behavior is to
                 // call LoadPage(loc)
 
                 // called when users clicked on hypertext link. Default behavior is to
                 // call LoadPage(loc)
 

-       static void CleanUpStatics();
-               // cleans static variables
-

         wxHtmlWinParser *GetParser() const { return m_Parser; }
                 // return a pointer to the parser.
 
         wxHtmlWinParser *GetParser() const { return m_Parser; }
                 // return a pointer to the parser.
 


@@ -161,11 +161,13 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         void OnSize(wxSizeEvent& event);
         void OnMouseEvent(wxMouseEvent& event);
         void OnIdle(wxIdleEvent& event);
         void OnSize(wxSizeEvent& event);
         void OnMouseEvent(wxMouseEvent& event);
         void OnIdle(wxIdleEvent& event);

-        void OnKeyDown(wxKeyEvent& event);

 
 

-       virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
+        virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}

                // returns new filter (will be stored into m_DefaultFilter variable)
 
                // returns new filter (will be stored into m_DefaultFilter variable)
 

+        static void CleanUpStatics();
+               // cleans static variables
+

 
     protected:
         wxHtmlContainerCell *m_Cell;
 
     protected:
         wxHtmlContainerCell *m_Cell;


@@ -204,13 +206,16 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
                 // contains last link name
         int m_tmpCanDrawLocks;
                 // if >0 contents of the window is not redrawn
                 // contains last link name
         int m_tmpCanDrawLocks;
                 // if >0 contents of the window is not redrawn

-                // (in order to avoid ugly bliking)
+                // (in order to avoid ugly blinking)

 
         static wxList m_Filters;
                 // list of HTML filters
         static wxHtmlFilter *m_DefaultFilter;
                 // this filter is used when no filter is able to read some file
 
 
         static wxList m_Filters;
                 // list of HTML filters
         static wxHtmlFilter *m_DefaultFilter;
                 // this filter is used when no filter is able to read some file
 

+        static wxCursor *s_cur_hand;
+        static wxCursor *s_cur_arrow;
+

         HtmlHistoryArray m_History;
         int m_HistoryPos;
                 // browser history
         HtmlHistoryArray m_History;
         int m_HistoryPos;
                 // browser history