X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2d49353d4ac77775d5c513e55940175458faa1c..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/src/gizmos/multicell.cpp

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index 6c6d1069ba..8e3d257b38 100644
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -86,12 +86,6 @@ wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, wxResizable
 {
     Initialize(row, column, 1, 1, wxSize(1, 1), style, weight, align);
 }
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, int align)
-{
-    Initialize(row, column, 1, 1, wxSize(1,1), wxNOT_RESIZABLE, wxSize(1, 1), align);
-}
-
 //---------------------------------------------------------------------------
 int wxMultiCellItemHandle::GetColumn()
 {
@@ -314,8 +308,8 @@ void wxMultiCellSizer::RecalcSizes()
 
             c_size = rect->GetLocalSize();
             wxSize minSize( item->CalcMin() );
-            if (c_size.GetHeight() != wxDefaultSize.GetHeight() ||
-                c_size.GetWidth() != wxDefaultSize.GetWidth())
+            if (c_size.GetHeight() != wxDefaultCoord ||
+                c_size.GetWidth() != wxDefaultCoord)
             {
                 minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
                 minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
@@ -454,8 +448,8 @@ void wxMultiCellSizer :: GetMinimums()
 
             wxSize minSize( item->CalcMin() );
             wxSize c_size = rect->GetLocalSize();
-            if (c_size.GetHeight() != wxDefaultSize.GetHeight() ||
-                c_size.GetWidth() != wxDefaultSize.GetWidth())
+            if (c_size.GetHeight() != wxDefaultCoord ||
+                c_size.GetWidth() != wxDefaultCoord)
             {
                 minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
                 minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
@@ -653,7 +647,7 @@ void wxMultiCellCanvas :: CalculateConstraints()
             if (!m_cells[CELL_LOC(row, col)])
             {
                 // Create an empty static text field as a placeholder
-                m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, wxID_ANY, wxT("")));
+                m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, wxID_ANY, wxEmptyString));
             }
             wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window);
         }