Fix bug [ 1170089 ] wxGenericDirCtrl doesn't show files

[wxWidgets.git] / samples / grid / griddemo.cpp

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 86f387a6294aea39fbe42155bf173cc1b7717b3f..0fec7527516f6671d0396e40dd90dc1670ec0450 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -246,8 +246,8 @@ GridFrame::GridFrame()
                              wxTE_MULTILINE );
 
     logger = new wxLogTextCtrl( logWin );
                              wxTE_MULTILINE );
 
     logger = new wxLogTextCtrl( logWin );

-    m_logOld = logger->SetActiveTarget( logger );
-    logger->SetTimestamp( NULL );
+    m_logOld = wxLog::SetActiveTarget( logger );
+    wxLog::SetTimestamp( NULL );

 #endif // wxUSE_LOG
 
     // this will create a grid and, by default, an associated grid
 #endif // wxUSE_LOG
 
     // this will create a grid and, by default, an associated grid


@@ -722,7 +722,8 @@ void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
     {
         // Check the new Refresh function by passing it a rectangle
         // which exactly fits the grid.
     {
         // Check the new Refresh function by passing it a rectangle
         // which exactly fits the grid.

-        wxRect r(wxPoint(0, 0), grid->GetSize());
+        wxPoint pt(0, 0);
+        wxRect r(pt, grid->GetSize());

         grid->SetDefaultCellBackgroundColour(col);
         grid->Refresh(true, &r);
     }
         grid->SetDefaultCellBackgroundColour(col);
         grid->Refresh(true, &r);
     }


@@ -1349,10 +1350,6 @@ wxString BugsGridTable::GetColLabelValue( int col )
     return headers[col];
 }
 
     return headers[col];
 }
 

-BugsGridTable::BugsGridTable()
-{
-}
-

 // ----------------------------------------------------------------------------
 // BugsGridFrame
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // BugsGridFrame
 // ----------------------------------------------------------------------------