add -mno-cygwin detection: we should treat cygwin as Windows, not Unix, when it's...

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

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index ffb360855461eb3c1c1b56034e080d1ab9636aae..21f80fc13135f1f2602ea1688640e30291a36d36 100644 (file)
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -115,10 +115,8 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     f.SetUnderlined(true);
     SetFont(f);
 
     f.SetUnderlined(true);
     SetFont(f);
 

-    CacheBestSize(DoGetBestSize());
-    SetMinSize(GetBestSize());
-    SetSize (DoGetBestSize());
-
+    SetInitialSize(size);
+    

     return true;
 }
 
     return true;
 }
 


@@ -130,14 +128,11 @@ wxSize wxHyperlinkCtrl::DoGetBestSize() const
     dc.SetFont(GetFont());
     dc.GetTextExtent(GetLabel(), &w, &h);
 
     dc.SetFont(GetFont());
     dc.GetTextExtent(GetLabel(), &w, &h);
 

-    return wxSize(w, h);
+    wxSize best(w, h);
+    CacheBestSize(best);
+    return best;

 }
 
 }
 

-void wxHyperlinkCtrl::DoGetSize(int *width, int *height) const
-{
-    if (width) *width = GetBestSize().GetWidth();
-    if (height) *height = GetBestSize().GetHeight();
-}

 
 void wxHyperlinkCtrl::SetNormalColour(const wxColour &colour)
 {
 
 void wxHyperlinkCtrl::SetNormalColour(const wxColour &colour)
 {