From e60022505d0e7606c114ee88b0c0f88d605cd6ad Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 15 Oct 2006 19:44:39 +0000 Subject: [PATCH] I don't think anylonger that DrawHeaderButton() should be used for drawing grid row/col buttons. Also, the GTK2 port should not waste space per line of wxMSW doesn' waste it neither. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/grid.h | 2 +- src/generic/grid.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 4a6f6be64e..e38563df19 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -28,7 +28,7 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[]; // #define WXGRID_DEFAULT_NUMBER_ROWS 10 #define WXGRID_DEFAULT_NUMBER_COLS 10 -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXGTK20__) #define WXGRID_DEFAULT_ROW_HEIGHT 25 #else #define WXGRID_DEFAULT_ROW_HEIGHT 30 diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index bf62e90e3e..72284e458c 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -3882,7 +3882,8 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) GetClientSize( &client_width, &client_height ); // VZ: any reason for this ifdef? (FIXME) -#ifdef __WXGTK__ +#if 0 +def __WXGTK__ wxRect rect; rect.SetX( 1 ); rect.SetY( 1 ); @@ -7798,7 +7799,8 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) wxRect rect; -#ifdef __WXGTK20__ +#if 0 +def __WXGTK20__ rect.SetX( 1 ); rect.SetY( GetRowTop(row) + 1 ); rect.SetWidth( m_rowLabelWidth - 2 ); @@ -7860,7 +7862,8 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) wxRect rect; -#ifdef __WXGTK20__ +#if 0 +def __WXGTK20__ rect.SetX( colLeft + 1 ); rect.SetY( 1 ); rect.SetWidth( GetColWidth(col) - 2 ); -- 2.45.2