wxToolBarBase -> wxToolBar

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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 1526c1931819a94bfcd4987d66d8fcb3c6567a28..1ce790515b657302624401a7dd334136352f60d8 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -32,7 +32,7 @@
 #include "wx/settings.h"
 
 // Set to zero to use no double-buffering
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #define USE_DOUBLE_BUFFERING 1
 #else
 #define USE_DOUBLE_BUFFERING 0
@@ -405,7 +405,6 @@ void wxGenericGrid::SetGridClippingRegion(wxDC *dc)
 
 void wxGenericGrid::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-  wxRectangle rect;
   int w, h;
   GetClientSize(&w, &h);
 
@@ -436,7 +435,7 @@ void wxGenericGrid::OnPaint(wxPaintEvent& WXUNUSED(event))
   {
     wxPaintDC paintDC(this);
     wxMemoryDC dc(& paintDC);
-    dc.SelectObject(m_doubleBufferingBitmap);
+    dc.SelectObject(* m_doubleBufferingBitmap);
 
     PaintGrid(dc);
 
@@ -486,7 +485,7 @@ void wxGenericGrid::PaintGrid(wxDC& dc)
 
 // Erase (some of) the background.
 // Currently, a Windows-only optimisation.
-void wxGenericGrid::OnEraseBackground(wxEraseEvent& event)
+void wxGenericGrid::OnEraseBackground(wxEraseEvent& WXUNUSED(event) )
 {
     wxClientDC dc(this);
     dc.BeginDrawing();
@@ -840,7 +839,7 @@ void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int
   {
     dc->SetBrush(*cell->GetBackgroundBrush());
     dc->SetPen(*wxTRANSPARENT_PEN);
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
     dc->DrawRectangle(rect->x+1, rect->y+1, rect->width-1, rect->height-1);
 #else
     dc->DrawRectangle(rect->x+1, rect->y+1, rect->width, rect->height);
@@ -1371,7 +1370,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
 
   // Why isn't this needed for Windows??
   // Probably because of the SetValue??
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
   HighlightCell(dc);
 #endif
   dc->DestroyClippingRegion();
@@ -1751,7 +1750,7 @@ void wxGenericGrid::RefreshCell(int row, int col, bool setText)
         currentPos = TRUE;
       }
       // Gets refreshed anyway in MSW
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
       if (!currentPos)
 #endif
       {