diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-05-22 21:09:26 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-05-22 21:09:26 +0000 |
| commit | 54c2e44d7b37b2c3efc449e054eef21fa414dfde (patch) | |
| tree | 3894ba7e10c78750c195381a861da5e8166a6bfd /wx+/image_holder.h | |
| parent | Merge branch 'b11.20' into 'master' (diff) | |
| parent | add upstream 11.21 (diff) | |
| download | FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.gz FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.bz2 FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.zip | |
Merge branch 'b11.21' into 'master'11.21
add upstream 11.21
See merge request opensource-tracking/FreeFileSync!44
Diffstat (limited to 'wx+/image_holder.h')
| -rw-r--r-- | wx+/image_holder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/image_holder.h b/wx+/image_holder.h index 32f8a863..89021045 100644 --- a/wx+/image_holder.h +++ b/wx+/image_holder.h @@ -56,8 +56,8 @@ struct FileIconHolder //- what about G_IS_FILE_ICON(gicon), G_IS_LOADABLE_ICON(gicon)? => may block! => do NOT convert on main thread! (no big deal: doesn't seem to occur in practice) FileIconHolder() {}; - FileIconHolder(GIcon* gi, int maxSz) : //takes ownership! - gicon(gi), + FileIconHolder(GIcon* icon, int maxSz) : //takes ownership! + gicon(icon), maxSize(maxSz) {} struct GiconFree { void operator()(GIcon* icon) const { ::g_object_unref(icon); } }; |