mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Use wxGenericStaticBitmap on wxOSX>=3.1.0 to get mouse event

Browse source 
See https://trac.wxwidgets.org/ticket/18545
Fix wangqr/Aegisub#45
This commit is contained in:
wangqr 2020-05-06 15:32:54 -04:00
parent 839dcc5aed
commit ac88eadd78
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dialog_colorpicker.cpp
View file

@ -62,6 +62,9 @@
#ifdef __WXMAC__ #ifdef __WXMAC__
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#if wxCHECK_VERSION(3, 1, 0)
#include <wx/generic/statbmpg.h>
#endif
#endif #endif
namespace { namespace {
@ -241,7 +244,11 @@ wxDEFINE_EVENT(EVT_RECENT_SELECT, ValueEvent<agi::Color>);
/// @class ColorPickerRecent /// @class ColorPickerRecent
/// @brief A grid of recently used colors which can be selected by clicking on them /// @brief A grid of recently used colors which can be selected by clicking on them
#if wxCHECK_VERSION(3, 1, 0) && defined(__WXMAC__)
class ColorPickerRecent final : public wxGenericStaticBitmap {
#else
class ColorPickerRecent final : public wxStaticBitmap { class ColorPickerRecent final : public wxStaticBitmap {
#endif
int rows; ///< Number of rows of colors int rows; ///< Number of rows of colors
int cols; ///< Number of cols of colors int cols; ///< Number of cols of colors
int cellsize; ///< Width/Height of each cell int cellsize; ///< Width/Height of each cell
@ -290,7 +297,11 @@ class ColorPickerRecent final : public wxStaticBitmap {
public: public:
ColorPickerRecent(wxWindow *parent, int cols, int rows, int cellsize) ColorPickerRecent(wxWindow *parent, int cols, int rows, int cellsize)
#if wxCHECK_VERSION(3, 1, 0) && defined(__WXMAC__)
: wxGenericStaticBitmap(parent, -1, wxBitmap(), wxDefaultPosition, wxDefaultSize, STATIC_BORDER_FLAG)
#else
: wxStaticBitmap(parent, -1, wxBitmap(), wxDefaultPosition, wxDefaultSize, STATIC_BORDER_FLAG) : wxStaticBitmap(parent, -1, wxBitmap(), wxDefaultPosition, wxDefaultSize, STATIC_BORDER_FLAG)
#endif
, rows(rows) , rows(rows)
, cols(cols) , cols(cols)
, cellsize(cellsize) , cellsize(cellsize)
@ -462,7 +473,11 @@ class DialogColorPicker final : public wxDialog {
ColorPickerScreenDropper *screen_dropper; ColorPickerScreenDropper *screen_dropper;
#if wxCHECK_VERSION(3, 1, 0) && defined(__WXMAC__)
wxGenericStaticBitmap* screen_dropper_icon;
#else
wxStaticBitmap *screen_dropper_icon; wxStaticBitmap *screen_dropper_icon;
#endif
/// Update all other controls as a result of modifying an RGB control /// Update all other controls as a result of modifying an RGB control
void UpdateFromRGB(bool dirty = true); void UpdateFromRGB(bool dirty = true);
@ -591,7 +606,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,
eyedropper_bitmap = GETIMAGE(eyedropper_tool_24); eyedropper_bitmap = GETIMAGE(eyedropper_tool_24);
#endif #endif
eyedropper_bitmap.SetMask(new wxMask(eyedropper_bitmap, wxColour(255, 0, 255))); eyedropper_bitmap.SetMask(new wxMask(eyedropper_bitmap, wxColour(255, 0, 255)));
#if wxCHECK_VERSION(3, 1, 0) && defined(__WXMAC__)
screen_dropper_icon = new wxGenericStaticBitmap(this, -1, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
#else
screen_dropper_icon = new wxStaticBitmap(this, -1, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER); screen_dropper_icon = new wxStaticBitmap(this, -1, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
#endif
screen_dropper = new ColorPickerScreenDropper(this, 7, 7, 8); screen_dropper = new ColorPickerScreenDropper(this, 7, 7, 8);
// Arrange the controls in a nice way // Arrange the controls in a nice way