[lmi-commits] [5337] Use default control sizes only when necessary (VS)

[Greg Chicares]

Revision: 5337
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5337
Author:   chicares
Date:     2011-12-14 00:41:47 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Use default control sizes only when necessary (VS)

Modified Paths:
--------------
    lmi/trunk/census_view.cpp

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2011-12-14 00:38:52 UTC (rev 5336)
+++ lmi/trunk/census_view.cpp   2011-12-14 00:41:47 UTC (rev 5337)
@@ -303,12 +303,16 @@
      ,wxRect const& rect
      ,tn_range_variant_data const& data)
 {
+    // Always use default height for editor controls
+    wxRect r(rect);
+    r.height = -1;
+
     wxDatePickerCtrl* ctrl = new(wx) wxDatePickerCtrl
         (parent
         ,wxID_ANY
         ,ConvertDateToWx(value_cast<calendar_date>(data.value))
-        ,rect.GetTopLeft()
-        ,rect.GetSize());
+        ,r.GetTopLeft()
+        ,r.GetSize());
 
     ctrl->SetRange
         (ConvertDateToWx(jdn_t(static_cast<int>(data.min)))
@@ -400,12 +404,8 @@
     ctrl->input(*data->input);
     ctrl->field_name(data->field);
 
-    // Always use default height for editor controls
-    wxRect rect(labelRect);
-    rect.height = -1;
+    ctrl->SetSize(labelRect);
 
-    ctrl->SetSize(rect);
-
     return ctrl;
 }