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

improve cursor and color implementation in wxqt

Browse Source
This commit is contained in:
Sean D'Epagnier
2016-08-24 22:04:59 -04:00
committed by Vadim Zeitlin
parent 9f39eeb5e9
commit 88e134ef81
14 changed files with 141 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/brush.cpp
View File

@@ -95,7 +95,7 @@ wxBrush::wxBrush()
wxBrush::wxBrush(const wxColour& col, wxBrushStyle style )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA.setColor(col.GetHandle());
M_BRUSHDATA.setColor(col.GetQColor());
M_BRUSHDATA.setStyle(ConvertBrushStyle(style));
M_STYLEDATA = style;
}
@@ -103,7 +103,7 @@ wxBrush::wxBrush(const wxColour& col, wxBrushStyle style )
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData();
M_BRUSHDATA.setColor(col.GetHandle());
M_BRUSHDATA.setColor(col.GetQColor());
M_BRUSHDATA.setStyle(ConvertBrushStyle((wxBrushStyle)style));
M_STYLEDATA = (wxBrushStyle)style;
}
@@ -122,7 +122,7 @@ wxBrush::wxBrush(const wxBitmap& stipple)
void wxBrush::SetColour(const wxColour& col)
{
AllocExclusive();
M_BRUSHDATA.setColor(col.GetHandle());
M_BRUSHDATA.setColor(col.GetQColor());
}
void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)