summaryrefslogtreecommitdiff
path: root/wx+/tooltip.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-07-22 16:56:03 +0000
committerB Stack <bgstack15@gmail.com>2020-07-22 16:56:03 +0000
commite5633fb1c0db91f01ab967330b76baf4ecdb0512 (patch)
tree10260e25ae905564f7978b83fc4e316670f987c6 /wx+/tooltip.h
parentMerge branch '10.25' into 'master' (diff)
parentadd upstream 11.0 (diff)
downloadFreeFileSync-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.h')
-rw-r--r--wx+/tooltip.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/wx+/tooltip.h b/wx+/tooltip.h
index d74beb9d..b496f36c 100644
--- a/wx+/tooltip.h
+++ b/wx+/tooltip.h
@@ -8,6 +8,7 @@
#define TOOLTIP_H_8912740832170515
#include <wx/window.h>
+#include <wx/image.h>
namespace zen
@@ -19,13 +20,14 @@ public:
void show(const wxString& text,
wxPoint mousePos, //absolute screen coordinates
- const wxBitmap* bmp = nullptr);
+ const wxImage* img = nullptr);
void hide();
private:
class TooltipDlgGenerated;
TooltipDlgGenerated* tipWindow_ = nullptr;
wxWindow& parent_;
+ wxImage lastUsedImg_;
};
}
bgstack15