Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate GTK 2/3 version of BitmapProviderDefault

Browse Source 
No real changes, just move the trivial GTK 2 stab out of the way.
This commit is contained in:
Vadim Zeitlin
2021-10-16 16:56:31 +02:00
parent 6fb64da922
commit eb54c65e24
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/image_gtk.cpp
View File

@@ -15,23 +15,20 @@
namespace namespace
{ {
#ifdef __WXGTK3__
// Default provider for HiDPI common case // Default provider for HiDPI common case
struct BitmapProviderDefault: wxGtkImage::BitmapProvider struct BitmapProviderDefault: wxGtkImage::BitmapProvider
{ {
#ifdef __WXGTK3__
BitmapProviderDefault(wxWindow* win) : m_win(win) { } BitmapProviderDefault(wxWindow* win) : m_win(win) { }
virtual wxBitmap Get() const wxOVERRIDE; virtual wxBitmap Get() const wxOVERRIDE;
virtual void Set(const wxBitmap& bitmap) wxOVERRIDE; virtual void Set(const wxBitmap& bitmap) wxOVERRIDE;
wxWindow* const m_win; wxWindow* const m_win;
wxBitmap m_bitmap; wxBitmap m_bitmap;
wxBitmap m_bitmapDisabled; wxBitmap m_bitmapDisabled;
#else
BitmapProviderDefault(wxWindow*) { }
virtual wxBitmap Get() const wxOVERRIDE { return wxBitmap(); }
#endif
}; };
#ifdef __WXGTK3__
wxBitmap BitmapProviderDefault::Get() const wxBitmap BitmapProviderDefault::Get() const
{ {
return (m_win == NULL || m_win->IsEnabled()) ? m_bitmap : m_bitmapDisabled; return (m_win == NULL || m_win->IsEnabled()) ? m_bitmap : m_bitmapDisabled;
@@ -48,7 +45,18 @@ void BitmapProviderDefault::Set(const wxBitmap& bitmap)
m_bitmapDisabled = bitmap.CreateDisabled(); m_bitmapDisabled = bitmap.CreateDisabled();
} }
} }
#endif // __WXGTK3__
#else // !__WXGTK3__
// Trivial version for GTK < 3 which doesn't provide any high DPI support.
struct BitmapProviderDefault: wxGtkImage::BitmapProvider
{
BitmapProviderDefault(wxWindow*) { }
virtual wxBitmap Get() const wxOVERRIDE { return wxBitmap(); }
};
#endif // __WXGTK3__/!__WXGTK3__
} // namespace } // namespace
extern "C" { extern "C" {