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

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index 6c6d1069ba..b9351e00de 100644
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -4,17 +4,13 @@
 // Author:      Jonathan Bayer
 // Modified by:
 // Created:
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) Jonathan Bayer
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // This was inspired by the gbsizer class written by Alex Andruschak
 
-#ifdef __GNUG__
-    #pragma implementation "multicell.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -86,12 +82,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()
 {
@@ -208,7 +198,7 @@ bool wxMultiCellSizer::EnableGridLines(wxWindow *win)
     return true;
 }
 //---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetGridPen(wxPen *pen)
+bool wxMultiCellSizer::SetGridPen(const wxPen *pen)
 {
     m_pen = pen;
     return true;
@@ -314,8 +304,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 +444,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 +643,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);
         }
@@ -661,4 +651,3 @@ void wxMultiCellCanvas :: CalculateConstraints()
 }
 
 /*** End of File ***/
-