SelectColour() works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c539ab556d
commit
428db2ea5a
@ -369,7 +369,7 @@ void MyFrame::PrepareDC(wxDC& dc)
|
|||||||
dc.SetMapMode( m_mapMode );
|
dc.SetMapMode( m_mapMode );
|
||||||
dc.SetUserScale( m_xUserScale, m_yUserScale );
|
dc.SetUserScale( m_xUserScale, m_yUserScale );
|
||||||
dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
|
dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
|
||||||
dc.SetAxisOrientation( m_xAxisReversed, m_yAxisReversed );
|
dc.SetAxisOrientation( !m_xAxisReversed, m_yAxisReversed );
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyFrame::OnPaint(wxPaintEvent &WXUNUSED(event) )
|
void MyFrame::OnPaint(wxPaintEvent &WXUNUSED(event) )
|
||||||
@ -420,7 +420,7 @@ wxColour MyFrame::SelectColour()
|
|||||||
|
|
||||||
if ( dialog.ShowModal() == wxID_OK )
|
if ( dialog.ShowModal() == wxID_OK )
|
||||||
{
|
{
|
||||||
col = data.GetColour();
|
col = dialog.GetColourData().GetColour();
|
||||||
}
|
}
|
||||||
|
|
||||||
return col;
|
return col;
|
||||||
|
Loading…
Reference in New Issue
Block a user