diff options
| author | B Stack <bgstack15@gmail.com> | 2020-07-22 16:56:03 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-07-22 16:56:03 +0000 |
| commit | e5633fb1c0db91f01ab967330b76baf4ecdb0512 (patch) | |
| tree | 10260e25ae905564f7978b83fc4e316670f987c6 /wx+/tooltip.cpp | |
| parent | Merge branch '10.25' into 'master' (diff) | |
| parent | add upstream 11.0 (diff) | |
| download | FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.tar.gz FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.tar.bz2 FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.zip | |
Merge branch '11.0' into 'master'11.0
add upstream 11.0
See merge request opensource-tracking/FreeFileSync!24
Diffstat (limited to 'wx+/tooltip.cpp')
| -rw-r--r-- | wx+/tooltip.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp index 0beef0bf..e3c021c6 100644 --- a/wx+/tooltip.cpp +++ b/wx+/tooltip.cpp @@ -54,16 +54,17 @@ public: }; -void Tooltip::show(const wxString& text, wxPoint mousePos, const wxBitmap* bmp) +void Tooltip::show(const wxString& text, wxPoint mousePos, const wxImage* img) { if (!tipWindow_) tipWindow_ = new TooltipDlgGenerated(&parent_); //ownership passed to parent - const wxBitmap& newBmp = bmp ? *bmp : wxNullBitmap; + const wxImage& newImg = img ? *img : wxNullImage; - if (!tipWindow_->bitmapLeft_->GetBitmap().IsSameAs(newBmp)) + if (!lastUsedImg_.IsSameAs(newImg)) { - tipWindow_->bitmapLeft_->SetBitmap(newBmp); + lastUsedImg_ = newImg; + tipWindow_->bitmapLeft_->SetBitmap(newImg); tipWindow_->Refresh(); //needed if bitmap size changed! } |