The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

[wxWidgets.git] / contrib / src / gizmos / multicell.cpp

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index 130ecd63eb38d32b3089cc15317bed990c3a7c13..8e3d257b385b9ddab2767cde208f1c4852cc0d6b 100644 (file)
--- 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);
 }
 {
     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()
 {
 //---------------------------------------------------------------------------
 int wxMultiCellItemHandle::GetColumn()
 {


@@ -653,7 +647,7 @@ void wxMultiCellCanvas :: CalculateConstraints()
             if (!m_cells[CELL_LOC(row, col)])
             {
                 // Create an empty static text field as a placeholder
             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);
         }
             }
             wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window);
         }