Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / audio_mapping_view.cc

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index b7324911b48319b38ee0ea4c77437d29faabdc3f..407abb503b801173565571936d47b32afe2c641c 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -32,6 +32,7 @@
 #include <wx/renderer.h>
 #include <wx/grid.h>
 #include <boost/lexical_cast.hpp>
+#include <iostream>
 
 using std::cout;
 using std::list;
@@ -79,7 +80,7 @@ public:
                dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID));
                dc.DrawRectangle (wxRect (rect.GetLeft() + xo, rect.GetTop() + yo, INDICATOR_SIZE, INDICATOR_SIZE));
 
-               float const value = lexical_cast<float> (wx_to_std (grid.GetCellValue (row, col)));
+               float const value = raw_convert<float> (wx_to_std (grid.GetCellValue (row, col)));
                float const value_dB = 20 * log10 (value);
                int const range = 18;
                int height = 0;
@@ -135,6 +136,7 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
        Bind (wxEVT_GRID_CELL_LEFT_CLICK, boost::bind (&AudioMappingView::left_click, this, _1));
        Bind (wxEVT_GRID_CELL_RIGHT_CLICK, boost::bind (&AudioMappingView::right_click, this, _1));
        _grid->GetGridWindow()->Bind (wxEVT_MOTION, boost::bind (&AudioMappingView::mouse_moved, this, _1));
+       Bind (wxEVT_SIZE, boost::bind (&AudioMappingView::sized, this, _1));
 
        _menu = new wxMenu;
        _menu->Append (ID_off, _("Off"));
@@ -324,3 +326,10 @@ AudioMappingView::mouse_moved (wxMouseEvent& ev)
 
         ev.Skip ();
 }
+
+void
+AudioMappingView::sized (wxSizeEvent& ev)
+{
+       _grid->AutoSize ();
+       ev.Skip ();
+}