SelectColour() works

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index eb8846a16a74b1b69c02f90e6040bf9b4f36fb95..012646186d3ee63f7d71f54e43cbf44bf77d0180 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -369,7 +369,7 @@ void MyFrame::PrepareDC(wxDC& dc)
     dc.SetMapMode( m_mapMode );
     dc.SetUserScale( m_xUserScale, m_yUserScale );
     dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
     dc.SetMapMode( m_mapMode );
     dc.SetUserScale( m_xUserScale, m_yUserScale );
     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;