From 4ecfd41e36533d858c98d051ef70cab80e69e972 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:00:50 +0200 Subject: 2.3 --- shared/customTooltip.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'shared/customTooltip.cpp') diff --git a/shared/customTooltip.cpp b/shared/customTooltip.cpp index bffaa45d..cd9fbf05 100644 --- a/shared/customTooltip.cpp +++ b/shared/customTooltip.cpp @@ -37,8 +37,7 @@ PopupFrameGenerated::PopupFrameGenerated( bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_staticTextMain = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextMain->Wrap( -1 ); - bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + bSizer158->Add( m_staticTextMain, 0, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5 ); this->SetSizer( bSizer158 ); this->Layout(); @@ -67,7 +66,10 @@ void CustomTooltip::show(const wxString& text, wxPoint pos, const wxBitmap* bmp) } if (text != tipWindow->m_staticTextMain->GetLabel()) + { tipWindow->m_staticTextMain->SetLabel(text); + tipWindow->m_staticTextMain->Wrap(600); + } #ifdef FFS_LINUX tipWindow->Fit(); //Alas Fit() seems to be somewhat broken => this needs to be called EVERY time inside show, not only if text or bmp change. -- cgit