cleaned up the checkbox creation code (~70 lines of code became 3)

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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index cb590108cbf6988ca8d2c6b9bbc1dab649c65b6a..4c33a1a32ad2b7d1be9294b9912ad6fab3580f94 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -25,6 +25,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_GRID
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"


@@ -123,7 +125,7 @@ wxGenericGrid::wxGenericGrid()
   m_cellBackgroundColour = *wxWHITE;
   m_labelTextColour = *wxBLACK;
 //  m_labelBackgroundColour = *wxLIGHT_GREY;
   m_cellBackgroundColour = *wxWHITE;
   m_labelTextColour = *wxBLACK;
 //  m_labelBackgroundColour = *wxLIGHT_GREY;

-  m_labelBackgroundColour = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+  m_labelBackgroundColour = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );

   m_labelBackgroundBrush = wxNullBrush;
   m_labelTextFont = wxNullFont;
   m_cellTextFont = wxNullFont;
   m_labelBackgroundBrush = wxNullBrush;
   m_labelTextFont = wxNullFont;
   m_cellTextFont = wxNullFont;


@@ -136,9 +138,9 @@ wxGenericGrid::wxGenericGrid()
   m_inScroll = FALSE;
 
 #if defined(__WIN95__)
   m_inScroll = FALSE;
 
 #if defined(__WIN95__)

-  m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+  m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-  m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+  m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

 #else
   m_scrollWidth = 16;
 #endif
 #else
   m_scrollWidth = 16;
 #endif


@@ -193,7 +195,7 @@ bool wxGenericGrid::Create(wxWindow *parent,
   m_cellBackgroundColour = *wxWHITE;
   m_labelTextColour = *wxBLACK;
 //  m_labelBackgroundColour = *wxLIGHT_GREY;
   m_cellBackgroundColour = *wxWHITE;
   m_labelTextColour = *wxBLACK;
 //  m_labelBackgroundColour = *wxLIGHT_GREY;

-  m_labelBackgroundColour = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+  m_labelBackgroundColour = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );

   m_labelBackgroundBrush = wxNullBrush;
   m_labelTextFont = * wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxBOLD);
   m_cellTextFont = * wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
   m_labelBackgroundBrush = wxNullBrush;
   m_labelTextFont = * wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxBOLD);
   m_cellTextFont = * wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);


@@ -204,9 +206,9 @@ bool wxGenericGrid::Create(wxWindow *parent,
   m_inOnTextInPlace = FALSE;
   m_inScroll = FALSE;
 #if defined(__WIN95__)
   m_inOnTextInPlace = FALSE;
   m_inScroll = FALSE;
 #if defined(__WIN95__)

-  m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+  m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-  m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+  m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

 #else
   m_scrollWidth = 16;
 #endif
 #else
   m_scrollWidth = 16;
 #endif


@@ -2852,3 +2854,4 @@ void *wxGenericGrid::GetCellData(int row, int col)
     return rc;
 }
 
     return rc;
 }
 

+#endif // wxUSE_GRID