removed src/gtk/eggtrayicon.h

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index d6d183b2044e228a8b2404837ba86ae1ccf83a44..9d0e0a9f69b26d8f37dda68b35109852ddc1570e 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -502,9 +502,11 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_colBgOld = m_control->GetBackgroundColour();
             m_control->SetBackgroundColour(attr->GetBackgroundColour());
 
             m_colBgOld = m_control->GetBackgroundColour();
             m_control->SetBackgroundColour(attr->GetBackgroundColour());
 

+           // Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)

             m_fontOld = m_control->GetFont();
             m_control->SetFont(attr->GetFont());
             m_fontOld = m_control->GetFont();
             m_control->SetFont(attr->GetFont());

-
+#endif

             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }


@@ -523,12 +525,14 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }

-
+       // Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)

         if ( m_fontOld.Ok() )
         {
             m_control->SetFont(m_fontOld);
             m_fontOld = wxNullFont;
         }
         if ( m_fontOld.Ok() )
         {
             m_control->SetFont(m_fontOld);
             m_fontOld = wxNullFont;
         }

+#endif

     }
 }
 
     }
 }
 


@@ -9541,7 +9545,7 @@ void wxGrid::SetColSize( int col, int width )
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
     if (width > GetColMinimalAcceptableWidth()) {
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
     if (width > GetColMinimalAcceptableWidth()) {

-        wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)col;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;

         m_colMinWidths[key] = width;
     }
 }
         m_colMinWidths[key] = width;
     }
 }


@@ -9549,21 +9553,21 @@ void wxGrid::SetColMinimalWidth( int col, int width )
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
     if (width > GetRowMinimalAcceptableHeight()) {
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
     if (width > GetRowMinimalAcceptableHeight()) {

-        wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)row;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;

         m_rowMinHeights[key] = width;
     }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {
         m_rowMinHeights[key] = width;
     }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {

-    wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)col;
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;

     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {
     wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {

-    wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)row;
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;

     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
     wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }