X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c105dda0810d927d8531e4949ada0b407a1cbebd..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/generic/hyperlinkg.cpp?ds=sidebyside diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp index 573c18d178..07b9b2468f 100644 --- a/src/generic/hyperlinkg.cpp +++ b/src/generic/hyperlinkg.cpp @@ -62,6 +62,9 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, // do validation checks: CheckParams(label, url, style); + if ((style & wxHL_ALIGN_LEFT) == 0) + style |= wxFULL_REPAINT_ON_RESIZE; + if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name)) return false; @@ -94,7 +97,6 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, // with GTK+'s native handling): Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) ); - Connect( wxEVT_SIZE, wxSizeEventHandler(wxGenericHyperlinkCtrl::OnSize) ); Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) ); Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) ); @@ -145,7 +147,7 @@ void wxGenericHyperlinkCtrl::SetVisitedColour(const wxColour &colour) void wxGenericHyperlinkCtrl::DoContextMenu(const wxPoint &pos) { wxMenu *menuPopUp = new wxMenu(wxEmptyString, wxMENU_TEAROFF); - menuPopUp->Append(wxHYPERLINK_POPUP_COPY_ID, wxT("Copy URL")); + menuPopUp->Append(wxHYPERLINK_POPUP_COPY_ID, _("&Copy URL")); PopupMenu( menuPopUp, pos ); delete menuPopUp; } @@ -259,11 +261,4 @@ void wxGenericHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) ) #endif // wxUSE_CLIPBOARD } -void wxGenericHyperlinkCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - // update the position of the label in the screen respecting - // the selected align flag - Refresh(); -} - #endif // wxUSE_HYPERLINKCTRL