adding includes for non-precomp

[wxWidgets.git] / src / generic / hyperlink.cpp

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index 9d96c5e2965ca1b0cd3b4419022808a73c6f0177..ffb360855461eb3c1c1b56034e080d1ab9636aae 100644 (file)
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -53,6 +53,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 // reserved for internal use only
 #define wxHYPERLINKCTRL_POPUP_COPY_ID           16384
 
 // reserved for internal use only
 #define wxHYPERLINKCTRL_POPUP_COPY_ID           16384
 

+const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
+

 // ----------------------------------------------------------------------------
 // wxHyperlinkCtrl
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxHyperlinkCtrl
 // ----------------------------------------------------------------------------


@@ -202,13 +204,13 @@ void wxHyperlinkCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 void wxHyperlinkCtrl::OnLeftDown(wxMouseEvent& event)
 {
     // the left click must start from the hyperlink rect
 void wxHyperlinkCtrl::OnLeftDown(wxMouseEvent& event)
 {
     // the left click must start from the hyperlink rect

-    m_clicking = GetLabelRect().Inside(event.GetPosition());
+    m_clicking = GetLabelRect().Contains(event.GetPosition());

 }
 
 void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
     // the click must be started and ended in the hyperlink rect
 }
 
 void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
     // the click must be started and ended in the hyperlink rect

-    if (!m_clicking || !GetLabelRect().Inside(event.GetPosition())) 
+    if (!m_clicking || !GetLabelRect().Contains(event.GetPosition())) 

         return;
 
     SetForegroundColour(m_visitedColour);
         return;
 
     SetForegroundColour(m_visitedColour);


@@ -225,7 +227,7 @@ void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 void wxHyperlinkCtrl::OnRightUp(wxMouseEvent& event)
 {
     if( GetWindowStyle() & wxHL_CONTEXTMENU )
 void wxHyperlinkCtrl::OnRightUp(wxMouseEvent& event)
 {
     if( GetWindowStyle() & wxHL_CONTEXTMENU )

-        if ( GetLabelRect().Inside(event.GetPosition()) )
+        if ( GetLabelRect().Contains(event.GetPosition()) )

             DoContextMenu(wxPoint(event.m_x, event.m_y));
 }
 
             DoContextMenu(wxPoint(event.m_x, event.m_y));
 }
 


@@ -233,7 +235,7 @@ void wxHyperlinkCtrl::OnMotion(wxMouseEvent& event)
 {
     wxRect textrc = GetLabelRect();
 
 {
     wxRect textrc = GetLabelRect();
 

-    if (textrc.Inside(event.GetPosition()))
+    if (textrc.Contains(event.GetPosition()))

     {
         SetCursor(wxCursor(wxCURSOR_HAND));
         SetForegroundColour(m_hoverColour);
     {
         SetCursor(wxCursor(wxCURSOR_HAND));
         SetForegroundColour(m_hoverColour);