| @@ -67137,7 +67137,7 @@ void OldSchoolLookAndFeel::drawButtonBackground (Graphics& g, | |||||
| void OldSchoolLookAndFeel::drawTickBox (Graphics& g, | void OldSchoolLookAndFeel::drawTickBox (Graphics& g, | ||||
| Component& /*component*/, | Component& /*component*/, | ||||
| int x, int y, int w, int h, | |||||
| float x, float y, float w, float h, | |||||
| const bool ticked, | const bool ticked, | ||||
| const bool isEnabled, | const bool isEnabled, | ||||
| const bool /*isMouseOverButton*/, | const bool /*isMouseOverButton*/, | ||||
| @@ -67149,8 +67149,7 @@ void OldSchoolLookAndFeel::drawTickBox (Graphics& g, | |||||
| g.setColour (isEnabled ? Colours::blue.withAlpha (isButtonDown ? 0.3f : 0.1f) | g.setColour (isEnabled ? Colours::blue.withAlpha (isButtonDown ? 0.3f : 0.1f) | ||||
| : Colours::lightgrey.withAlpha (0.1f)); | : Colours::lightgrey.withAlpha (0.1f)); | ||||
| AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f) | |||||
| .translated ((float) x, (float) y)); | |||||
| AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f).translated (x, y)); | |||||
| g.fillPath (box, trans); | g.fillPath (box, trans); | ||||
| @@ -67182,8 +67181,8 @@ void OldSchoolLookAndFeel::drawToggleButton (Graphics& g, | |||||
| const int tickWidth = jmin (20, button.getHeight() - 4); | const int tickWidth = jmin (20, button.getHeight() - 4); | ||||
| drawTickBox (g, button, 4, (button.getHeight() - tickWidth) / 2, | |||||
| tickWidth, tickWidth, | |||||
| drawTickBox (g, button, 4.0f, (button.getHeight() - tickWidth) * 0.5f, | |||||
| (float) tickWidth, (float) tickWidth, | |||||
| button.getToggleState(), | button.getToggleState(), | ||||
| button.isEnabled(), | button.isEnabled(), | ||||
| isMouseOverButton, | isMouseOverButton, | ||||
| @@ -217258,7 +217257,7 @@ public: | |||||
| HRESULT __stdcall GetData (FORMATETC __RPC_FAR* pFormatEtc, STGMEDIUM __RPC_FAR* pMedium) | HRESULT __stdcall GetData (FORMATETC __RPC_FAR* pFormatEtc, STGMEDIUM __RPC_FAR* pMedium) | ||||
| { | { | ||||
| if (pFormatEtc->tymed == format->tymed | |||||
| if ((pFormatEtc->tymed & format->tymed) != 0 | |||||
| && pFormatEtc->cfFormat == format->cfFormat | && pFormatEtc->cfFormat == format->cfFormat | ||||
| && pFormatEtc->dwAspect == format->dwAspect) | && pFormatEtc->dwAspect == format->dwAspect) | ||||
| { | { | ||||
| @@ -25320,7 +25320,7 @@ public: | |||||
| virtual void drawTickBox (Graphics& g, | virtual void drawTickBox (Graphics& g, | ||||
| Component& component, | Component& component, | ||||
| int x, int y, int w, int h, | |||||
| float x, float y, float w, float h, | |||||
| const bool ticked, | const bool ticked, | ||||
| const bool isEnabled, | const bool isEnabled, | ||||
| const bool isMouseOverButton, | const bool isMouseOverButton, | ||||
| @@ -110,7 +110,7 @@ void OldSchoolLookAndFeel::drawButtonBackground (Graphics& g, | |||||
| void OldSchoolLookAndFeel::drawTickBox (Graphics& g, | void OldSchoolLookAndFeel::drawTickBox (Graphics& g, | ||||
| Component& /*component*/, | Component& /*component*/, | ||||
| int x, int y, int w, int h, | |||||
| float x, float y, float w, float h, | |||||
| const bool ticked, | const bool ticked, | ||||
| const bool isEnabled, | const bool isEnabled, | ||||
| const bool /*isMouseOverButton*/, | const bool /*isMouseOverButton*/, | ||||
| @@ -122,8 +122,7 @@ void OldSchoolLookAndFeel::drawTickBox (Graphics& g, | |||||
| g.setColour (isEnabled ? Colours::blue.withAlpha (isButtonDown ? 0.3f : 0.1f) | g.setColour (isEnabled ? Colours::blue.withAlpha (isButtonDown ? 0.3f : 0.1f) | ||||
| : Colours::lightgrey.withAlpha (0.1f)); | : Colours::lightgrey.withAlpha (0.1f)); | ||||
| AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f) | |||||
| .translated ((float) x, (float) y)); | |||||
| AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f).translated (x, y)); | |||||
| g.fillPath (box, trans); | g.fillPath (box, trans); | ||||
| @@ -155,8 +154,8 @@ void OldSchoolLookAndFeel::drawToggleButton (Graphics& g, | |||||
| const int tickWidth = jmin (20, button.getHeight() - 4); | const int tickWidth = jmin (20, button.getHeight() - 4); | ||||
| drawTickBox (g, button, 4, (button.getHeight() - tickWidth) / 2, | |||||
| tickWidth, tickWidth, | |||||
| drawTickBox (g, button, 4.0f, (button.getHeight() - tickWidth) * 0.5f, | |||||
| (float) tickWidth, (float) tickWidth, | |||||
| button.getToggleState(), | button.getToggleState(), | ||||
| button.isEnabled(), | button.isEnabled(), | ||||
| isMouseOverButton, | isMouseOverButton, | ||||
| @@ -61,7 +61,7 @@ public: | |||||
| virtual void drawTickBox (Graphics& g, | virtual void drawTickBox (Graphics& g, | ||||
| Component& component, | Component& component, | ||||
| int x, int y, int w, int h, | |||||
| float x, float y, float w, float h, | |||||
| const bool ticked, | const bool ticked, | ||||
| const bool isEnabled, | const bool isEnabled, | ||||
| const bool isMouseOverButton, | const bool isMouseOverButton, | ||||
| @@ -2960,7 +2960,7 @@ public: | |||||
| HRESULT __stdcall GetData (FORMATETC __RPC_FAR* pFormatEtc, STGMEDIUM __RPC_FAR* pMedium) | HRESULT __stdcall GetData (FORMATETC __RPC_FAR* pFormatEtc, STGMEDIUM __RPC_FAR* pMedium) | ||||
| { | { | ||||
| if (pFormatEtc->tymed == format->tymed | |||||
| if ((pFormatEtc->tymed & format->tymed) != 0 | |||||
| && pFormatEtc->cfFormat == format->cfFormat | && pFormatEtc->cfFormat == format->cfFormat | ||||
| && pFormatEtc->dwAspect == format->dwAspect) | && pFormatEtc->dwAspect == format->dwAspect) | ||||
| { | { | ||||