#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/log.h"
- #include "wx/sizer.h"
#endif
+#include "wx/textfile.h"
#include "wx/generic/grid.h"
+// ----------------------------------------------------------------------------
+// array classes instantiation
+// ----------------------------------------------------------------------------
+
+struct wxGridCellWithAttr
+{
+ wxGridCellWithAttr(int row, int col, const wxGridCellAttr *pAttr)
+ : coords(row, col), attr(*pAttr)
+ {
+ }
+
+ wxGridCellCoords coords;
+ wxGridCellAttr attr;
+};
+
+WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
+WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
+{
+public:
+ wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
+ wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size );
+
+private:
+ wxGrid *m_owner;
+
+ void OnPaint( wxPaintEvent& event );
+ void OnMouseEvent( wxMouseEvent& event );
+ void OnKeyDown( wxKeyEvent& event );
+
+ DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
+ DECLARE_EVENT_TABLE()
+};
+
+
+class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
+{
+public:
+ wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
+ wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size );
+
+private:
+ wxGrid *m_owner;
+
+ void OnPaint( wxPaintEvent &event );
+ void OnMouseEvent( wxMouseEvent& event );
+ void OnKeyDown( wxKeyEvent& event );
+
+ DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
+ DECLARE_EVENT_TABLE()
+};
+
+
+class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
+{
+public:
+ wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
+ wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size );
+
+private:
+ wxGrid *m_owner;
+
+ void OnMouseEvent( wxMouseEvent& event );
+ void OnKeyDown( wxKeyEvent& event );
+ void OnPaint( wxPaintEvent& event );
+
+ DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
+ DECLARE_EVENT_TABLE()
+};
+
+class WXDLLEXPORT wxGridWindow : public wxPanel
+{
+public:
+ wxGridWindow()
+ {
+ m_owner = (wxGrid *)NULL;
+ m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
+ m_colLabelWin = (wxGridColLabelWindow *)NULL;
+ }
+
+ wxGridWindow( wxGrid *parent,
+ wxGridRowLabelWindow *rowLblWin,
+ wxGridColLabelWindow *colLblWin,
+ wxWindowID id, const wxPoint &pos, const wxSize &size );
+ ~wxGridWindow();
+
+ void ScrollWindow( int dx, int dy, const wxRect *rect );
+
+private:
+ wxGrid *m_owner;
+ wxGridRowLabelWindow *m_rowLabelWin;
+ wxGridColLabelWindow *m_colLabelWin;
+
+ void OnPaint( wxPaintEvent &event );
+ void OnMouseEvent( wxMouseEvent& event );
+ void OnKeyDown( wxKeyEvent& );
+
+ DECLARE_DYNAMIC_CLASS(wxGridWindow)
+ DECLARE_EVENT_TABLE()
+};
+
+// the internal data representation used by wxGridCellAttrProvider
+//
+// TODO make it more efficient
+class WXDLLEXPORT wxGridCellAttrProviderData
+{
+public:
+ void SetAttr(const wxGridCellAttr *attr, int row, int col);
+ wxGridCellAttr *GetAttr(int row, int col) const;
+
+private:
+ // searches for the attr for given cell, returns wxNOT_FOUND if not found
+ int FindIndex(int row, int col) const;
+
+ wxGridCellWithAttrArray m_attrs;
+};
+
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#ifndef WXGRID_DRAW_LINES
+#define WXGRID_DRAW_LINES 1
+#endif
//////////////////////////////////////////////////////////////////////
wxGridCellCoords wxGridNoCellCoords( -1, -1 );
wxRect wxGridNoCellRect( -1, -1, -1, -1 );
-// this is a magic incantation which must be done!
-#include "wx/arrimpl.cpp"
+// scroll line size
+// TODO: fixed so far - make configurable later (and also different for x/y)
+static const size_t GRID_SCROLL_LINE = 10;
-WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
+// ----------------------------------------------------------------------------
+// wxGridCellAttrProviderData
+// ----------------------------------------------------------------------------
+
+void wxGridCellAttrProviderData::SetAttr(const wxGridCellAttr *attr,
+ int row, int col)
+{
+ int n = FindIndex(row, col);
+ if ( n == wxNOT_FOUND )
+ {
+ // add the attribute
+ m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+ }
+ else
+ {
+ if ( attr )
+ {
+ // change the attribute
+ m_attrs[(size_t)n].attr = *attr;
+ }
+ else
+ {
+ // remove this attribute
+ m_attrs.RemoveAt((size_t)n);
+ }
+ }
+
+ delete attr;
+}
+
+wxGridCellAttr *wxGridCellAttrProviderData::GetAttr(int row, int col) const
+{
+ wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ int n = FindIndex(row, col);
+ if ( n != wxNOT_FOUND )
+ {
+ attr = new wxGridCellAttr(m_attrs[(size_t)n].attr);
+ }
+
+ return attr;
+}
+
+int wxGridCellAttrProviderData::FindIndex(int row, int col) const
+{
+ size_t count = m_attrs.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ const wxGridCellCoords& coords = m_attrs[n].coords;
+ if ( (coords.GetRow() == row) && (coords.GetCol() == col) )
+ {
+ return n;
+ }
+ }
+
+ return wxNOT_FOUND;
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellAttrProvider
+// ----------------------------------------------------------------------------
+
+wxGridCellAttrProvider::wxGridCellAttrProvider()
+{
+ m_data = (wxGridCellAttrProviderData *)NULL;
+}
+
+wxGridCellAttrProvider::~wxGridCellAttrProvider()
+{
+ delete m_data;
+}
+
+void wxGridCellAttrProvider::InitData()
+{
+ m_data = new wxGridCellAttrProviderData;
+}
+
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const
+{
+ return m_data ? m_data->GetAttr(row, col) : (wxGridCellAttr *)NULL;
+}
+
+void wxGridCellAttrProvider::SetAttr(const wxGridCellAttr *attr,
+ int row, int col)
+{
+ if ( !m_data )
+ InitData();
+
+ m_data->SetAttr(attr, row, col);
+}
//////////////////////////////////////////////////////////////////////
//
wxGridTableBase::wxGridTableBase()
- : wxObject()
{
m_view = (wxGrid *) NULL;
+ m_attrProvider = (wxGridCellAttrProvider *) NULL;
}
wxGridTableBase::~wxGridTableBase()
{
+ delete m_attrProvider;
+}
+
+void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider)
+{
+ delete m_attrProvider;
+ m_attrProvider = attrProvider;
}
+wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
+{
+ if ( m_attrProvider )
+ return m_attrProvider->GetAttr(row, col);
+ else
+ return (wxGridCellAttr *)NULL;
+}
+
+void wxGridTableBase::SetAttr(const wxGridCellAttr *attr, int row, int col )
+{
+ if ( m_attrProvider )
+ {
+ m_attrProvider->SetAttr(attr, row, col);
+ }
+ else
+ {
+ // as we take ownership of the pointer and don't store it, we must
+ // free it now
+ delete attr;
+ }
+}
bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
{
- wxLogWarning( wxT("Called grid table class function InsertRows(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numRows );
+ wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
+ "but your derived table class does not override this function") );
return FALSE;
}
bool wxGridTableBase::AppendRows( size_t numRows )
{
- wxLogWarning( wxT("Called grid table class function AppendRows(N=%d)\n"
- "but your derived table class does not override this function"),
- numRows );
+ wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
{
- wxLogWarning( wxT("Called grid table class function DeleteRows(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numRows );
+ wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
{
- wxLogWarning( wxT("Called grid table class function InsertCols(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numCols );
+ wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::AppendCols( size_t numCols )
{
- wxLogWarning( wxT("Called grid table class function AppendCols(N=%d)\n"
- "but your derived table class does not override this function"),
- numCols );
+ wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
{
- wxLogWarning( wxT("Called grid table class function DeleteCols(pos=%d, N=%d)\n"
- "but your derived table class does not override this function"),
- pos, numCols );
+ wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
+ "but your derived table class does not override this function"));
return FALSE;
}
unsigned int i, n;
for ( n = 1; ; n++ )
{
- s += ('A' + (char)( col%26 ));
+ s += (_T('A') + (wxChar)( col%26 ));
col = col/26 - 1;
if ( col < 0 ) break;
}
if ( pos >= curNumRows )
{
- wxLogError( wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n"
- "Pos value is invalid for present table with %d rows"),
- pos, numRows, curNumRows );
+ wxString errmsg;
+ errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
+ "Pos value is invalid for present table with %d rows",
+ pos, numRows, curNumRows );
+ wxFAIL_MSG( wxT(errmsg) );
return FALSE;
}
{
// TODO: something better than this ?
//
- wxLogError( wxT("Unable to append cols to a grid table with no rows.\n"
- "Call AppendRows() first") );
+ wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n"
+ "Call AppendRows() first") );
return FALSE;
}
if ( pos >= curNumCols )
{
- wxLogError( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
- "Pos value is invalid for present table with %d cols"),
- pos, numCols, curNumCols );
+ wxString errmsg;
+ errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
+ "Pos value is invalid for present table with %d cols",
+ pos, numCols, curNumCols );
+ wxFAIL_MSG( wxT( errmsg ) );
return FALSE;
}
case WXK_RIGHT:
case WXK_PRIOR:
case WXK_NEXT:
- case WXK_RETURN:
+ case WXK_SPACE:
if ( m_isCellControl )
{
// send the event to the parent grid, skipping the
}
break;
+ case WXK_RETURN:
+ if ( m_isCellControl )
+ {
+ if ( !m_grid->ProcessEvent( event ) )
+ {
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
+ // wxMotif needs a little extra help...
+ //
+ int pos = GetInsertionPoint();
+ wxString s( GetValue() );
+ s = s.Left(pos) + "\n" + s.Mid(pos);
+ SetValue(s);
+ SetInsertionPoint( pos );
+#else
+ // the other ports can handle a Return key press
+ //
+ event.Skip();
+#endif
+ }
+ }
+ break;
+
case WXK_HOME:
case WXK_END:
if ( m_isCellControl )
void wxGridTextCtrl::SetStartValue( const wxString& s )
{
startValue = s;
- wxTextCtrl::SetValue( s.c_str() );
+ wxTextCtrl::SetValue(s);
}
EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
END_EVENT_TABLE()
-wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
- wxWindowID id,
+wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
+ wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size )
{
// set the y coord - MB
//
// m_owner->PrepareDC( dc );
-
- wxCoord x, y;
+
+ int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( 0, -y );
-
+
m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
m_owner->DrawRowLabels( dc );
}
EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
END_EVENT_TABLE()
-wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
- wxWindowID id,
+wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
+ wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size )
{
// set the x coord - MB
//
// m_owner->PrepareDC( dc );
-
- wxCoord x, y;
+
+ int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( -x, 0 );
- m_owner->CalcColLabelsExposed( GetUpdateRegion() );
- m_owner->DrawColLabels( dc );
+ m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+ m_owner->DrawColLabels( dc );
}
BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
+ EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
END_EVENT_TABLE()
-wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
- wxWindowID id,
+wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
+ wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxRAISED_BORDER )
+ : wxWindow( parent, id, pos, size )
{
m_owner = parent;
}
+void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+ wxPaintDC dc(this);
+
+ int client_height = 0;
+ int client_width = 0;
+ GetClientSize( &client_width, &client_height );
+
+ dc.SetPen( *wxBLACK_PEN );
+ dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
+ dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
+
+ dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( 0, 0, client_width, 0 );
+ dc.DrawLine( 0, 0, 0, client_height );
+}
+
void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
{
BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
EVT_PAINT( wxGridWindow::OnPaint )
- EVT_SCROLLWIN( wxGridWindow::ScrollWindow )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
END_EVENT_TABLE()
-wxGridWindow::wxGridWindow( wxGrid *parent,
- wxGridRowLabelWindow *rowLblWin,
+wxGridWindow::wxGridWindow( wxGrid *parent,
+ wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size )
- : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, "grid window" )
+ : wxPanel( parent, id, pos, size, 0, "grid window" )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
m_colLabelWin = colLblWin;
-
+
SetBackgroundColour( "WHITE" );
}
{
wxPaintDC dc( this );
m_owner->PrepareDC( dc );
-
- m_owner->CalcCellsExposed( GetUpdateRegion() );
+ wxRegion reg = GetUpdateRegion();
+ m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc );
+#if WXGRID_DRAW_LINES
+ m_owner->DrawAllGridLines( dc, reg );
+#endif
}
: wxScrolledWindow( parent, id, pos, size, style, name )
{
Create();
-
- int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
- int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
-
- m_rowLabelWin = new wxGridRowLabelWindow( this,
- -1,
- wxDefaultPosition,
- wxSize(rowLblW,-1) );
-
- m_colLabelWin = new wxGridColLabelWindow( this,
- -1,
- wxDefaultPosition,
- wxSize(-1, colLblH ) );
-
- m_cornerLabelWin = new wxGridCornerLabelWindow( this,
- -1,
- wxDefaultPosition,
- wxSize(rowLblW, colLblH ) );
-
- m_gridWin = new wxGridWindow( this,
- m_rowLabelWin,
- m_colLabelWin,
- -1,
- wxDefaultPosition,
- wxDefaultSize );
-
- SetTargetWindow( m_gridWin );
-
- m_mainSizer = new wxBoxSizer( wxVERTICAL );
-
- m_topSizer = new wxBoxSizer( wxHORIZONTAL );
- m_topSizer->Add( m_cornerLabelWin, 0 );
- m_topSizer->Add( m_colLabelWin, 1 );
-
- m_mainSizer->Add( m_topSizer, 0, wxEXPAND );
-
- m_middleSizer = new wxBoxSizer( wxHORIZONTAL );
- m_middleSizer->Add( m_rowLabelWin, 0, wxEXPAND );
- m_middleSizer->Add( m_gridWin, 1, wxEXPAND );
-
- m_mainSizer->Add( m_middleSizer, 1, wxEXPAND );
-
- SetAutoLayout( TRUE );
- SetSizer( m_mainSizer );
}
+
wxGrid::~wxGrid()
{
delete m_table;
void wxGrid::Create()
{
- m_table = (wxGridTableBase *) NULL;
- m_gridWin = (wxGridWindow *) NULL;
- m_rowLabelWin = (wxGridRowLabelWindow *) NULL;
- m_colLabelWin = (wxGridColLabelWindow *) NULL;
- m_cornerLabelWin = (wxGridCornerLabelWindow *) NULL;
- m_cellEditCtrl = (wxWindow *) NULL;
+ m_created = FALSE; // set to TRUE by CreateGrid
+ m_displayed = FALSE; // set to TRUE by OnPaint
- // TODO: do we need this or should the top edit control be an add-on ?
- //
- m_topEditCtrl = (wxWindow *) NULL;
+ m_table = (wxGridTableBase *) NULL;
+ m_cellEditCtrl = (wxWindow *) NULL;
+
+ m_numRows = 0;
+ m_numCols = 0;
+ m_currentCellCoords = wxGridNoCellCoords;
+
+ m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
+ m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+
+ m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+ -1,
+ wxDefaultPosition,
+ wxDefaultSize );
+
+ m_rowLabelWin = new wxGridRowLabelWindow( this,
+ -1,
+ wxDefaultPosition,
+ wxDefaultSize );
+
+ m_colLabelWin = new wxGridColLabelWindow( this,
+ -1,
+ wxDefaultPosition,
+ wxDefaultSize );
+
+ m_gridWin = new wxGridWindow( this,
+ m_rowLabelWin,
+ m_colLabelWin,
+ -1,
+ wxDefaultPosition,
+ wxDefaultSize );
+
+ SetTargetWindow( m_gridWin );
}
{
if ( m_created )
{
- wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) called more than once") );
+ wxFAIL_MSG( wxT("wxGrid::CreateGrid called more than once") );
return FALSE;
}
else
m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
- m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
- m_labelTextColour = wxColour( "BLACK" );
+ if ( m_rowLabelWin )
+ {
+ m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
+ }
+ else
+ {
+ m_labelBackgroundColour = wxColour( _T("WHITE") );
+ }
+
+ m_labelTextColour = wxColour( _T("BLACK") );
// TODO: something better than this ?
//
m_colLabelVertAlign = wxTOP;
m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH;
- m_defaultRowHeight = m_gridWin->GetCharHeight() + 8;
-
+ m_defaultRowHeight = m_gridWin->GetCharHeight();
+
+#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl()
+ m_defaultRowHeight += 8;
+#else
+ m_defaultRowHeight += 4;
+#endif
+
m_rowHeights.Alloc( m_numRows );
m_rowBottoms.Alloc( m_numRows );
int rowBottom = 0;
m_colRights.Add( colRight );
}
- // TODO: improve this ?
+ // TODO: improve this by using wxSystemSettings?
//
- m_defaultCellFont = this->GetFont();
+ m_defaultCellFont = GetFont();
+
+ m_defaultCellHAlign = wxLEFT;
+ m_defaultCellVAlign = wxTOP;
m_gridLineColour = wxColour( 128, 128, 255 );
m_gridLinesEnabled = TRUE;
- m_cursorMode = WXGRID_CURSOR_DEFAULT;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_dragLastPos = -1;
m_dragRowOrCol = -1;
m_isDragging = FALSE;
m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
m_currentCellCoords = wxGridNoCellCoords;
- m_currentCellHighlighted = FALSE;
m_selectedTopLeft = wxGridNoCellCoords;
m_selectedBottomRight = wxGridNoCellCoords;
"",
wxPoint(1,1),
wxSize(1,1)
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
, wxTE_MULTILINE | wxTE_NO_VSCROLL
#endif
);
m_cellEditCtrl->Show( FALSE );
m_cellEditCtrlEnabled = TRUE;
m_editCtrlType = wxGRID_TEXTCTRL;
-
- // TODO: do we need this or should the top edit control be an add-on ?
- //
- m_topEditCtrlEnabled = FALSE;
}
if ( m_numRows > 0 && m_numCols > 0 )
{
- int right = m_colRights[ m_numCols-1 ] + 20;
- int bottom = m_rowBottoms[ m_numRows-1 ] + 20;
-
+ int right = m_colRights[ m_numCols-1 ] + 50;
+ int bottom = m_rowBottoms[ m_numRows-1 ] + 50;
+
// TODO: restore the scroll position that we had before sizing
//
int x, y;
GetViewStart( &x, &y );
- SetScrollbars( 10, 10,
- right/10, bottom/10,
+ SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
+ right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
x, y );
}
}
+void wxGrid::CalcWindowSizes()
+{
+ int cw, ch;
+ GetClientSize( &cw, &ch );
+
+ if ( m_cornerLabelWin->IsShown() )
+ m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
+
+ if ( m_colLabelWin->IsShown() )
+ m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+
+ if ( m_rowLabelWin->IsShown() )
+ m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+
+ if ( m_gridWin->IsShown() )
+ m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+}
+
+
// this is called when the grid table sends a message to say that it
// has been redimensioned
//
int bottom = 0;
if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
-
+
for ( i = pos; i < m_numRows; i++ )
{
bottom += m_rowHeights[i];
int bottom = 0;
if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
-
+
for ( i = oldNumRows; i < m_numRows; i++ )
{
bottom += m_rowHeights[i];
m_rowBottoms[i] = h;
}
}
-
+
CalcDimensions();
}
return TRUE;
int right = 0;
if ( pos > 0 ) right = m_colRights[pos-1];
-
+
for ( i = pos; i < m_numCols; i++ )
{
right += m_colWidths[i];
int right = 0;
if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
-
+
for ( i = oldNumCols; i < m_numCols; i++ )
{
right += m_colWidths[i];
#endif
m_currentCellCoords = wxGridNoCellCoords;
}
- else
+ else
{
if ( m_currentCellCoords.GetCol() >= m_numCols )
m_currentCellCoords.Set( 0, 0 );
rowTop = m_rowBottoms[row] - m_rowHeights[row];
if ( rowTop > bottom ) break;
-
+
m_rowLabelsExposed.Add( row );
}
-
+
iter++ ;
}
}
for ( col = 0; col < m_numCols; col++ )
{
if ( m_colRights[col] < left ) continue;
-
+
colLeft = m_colRights[col] - m_colWidths[col];
if ( colLeft > right ) break;
m_colLabelsExposed.Add( col );
}
-
+
iter++ ;
}
}
rowTop = m_rowBottoms[row] - m_rowHeights[row];
if ( rowTop > bottom ) break;
-
+
m_rowsExposed.Add( row );
for ( col = 0; col < m_numCols; col++ )
{
if ( m_colRights[col] < left ) continue;
-
+
colLeft = m_colRights[col] - m_colWidths[col];
if ( colLeft > right ) break;
-
+
if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col );
m_cellsExposed.Add( wxGridCellCoords( row, col ) );
}
}
-
+
iter++ ;
}
}
int x, y, row;
wxPoint pos( event.GetPosition() );
CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
-
+
if ( event.Dragging() )
{
m_isDragging = TRUE;
int cw, ch, left, dummy;
m_gridWin->GetClientSize( &cw, &ch );
CalcUnscrolledPosition( 0, 0, &left, &dummy );
-
+
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetLogicalFunction(wxXOR);
+ dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
m_isDragging = FALSE;
-
+
// ------------ Left button pressed
//
if ( event.LeftDown() )
if ( YToEdgeOfRow(y) < 0 )
{
row = YToRow(y);
- if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
+ if ( row >= 0 &&
+ !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
SelectRow( row, event.ShiftDown() );
m_cursorMode = WXGRID_CURSOR_SELECT_ROW;
SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
}
}
-
-
+
+
// ------------ Left button released
//
else if ( event.LeftUp() )
if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{
m_rowLabelWin->ReleaseMouse();
-
+
if ( m_dragLastPos >= 0 )
{
// erase the last line and resize the row
int cw, ch, left, dummy;
m_gridWin->GetClientSize( &cw, &ch );
CalcUnscrolledPosition( 0, 0, &left, &dummy );
-
+
wxClientDC dc( m_gridWin );
PrepareDC( dc );
dc.SetLogicalFunction( wxINVERT );
HideCellEditControl();
int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
- SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+ SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
if ( !GetBatchCount() )
{
- // TODO: optimize this
- m_rowLabelWin->Refresh();
- m_gridWin->Refresh();
+ // Only needed to get the correct rect.y:
+ wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
+ rect.x = 0;
+ CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+ rect.width = m_rowLabelWidth;
+ rect.height = ch - rect.y;
+ m_rowLabelWin->Refresh( TRUE, &rect );
+ rect.width = cw;
+ m_gridWin->Refresh( FALSE, &rect );
}
-
+
ShowCellEditControl();
// Note: we are ending the event *after* doing
}
}
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_dragLastPos = -1;
}
// no default action at the moment
}
}
-
-
+
+
// ------------ Right double click
//
else if ( event.RightDClick() )
// no default action at the moment
}
}
-
-
+
+
// ------------ No buttons down and mouse moving
//
else if ( event.Moving() )
}
else
{
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
- {
- m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ if ( m_rowLabelWin->GetCursor() == m_rowResizeCursor )
m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );
- }
}
}
}
int x, y, col;
wxPoint pos( event.GetPosition() );
CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
-
+
if ( event.Dragging() )
{
m_isDragging = TRUE;
int cw, ch, dummy, top;
m_gridWin->GetClientSize( &cw, &ch );
CalcUnscrolledPosition( 0, 0, &dummy, &top );
-
+
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetLogicalFunction(wxXOR);
+ dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
m_isDragging = FALSE;
-
+
// ------------ Left button pressed
//
if ( event.LeftDown() )
if ( XToEdgeOfCol(x) < 0 )
{
col = XToCol(x);
- if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
+ if ( col >= 0 &&
+ !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
SelectCol( col, event.ShiftDown() );
m_cursorMode = WXGRID_CURSOR_SELECT_COL;
SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, col, event );
}
}
-
-
+
+
// ------------ Left button released
//
else if ( event.LeftUp() )
if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
{
m_colLabelWin->ReleaseMouse();
-
+
if ( m_dragLastPos >= 0 )
{
// erase the last line and resize the col
int cw, ch, dummy, top;
m_gridWin->GetClientSize( &cw, &ch );
CalcUnscrolledPosition( 0, 0, &dummy, &top );
-
+
wxClientDC dc( m_gridWin );
PrepareDC( dc );
dc.SetLogicalFunction( wxINVERT );
HideCellEditControl();
int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
- SetColSize( m_dragRowOrCol, wxMax( x - colLeft, WXGRID_MIN_COL_WIDTH ) );
-
+ SetColSize( m_dragRowOrCol, wxMax( x - colLeft, WXGRID_MIN_COL_WIDTH ) );
+
if ( !GetBatchCount() )
{
- // TODO: optimize this
- m_colLabelWin->Refresh();
- m_gridWin->Refresh();
+ // Only needed to get the correct rect.x:
+ wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
+ rect.y = 0;
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+ rect.width = cw - rect.x;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( TRUE, &rect );
+ rect.height = ch;
+ m_gridWin->Refresh( FALSE, &rect );
}
-
+
ShowCellEditControl();
// Note: we are ending the event *after* doing
}
}
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_dragLastPos = -1;
- }
-
-
+ }
+
+
// ------------ Right button down
//
else if ( event.RightDown() )
// no default action at the moment
}
}
-
-
+
+
// ------------ Right double click
//
else if ( event.RightDClick() )
// no default action at the moment
}
}
-
-
+
+
// ------------ No buttons down and mouse moving
//
else if ( event.Moving() )
}
else
{
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
- {
- m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ if ( m_colLabelWin->GetCursor() == m_colResizeCursor )
m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );
- }
}
}
}
int x, y;
wxPoint pos( event.GetPosition() );
CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
-
+
wxGridCellCoords coords;
XYToCell( x, y, coords );
-
+
if ( event.Dragging() )
{
m_isDragging = TRUE;
-
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
+ // Hide the edit control, so it
+ // won't interfer with drag-shrinking.
+ if ( IsCellEditControlEnabled() )
+ HideCellEditControl();
if ( coords != wxGridNoCellCoords )
{
if ( !IsSelection() )
}
else
{
- if ( !IsInSelection( coords ) )
- SelectBlock( m_currentCellCoords, coords );
+ SelectBlock( m_currentCellCoords, coords );
}
}
}
m_isDragging = FALSE;
- if ( event.LeftDown() )
+ if ( coords != wxGridNoCellCoords )
{
- if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ if ( event.LeftDown() )
{
- MakeCellVisible( coords );
- SetCurrentCell( coords );
+ if ( event.ShiftDown() )
+ {
+ SelectBlock( m_currentCellCoords, coords );
+ }
+ else
+ {
+ if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ MakeCellVisible( coords );
+ SetCurrentCell( coords );
+ }
+ }
}
- }
- // ------------ Left double click
- //
- else if ( event.LeftDClick() )
- {
- SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event );
- }
+ // ------------ Left double click
+ //
+ else if ( event.LeftDClick() )
+ {
+ SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event );
+ }
- // ------------ Left button released
- //
- else if ( event.LeftUp() )
- {
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ // ------------ Left button released
+ //
+ else if ( event.LeftUp() )
{
- if ( IsSelection() )
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
+ if ( IsSelection() )
+ {
+ SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
+ }
}
+
+ // Show the edit control, if it has
+ // been hidden for drag-shrinking.
+ if ( IsCellEditControlEnabled() )
+ ShowCellEditControl();
+
+ m_dragLastPos = -1;
}
- m_dragLastPos = -1;
- }
+ // ------------ Right button down
+ //
+ else if ( event.RightDown() )
+ {
+ if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ // no default action at the moment
+ }
+ }
- // ------------ Right button down
- //
- else if ( event.RightDown() )
- {
- if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+
+ // ------------ Right double click
+ //
+ else if ( event.RightDClick() )
{
- // no default action at the moment
- }
- }
+ if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ // no default action at the moment
+ }
+ }
-
- // ------------ Right double click
- //
- else if ( event.RightDClick() )
- {
- if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ // ------------ Moving and no button action
+ //
+ else if ( event.Moving() && !event.IsButton() )
{
- // no default action at the moment
- }
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ }
}
}
{
m_table->Clear();
SetEditControlValue();
- if ( !GetBatchCount() ) Refresh();
+ if ( !GetBatchCount() ) m_gridWin->Refresh();
}
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
return FALSE;
}
if ( !m_created )
{
- wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
+ wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
return FALSE;
}
SetEditControlValue();
ShowCellEditControl();
}
+
+ m_displayed = TRUE;
}
//
void wxGrid::OnSize( wxSizeEvent& event )
{
+ CalcWindowSizes();
CalcDimensions();
- event.Skip();
}
{
// shouldn't be here - we are going round in circles...
//
- wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") );
+ wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while alread active") );
}
m_inOnKeyDown = TRUE;
}
break;
+ case WXK_SPACE:
+ if ( !IsEditable() )
+ {
+ MoveCursorRight();
+ }
+ else
+ {
+ event.Skip();
+ }
+ break;
+
case WXK_RETURN:
- MoveCursorDown();
+ if ( event.ControlDown() )
+ {
+ event.Skip(); // to let the edit control have the return
+ }
+ else
+ {
+ MoveCursorDown();
+ }
break;
case WXK_HOME:
return;
}
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
-
- if ( m_currentCellCoords != wxGridNoCellCoords )
+ if ( m_displayed &&
+ m_currentCellCoords != wxGridNoCellCoords )
{
- // HideCurrentCellHighlight( dc );
HideCellEditControl();
SaveEditControlValue();
}
m_currentCellCoords = coords;
SetEditControlValue();
- ShowCellEditControl();
- // ShowCurrentCellHighlight( dc );
- if ( IsSelection() )
+ if ( m_displayed )
{
- wxRect r( SelectionToDeviceRect() );
- ClearSelection();
- if ( !GetBatchCount() ) m_gridWin->Refresh( TRUE, &r );
+ ShowCellEditControl();
+
+ if ( IsSelection() )
+ {
+ wxRect r( SelectionToDeviceRect() );
+ ClearSelection();
+ if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+ }
}
}
void wxGrid::DrawGridCellArea( wxDC& dc )
{
if ( !m_numRows || !m_numCols ) return;
-
+
size_t i;
size_t numCells = m_cellsExposed.GetCount();
-
+
for ( i = 0; i < numCells; i++ )
{
DrawCell( dc, m_cellsExposed[i] );
{
if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return;
-
+
+#if !WXGRID_DRAW_LINES
if ( m_gridLinesEnabled )
DrawCellBorder( dc, coords );
+#endif
DrawCellBackground( dc, coords );
{
if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return;
-
+
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
int row = coords.GetRow();
int col = coords.GetCol();
-
+
// right hand border
//
dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
{
if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return;
-
+
int row = coords.GetRow();
int col = coords.GetCol();
{
if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return;
-
+
int row = coords.GetRow();
int col = coords.GetCol();
rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 );
rect.SetWidth( m_colWidths[col] - 4 );
rect.SetHeight( m_rowHeights[row] - 4 );
-
+
DrawTextRectangle( dc, GetCellValue( row, col ), rect, hAlign, vAlign );
}
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
-void wxGrid::DrawAllGridLines( wxDC& dc )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
{
- if ( !m_gridLinesEnabled ||
- !m_numRows ||
+ if ( !m_gridLinesEnabled ||
+ !m_numRows ||
!m_numCols ) return;
- int cw, ch;
- m_gridWin->GetClientSize(&cw, &ch);
+ int top, bottom, left, right;
+
+ if (reg.IsEmpty()){
+ int cw, ch;
+ m_gridWin->GetClientSize(&cw, &ch);
+
+ // virtual coords of visible area
+ //
+ CalcUnscrolledPosition( 0, 0, &left, &top );
+ CalcUnscrolledPosition( cw, ch, &right, &bottom );
+ }
+ else{
+ wxCoord x, y, w, h;
+ reg.GetBox(x, y, w, h);
+ CalcUnscrolledPosition( x, y, &left, &top );
+ CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
+ }
- // virtual coords of visible area
+ // avoid drawing grid lines past the last row and col
//
- int top, bottom, left, right;
- CalcUnscrolledPosition( 0, 0, &left, &top );
- CalcUnscrolledPosition( cw, ch, &right, &bottom );
+ right = wxMin( right, m_colRights[m_numCols-1] );
+ bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] );
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
// horizontal grid lines
//
- int i;
- for ( i = 0; i <= m_numRows; i++ )
+ int i;
+ for ( i = 0; i < m_numRows; i++ )
{
if ( m_rowBottoms[i] > bottom )
{
// vertical grid lines
//
- for ( i = 0; i <= m_numCols; i++ )
+ for ( i = 0; i < m_numCols; i++ )
{
if ( m_colRights[i] > right )
{
void wxGrid::DrawRowLabels( wxDC& dc )
{
if ( !m_numRows || !m_numCols ) return;
-
+
size_t i;
size_t numLabels = m_rowLabelsExposed.GetCount();
-
+
for ( i = 0; i < numLabels; i++ )
{
DrawRowLabel( dc, m_rowLabelsExposed[i] );
- }
+ }
}
void wxGrid::DrawRowLabel( wxDC& dc, int row )
{
if ( m_rowHeights[row] <= 0 ) return;
-
- // draw the label's horizontal border (the vertical border is
- // provided by the cell area window margin)
- //
+
+ int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+
dc.SetPen( *wxBLACK_PEN );
+ dc.DrawLine( m_rowLabelWidth-1, rowTop,
+ m_rowLabelWidth-1, m_rowBottoms[row]-1 );
- dc.DrawLine( 0, m_rowBottoms[row]+1,
- m_rowLabelWidth, m_rowBottoms[row]+1 );
+ dc.DrawLine( 0, m_rowBottoms[row]-1,
+ m_rowLabelWidth-1, m_rowBottoms[row]-1 );
dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
+ dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
- dc.DrawLine( 0, m_rowBottoms[row]+2,
- m_rowLabelWidth, m_rowBottoms[row]+2 );
-
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
int hAlign, vAlign;
GetRowLabelAlignment( &hAlign, &vAlign );
-
+
wxRect rect;
rect.SetX( 2 );
rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 );
rect.SetWidth( m_rowLabelWidth - 4 );
rect.SetHeight( m_rowHeights[row] - 4 );
- DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
+ DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
}
void wxGrid::DrawColLabels( wxDC& dc )
{
if ( !m_numRows || !m_numCols ) return;
-
+
size_t i;
size_t numLabels = m_colLabelsExposed.GetCount();
-
+
for ( i = 0; i < numLabels; i++ )
{
DrawColLabel( dc, m_colLabelsExposed[i] );
- }
+ }
}
void wxGrid::DrawColLabel( wxDC& dc, int col )
{
if ( m_colWidths[col] <= 0 ) return;
-
- // draw the label's vertical border (the horizontal border is
- // provided by the cell area window margin)
- //
+
+ int colLeft = m_colRights[col] - m_colWidths[col];
+
dc.SetPen( *wxBLACK_PEN );
+ dc.DrawLine( m_colRights[col]-1, 0,
+ m_colRights[col]-1, m_colLabelHeight-1 );
- dc.DrawLine( m_colRights[col]+1, 0,
- m_colRights[col]+1, m_colLabelHeight );
+ dc.DrawLine( colLeft, m_colLabelHeight-1,
+ m_colRights[col]-1, m_colLabelHeight-1 );
dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
+ dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );
- dc.DrawLine( m_colRights[col]+2, 0,
- m_colRights[col]+2, m_colLabelHeight );
+ dc.SetBackgroundMode( wxTRANSPARENT );
+ dc.SetTextForeground( GetLabelTextColour() );
+ dc.SetFont( GetLabelFont() );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
int hAlign, vAlign;
GetColLabelAlignment( &hAlign, &vAlign );
-
+
wxRect rect;
rect.SetX( m_colRights[col] - m_colWidths[col] + 2 );
rect.SetY( 2 );
rect.SetWidth( m_colWidths[col] - 4 );
rect.SetHeight( m_colLabelHeight - 4 );
- DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
+ DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
}
//
void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
{
- // TODO: this won't work for WXMAC ? (lines end with '\r')
- // => use wxTextFile functions then (VZ)
int startPos = 0;
int pos;
- while ( startPos < (int)value.Length() )
+ wxTextFile tf;
+ wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
+ wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
+
+ while ( startPos < (int)tVal.Length() )
{
- pos = value.Mid(startPos).Find( '\n' );
+ pos = tVal.Mid(startPos).Find( eol );
if ( pos < 0 )
{
break;
}
else
{
- if ( value[startPos+pos-1] == '\r' )
- {
- lines.Add( value.Mid(startPos, pos-1) );
- }
- else
- {
- lines.Add( value.Mid(startPos, pos) );
- }
+ lines.Add( value.Mid(startPos, pos) );
}
startPos += pos+1;
}
if ( edit != m_editable )
{
m_editable = edit;
- if ( !m_editable ) HideCellEditControl();
- m_cellEditCtrlEnabled = m_editable;
- if ( m_editable ) ShowCellEditControl();
+
+ // TODO: extend this for other edit control types
+ //
+ if ( m_editCtrlType == wxGRID_TEXTCTRL )
+ {
+ ((wxTextCtrl *)m_cellEditCtrl)->SetEditable( m_editable );
+ }
}
}
+#if 0 // disabled for the moment - the cell control is always active
void wxGrid::EnableCellEditControl( bool enable )
{
if ( m_cellEditCtrl &&
enable != m_cellEditCtrlEnabled )
{
m_cellEditCtrlEnabled = enable;
-
+
if ( m_cellEditCtrlEnabled )
{
SetEditControlValue();
ShowCellEditControl();
- // ShowCurrentCellHighlight( dc );
}
else
{
- // HideCurrentCellHighlight( dc );
HideCellEditControl();
SaveEditControlValue();
}
}
}
-
-
-// TODO: not implemented at the moment
-// Do we want it ?
-//
-void wxGrid::EnableTopEditControl( bool enable )
-{
- // TODO: do we want this here or should the top edit
- // control be an add-on class ?
-}
+#endif
void wxGrid::ShowCellEditControl()
int left, top, right, bottom;
CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
-
+
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
-
- rect.SetLeft( wxMax(0, left) );
- rect.SetTop( wxMax(0, top) );
-
+
+ // Make the edit control large enough to allow for internal margins
+ // TODO: remove this if the text ctrl sizing is improved esp. for unix
+ //
+ int extra;
+#if defined(__WXMOTIF__)
+ if ( m_currentCellCoords.GetRow() == 0 ||
+ m_currentCellCoords.GetCol() == 0 )
+ {
+ extra = 2;
+ }
+ else
+ {
+ extra = 4;
+ }
+#else
+ if ( m_currentCellCoords.GetRow() == 0 ||
+ m_currentCellCoords.GetCol() == 0 )
+ {
+ extra = 1;
+ }
+ else
+ {
+ extra = 2;
+ }
+#endif
+
+#if defined(__WXGTK__)
+ int top_diff = 0;
+ int left_diff = 0;
+ if (left != 0) left_diff++;
+ if (top != 0) top_diff++;
+ rect.SetLeft( left + left_diff );
+ rect.SetTop( top + top_diff );
+ rect.SetRight( rect.GetRight() - left_diff );
+ rect.SetBottom( rect.GetBottom() - top_diff );
+#else
+ rect.SetLeft( wxMax(0, left - extra) );
+ rect.SetTop( wxMax(0, top - extra) );
+ rect.SetRight( rect.GetRight() + 2*extra );
+ rect.SetBottom( rect.GetBottom() + 2*extra );
+#endif
+
m_cellEditCtrl->SetSize( rect );
m_cellEditCtrl->Show( TRUE );
else
s = value;
- // TODO: no top edit control implemented at the moment...
- // Do we want it in this class ?
- //
- if ( IsTopEditControlEnabled() )
- {
- switch ( m_editCtrlType )
- {
- case wxGRID_TEXTCTRL:
- ((wxGridTextCtrl *)m_topEditCtrl)->SetStartValue(s);
- break;
-
- case wxGRID_CHECKBOX:
- // TODO: implement this
- //
- break;
-
- case wxGRID_CHOICE:
- // TODO: implement this
- //
- break;
-
- case wxGRID_COMBOBOX:
- // TODO: implement this
- //
- break;
- }
- }
-
if ( IsCellEditControlEnabled() )
{
switch ( m_editCtrlType )
{
ctrl = m_cellEditCtrl;
}
- else if ( IsTopEditControlEnabled() )
- {
- ctrl = m_topEditCtrl;
- }
else
{
return;
//
-// ------ Grid location functions
-// Note that all of these functions work with the logical coordinates of
+// ------ Grid location functions
+// Note that all of these functions work with the logical coordinates of
// grid cells and labels so you will need to convert from device
// coordinates for mouse events etc.
//
void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
{
- coords.SetRow( YToRow(y) );
- coords.SetCol( XToCol(x) );
+ int row = YToRow(y);
+ int col = XToCol(x);
+
+ if ( row == -1 || col == -1 )
+ {
+ coords = wxGridNoCellCoords;
+ }
+ else
+ {
+ coords.Set( row, col );
+ }
}
// get the cell rectangle in logical coords
//
wxRect r( CellToRect( row, col ) );
-
+
// convert to device coords
//
int left, top, right, bottom;
CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
-
+
// check against the client area of the grid window
//
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
-
+
if ( wholeCellVisible )
{
// is the cell wholly visible ?
void wxGrid::MakeCellVisible( int row, int col )
{
int i;
- int xpos = -1, ypos = -1;
+ int xpos = -1, ypos = -1;
if ( row >= 0 && row < m_numRows &&
col >= 0 && col < m_numCols )
// get the cell rectangle in logical coords
//
wxRect r( CellToRect( row, col ) );
-
+
// convert to device coords
//
int left, top, right, bottom;
CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
-
+
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
-
+
if ( top < 0 )
{
ypos = r.GetTop();
h += m_rowHeights[i];
ypos -= m_rowHeights[i];
}
+
+ // we divide it later by GRID_SCROLL_LINE, make sure that we don't
+ // have rounding errors (this is important, because if we do, we
+ // might not scroll at all and some cells won't be redrawn)
+ ypos += GRID_SCROLL_LINE / 2;
}
if ( left < 0 )
w += m_colWidths[i];
xpos -= m_colWidths[i];
}
+
+ // see comment for ypos above
+ xpos += GRID_SCROLL_LINE / 2;
}
if ( xpos != -1 || ypos != -1 )
{
- if ( xpos != -1 ) xpos = xpos/10;
- if ( ypos != -1 ) ypos = ypos/10;
+ if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
+ if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
Scroll( xpos, ypos );
AdjustScrollbars();
}
{
MakeCellVisible( m_currentCellCoords.GetRow() - 1,
m_currentCellCoords.GetCol() );
-
+
SetCurrentCell( m_currentCellCoords.GetRow() - 1,
m_currentCellCoords.GetCol() );
{
MakeCellVisible( m_currentCellCoords.GetRow() + 1,
m_currentCellCoords.GetCol() );
-
+
SetCurrentCell( m_currentCellCoords.GetRow() + 1,
m_currentCellCoords.GetCol() );
{
MakeCellVisible( m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() - 1 );
-
+
SetCurrentCell( m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() - 1 );
{
MakeCellVisible( m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() + 1 );
-
+
SetCurrentCell( m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() + 1 );
bool wxGrid::MovePageUp()
{
if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
-
+
int row = m_currentCellCoords.GetRow();
if ( row > 0 )
{
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
-
+
int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
int newRow = YToRow( y - ch + 1 );
if ( newRow == -1 )
{
newRow = 0;
}
- else if ( newRow == row )
+ else if ( newRow == row )
{
newRow = row - 1;
}
MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
-
+
return TRUE;
}
bool wxGrid::MovePageDown()
{
if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
-
+
int row = m_currentCellCoords.GetRow();
if ( row < m_numRows )
{
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
-
+
int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
int newRow = YToRow( y + ch );
if ( newRow == -1 )
{
newRow = m_numRows - 1;
}
- else if ( newRow == row )
+ else if ( newRow == row )
{
newRow = row + 1;
}
MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
-
+
return TRUE;
}
}
}
+
void wxGrid::SetRowLabelSize( int width )
{
- // TODO: how to do this with the box sizers ?
+ width = wxMax( width, 0 );
+ if ( width != m_rowLabelWidth )
+ {
+ if ( width == 0 )
+ {
+ m_rowLabelWin->Show( FALSE );
+ m_cornerLabelWin->Show( FALSE );
+ }
+ else if ( m_rowLabelWidth == 0 )
+ {
+ m_rowLabelWin->Show( TRUE );
+ if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE );
+ }
+
+ m_rowLabelWidth = width;
+ CalcWindowSizes();
+ Refresh( TRUE );
+ }
}
+
void wxGrid::SetColLabelSize( int height )
{
- // TODO: how to do this with the box sizers ?
+ height = wxMax( height, 0 );
+ if ( height != m_colLabelHeight )
+ {
+ if ( height == 0 )
+ {
+ m_colLabelWin->Show( FALSE );
+ m_cornerLabelWin->Show( FALSE );
+ }
+ else if ( m_colLabelHeight == 0 )
+ {
+ m_colLabelWin->Show( TRUE );
+ if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE );
+ }
+
+ m_colLabelHeight = height;
+ CalcWindowSizes();
+ Refresh( TRUE );
+ }
}
+
void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
{
if ( m_labelBackgroundColour != colour )
if ( !GetBatchCount() )
{
m_rowLabelWin->Refresh();
- m_colLabelWin->Refresh();
- }
+ }
}
void wxGrid::SetColLabelAlignment( int horiz, int vert )
if ( !GetBatchCount() )
{
- m_rowLabelWin->Refresh();
m_colLabelWin->Refresh();
- }
+ }
}
void wxGrid::SetRowLabelValue( int row, const wxString& s )
m_table->SetRowLabelValue( row, s );
if ( !GetBatchCount() )
{
- // TODO: Optimize this
- //
- m_rowLabelWin->Refresh();
+ wxRect rect = CellToRect( row, 0);
+ if ( rect.height > 0 )
+ {
+ CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
+ rect.x = m_left;
+ rect.width = m_rowLabelWidth;
+ m_rowLabelWin->Refresh( TRUE, &rect );
+ }
}
}
}
m_table->SetColLabelValue( col, s );
if ( !GetBatchCount() )
{
- // TODO: optimize this
- //
- m_colLabelWin->Refresh();
+ wxRect rect = CellToRect( 0, col );
+ if ( rect.width > 0 )
+ {
+ CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
+ rect.y = m_top;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( TRUE, &rect );
+ }
}
}
}
if ( m_gridLineColour != colour )
{
m_gridLineColour = colour;
-
+
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- DrawAllGridLines( dc );
+ DrawAllGridLines( dc, wxRegion() );
}
}
{
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- DrawAllGridLines( dc );
+ DrawAllGridLines( dc, wxRegion() );
}
else
{
int wxGrid::GetRowSize( int row )
{
- if ( row >= 0 && row < m_numRows )
- return m_rowHeights[row];
- else
- return 0; // TODO: log an error here
+ wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
+
+ return m_rowHeights[row];
}
int wxGrid::GetDefaultColSize()
int wxGrid::GetColSize( int col )
{
- if ( col >= 0 && col < m_numCols )
- return m_colWidths[col];
- else
- return 0; // TODO: log an error here
+ wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
+
+ return m_colWidths[col];
}
wxColour wxGrid::GetDefaultCellBackgroundColour()
{
- // TODO: replace this temp test code
- //
- return wxColour( 255, 255, 255 );
+ return m_gridWin->GetBackgroundColour();
}
-wxColour wxGrid::GetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col) )
+// TODO VZ: this must be optimized to allow only retrieveing attr once!
+
+wxColour wxGrid::GetCellBackgroundColour(int row, int col)
{
- // TODO: replace this temp test code
- //
- return wxColour( 255, 255, 255 );
+ wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL;
+
+ wxColour colour;
+ if ( attr && attr->HasBackgroundColour() )
+ colour = attr->GetBackgroundColour();
+ else
+ colour = GetDefaultCellBackgroundColour();
+
+ delete attr;
+
+ return colour;
}
wxColour wxGrid::GetDefaultCellTextColour()
{
- // TODO: replace this temp test code
- //
- return wxColour( 0, 0, 0 );
+ return m_gridWin->GetForegroundColour();
}
-wxColour wxGrid::GetCellTextColour( int WXUNUSED(row), int WXUNUSED(col) )
+wxColour wxGrid::GetCellTextColour( int row, int col )
{
- // TODO: replace this temp test code
- //
- return wxColour( 0, 0, 0 );
-}
+ wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL;
+ wxColour colour;
+ if ( attr && attr->HasTextColour() )
+ colour = attr->GetTextColour();
+ else
+ colour = GetDefaultCellTextColour();
-wxColour wxGrid::GetCellHighlightColour()
-{
- // TODO: replace this temp test code
- //
- return wxColour( 0, 0, 0 );
+ delete attr;
+
+ return colour;
}
return m_defaultCellFont;
}
-wxFont wxGrid::GetCellFont( int WXUNUSED(row), int WXUNUSED(col) )
+wxFont wxGrid::GetCellFont( int row, int col )
{
- // TODO: replace this temp test code
- //
- return m_defaultCellFont;
+ wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL;
+
+ wxFont font;
+ if ( attr && attr->HasFont() )
+ font = attr->GetFont();
+ else
+ font = GetDefaultCellFont();
+
+ delete attr;
+
+ return font;
}
void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
{
- // TODO: replace this temp test code
- //
- *horiz = wxLEFT;
- *vert = wxTOP;
+ if ( horiz )
+ *horiz = m_defaultCellHAlign;
+ if ( vert )
+ *vert = m_defaultCellVAlign;
}
-void wxGrid::GetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
{
- // TODO: replace this temp test code
- //
- *horiz = wxLEFT;
- *vert = wxTOP;
+ wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL;
+
+ if ( attr && attr->HasAlignment() )
+ attr->GetAlignment(horiz, vert);
+ else
+ GetDefaultCellAlignment(horiz, vert);
+
+ delete attr;
}
void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
void wxGrid::SetRowSize( int row, int height )
{
+ wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
+
int i;
-
- if ( row >= 0 && row < m_numRows )
- {
- int h = wxMax( 0, height );
- int diff = h - m_rowHeights[row];
-
- m_rowHeights[row] = h;
- for ( i = row; i < m_numRows; i++ )
- {
- m_rowBottoms[i] += diff;
- }
- CalcDimensions();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( EVT_GRID_ROW_SIZE,
- row, -1 );
- }
- else
+
+ int h = wxMax( 0, height );
+ int diff = h - m_rowHeights[row];
+
+ m_rowHeights[row] = h;
+ for ( i = row; i < m_numRows; i++ )
{
- // TODO: log an error here
+ m_rowBottoms[i] += diff;
}
+ CalcDimensions();
+
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( EVT_GRID_ROW_SIZE,
+ row, -1 );
}
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
void wxGrid::SetColSize( int col, int width )
{
+ wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
+
int i;
-
- if ( col >= 0 && col < m_numCols )
- {
- int w = wxMax( 0, width );
- int diff = w - m_colWidths[col];
- m_colWidths[col] = w;
- for ( i = col; i < m_numCols; i++ )
- {
- m_colRights[i] += diff;
- }
- CalcDimensions();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( EVT_GRID_COL_SIZE,
- -1, col );
- }
- else
+ int w = wxMax( 0, width );
+ int diff = w - m_colWidths[col];
+ m_colWidths[col] = w;
+
+ for ( i = col; i < m_numCols; i++ )
{
- // TODO: log an error here
+ m_colRights[i] += diff;
}
+ CalcDimensions();
+
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( EVT_GRID_COL_SIZE,
+ -1, col );
}
-void wxGrid::SetDefaultCellBackgroundColour( const wxColour& )
+void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
{
- // TODO: everything !!!
- //
+ m_gridWin->SetBackgroundColour(col);
}
-void wxGrid::SetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& )
+void wxGrid::SetDefaultCellTextColour( const wxColour& col )
{
- // TODO: everything !!!
- //
+ m_gridWin->SetForegroundColour(col);
}
-void wxGrid::SetDefaultCellTextColour( const wxColour& )
+void wxGrid::SetDefaultCellAlignment( int horiz, int vert )
{
- // TODO: everything !!!
- //
+ m_defaultCellHAlign = horiz;
+ m_defaultCellVAlign = vert;
}
-void wxGrid::SetCellTextColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& )
+bool wxGrid::CanHaveAttributes()
{
- // TODO: everything !!!
- //
+ if ( !m_table )
+ {
+ return FALSE;
+ }
+
+ if ( !m_table->GetAttrProvider() )
+ {
+ // use the default attr provider by default
+ // (another choice would be to just return FALSE thus forcing the user
+ // to it himself)
+ m_table->SetAttrProvider(new wxGridCellAttrProvider);
+ }
+
+ return TRUE;
}
-void wxGrid::SetCellHighlightColour( const wxColour& )
+void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour )
{
- // TODO: everything !!!
- //
+ if ( CanHaveAttributes() )
+ {
+ wxGridCellAttr *attr = new wxGridCellAttr;
+ attr->SetBackgroundColour(colour);
+
+ m_table->SetAttr(attr, row, col);
+ }
}
-void wxGrid::SetDefaultCellFont( const wxFont& )
+void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour )
{
- // TODO: everything !!!
- //
+ if ( CanHaveAttributes() )
+ {
+ wxGridCellAttr *attr = new wxGridCellAttr;
+ attr->SetTextColour(colour);
+
+ m_table->SetAttr(attr, row, col);
+ }
}
-void wxGrid::SetCellFont( int WXUNUSED(row), int WXUNUSED(col), const wxFont& )
+void wxGrid::SetDefaultCellFont( const wxFont& font )
{
- // TODO: everything !!!
- //
+ m_defaultCellFont = font;
}
-void wxGrid::SetDefaultCellAlignment( int WXUNUSED(horiz), int WXUNUSED(vert) )
+void wxGrid::SetCellFont( int row, int col, const wxFont& font )
{
- // TODO: everything !!!
- //
+ if ( CanHaveAttributes() )
+ {
+ wxGridCellAttr *attr = new wxGridCellAttr;
+ attr->SetFont(font);
+
+ m_table->SetAttr(attr, row, col);
+ }
}
-void wxGrid::SetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(horiz), int WXUNUSED(vert) )
+void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert )
{
- // TODO: everything !!!
- //
+ if ( CanHaveAttributes() )
+ {
+ wxGridCellAttr *attr = new wxGridCellAttr;
+ attr->SetAlignment(horiz, vert);
+
+ m_table->SetAttr(attr, row, col);
+ }
}
PrepareDC( dc );
DrawCell( dc, wxGridCellCoords(row, col) );
}
-
+
#if 0 // TODO: edit in place
-
+
if ( m_currentCellCoords.GetRow() == row &&
m_currentCellCoords.GetCol() == col )
{
void wxGrid::SelectRow( int row, bool addToSelected )
{
wxRect r;
-
+
if ( IsSelection() && addToSelected )
{
- if ( m_selectedTopLeft.GetRow() > row )
+ wxRect rect[4];
+ bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ int i;
+
+ wxCoord oldLeft = m_selectedTopLeft.GetCol();
+ wxCoord oldTop = m_selectedTopLeft.GetRow();
+ wxCoord oldRight = m_selectedBottomRight.GetCol();
+ wxCoord oldBottom = m_selectedBottomRight.GetRow();
+
+ if ( oldTop > row )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
+ wxGridCellCoords ( oldTop - 1,
+ m_numCols - 1 ) );
m_selectedTopLeft.SetRow( row );
+ }
- m_selectedTopLeft.SetCol( 0 );
+ if ( oldLeft > 0 )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
+ wxGridCellCoords ( oldBottom,
+ oldLeft - 1 ) );
+
+ m_selectedTopLeft.SetCol( 0 );
+ }
- if ( m_selectedBottomRight.GetRow() < row )
+ if ( oldBottom < row )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
+ wxGridCellCoords ( row,
+ m_numCols - 1 ) );
m_selectedBottomRight.SetRow( row );
+ }
- m_selectedBottomRight.SetCol( m_numCols - 1 );
+ if ( oldRight < m_numCols - 1 )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
+ oldRight + 1 ),
+ wxGridCellCoords ( oldBottom,
+ m_numCols - 1 ) );
+ m_selectedBottomRight.SetCol( m_numCols - 1 );
+ }
- // TODO: optimize this so that we only refresh the newly
- // selected cells
- //
- r = SelectionToDeviceRect();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
else
{
r = SelectionToDeviceRect();
ClearSelection();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
-
+ if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
+
m_selectedTopLeft.Set( row, 0 );
m_selectedBottomRight.Set( row, m_numCols-1 );
r = SelectionToDeviceRect();
- m_gridWin->Refresh( TRUE, &r );
+ m_gridWin->Refresh( FALSE, &r );
}
wxGridRangeSelectEvent gridEvt( GetId(),
void wxGrid::SelectCol( int col, bool addToSelected )
{
- wxRect r;
-
if ( IsSelection() && addToSelected )
{
- if ( m_selectedTopLeft.GetCol() > col )
+ wxRect rect[4];
+ bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ int i;
+
+ wxCoord oldLeft = m_selectedTopLeft.GetCol();
+ wxCoord oldTop = m_selectedTopLeft.GetRow();
+ wxCoord oldRight = m_selectedBottomRight.GetCol();
+ wxCoord oldBottom = m_selectedBottomRight.GetRow();
+
+ if ( oldLeft > col )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ),
+ wxGridCellCoords ( m_numRows - 1,
+ oldLeft - 1 ) );
m_selectedTopLeft.SetCol( col );
+ }
- m_selectedTopLeft.SetRow( 0 );
+ if ( oldTop > 0 )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ),
+ wxGridCellCoords ( oldTop - 1,
+ oldRight ) );
+ m_selectedTopLeft.SetRow( 0 );
+ }
- if ( m_selectedBottomRight.GetCol() < col )
+ if ( oldRight < col )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
+ wxGridCellCoords ( m_numRows - 1,
+ col ) );
m_selectedBottomRight.SetCol( col );
+ }
- m_selectedBottomRight.SetRow( m_numRows - 1 );
+ if ( oldBottom < m_numRows - 1 )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1,
+ oldLeft ),
+ wxGridCellCoords ( m_numRows - 1,
+ oldRight ) );
+ m_selectedBottomRight.SetRow( m_numRows - 1 );
+ }
- // TODO: optimize this so that we only refresh the newly
- // selected cells
- //
- r = SelectionToDeviceRect();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
else
{
+ wxRect r;
+
r = SelectionToDeviceRect();
ClearSelection();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
-
+ if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
+
m_selectedTopLeft.Set( 0, col );
m_selectedBottomRight.Set( m_numRows-1, col );
r = SelectionToDeviceRect();
- m_gridWin->Refresh( TRUE, &r );
+ m_gridWin->Refresh( FALSE, &r );
}
wxGridRangeSelectEvent gridEvt( GetId(),
void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
{
int temp;
+ wxGridCellCoords updateTopLeft, updateBottomRight;
if ( topRow > bottomRow )
{
rightCol = temp;
}
- m_selectedTopLeft.Set( topRow, leftCol );
- m_selectedBottomRight.Set( bottomRow, rightCol );
-
- wxRect r;
- r = SelectionToDeviceRect();
- m_gridWin->Refresh( TRUE, &r );
+ updateTopLeft = wxGridCellCoords( topRow, leftCol );
+ updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+ if ( m_selectedTopLeft != updateTopLeft ||
+ m_selectedBottomRight != updateBottomRight )
+ {
+ // Compute two optimal update rectangles:
+ // Either one rectangle is a real subset of the
+ // other, or they are (almost) disjoint!
+ wxRect rect[4];
+ bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ int i;
+
+ // Store intermediate values
+ wxCoord oldLeft = m_selectedTopLeft.GetCol();
+ wxCoord oldTop = m_selectedTopLeft.GetRow();
+ wxCoord oldRight = m_selectedBottomRight.GetCol();
+ wxCoord oldBottom = m_selectedBottomRight.GetRow();
+
+ // Determine the outer/inner coordinates.
+ if (oldLeft > leftCol)
+ {
+ temp = oldLeft;
+ oldLeft = leftCol;
+ leftCol = temp;
+ }
+ if (oldTop > topRow )
+ {
+ temp = oldTop;
+ oldTop = topRow;
+ topRow = temp;
+ }
+ if (oldRight < rightCol )
+ {
+ temp = oldRight;
+ oldRight = rightCol;
+ rightCol = temp;
+ }
+ if (oldBottom < bottomRow)
+ {
+ temp = oldBottom;
+ oldBottom = bottomRow;
+ bottomRow = temp;
+ }
+
+ // Now, either the stuff marked old is the outer
+ // rectangle or we don't have a situation where one
+ // is contained in the other.
+
+ if ( oldLeft < leftCol )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ oldLeft ),
+ wxGridCellCoords ( oldBottom,
+ leftCol - 1 ) );
+ }
+
+ if ( oldTop < topRow )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ leftCol ),
+ wxGridCellCoords ( topRow - 1,
+ rightCol ) );
+ }
+
+ if ( oldRight > rightCol )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ rightCol + 1 ),
+ wxGridCellCoords ( oldBottom,
+ oldRight ) );
+ }
+
+ if ( oldBottom > bottomRow )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+ leftCol ),
+ wxGridCellCoords ( oldBottom,
+ rightCol ) );
+ }
+
+
+ // Change Selection
+ m_selectedTopLeft = updateTopLeft;
+ m_selectedBottomRight = updateBottomRight;
+
+ // various Refresh() calls
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
+ }
// only generate an event if the block is not being selected by
// dragging the mouse (in which case the event will be generated in
}
-// This function returns the rectangle that encloses the selected cells
+// This function returns the rectangle that encloses the given block
// in device coords clipped to the client size of the grid window.
//
-wxRect wxGrid::SelectionToDeviceRect()
+wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
+ const wxGridCellCoords &bottomRight )
{
- wxRect rect;
+ wxRect rect( wxGridNoCellRect );
wxRect cellRect;
- if ( IsSelection() )
+ cellRect = CellToRect( topLeft );
+ if ( cellRect != wxGridNoCellRect )
{
- cellRect = CellToRect( m_selectedTopLeft );
- if ( cellRect != wxGridNoCellRect )
- {
- rect = cellRect;
- }
- else
- {
- rect = wxRect( 0, 0, 0, 0 );
- }
-
- cellRect = CellToRect( m_selectedBottomRight );
- if ( cellRect != wxGridNoCellRect )
- {
- rect += cellRect;
- }
- else
- {
- return wxGridNoCellRect;
- }
+ rect = cellRect;
+ }
+ else
+ {
+ rect = wxRect( 0, 0, 0, 0 );
+ }
- // convert to scrolled coords
- //
- int left, top, right, bottom;
- CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
- CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
-
- int cw, ch;
- m_gridWin->GetClientSize( &cw, &ch );
-
- rect.SetLeft( wxMax(0, left) );
- rect.SetTop( wxMax(0, top) );
- rect.SetRight( wxMin(cw, right) );
- rect.SetBottom( wxMin(ch, bottom) );
+ cellRect = CellToRect( bottomRight );
+ if ( cellRect != wxGridNoCellRect )
+ {
+ rect += cellRect;
}
else
{
return wxGridNoCellRect;
}
+ // convert to scrolled coords
+ //
+ int left, top, right, bottom;
+ CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
+ CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
+
+ int cw, ch;
+ m_gridWin->GetClientSize( &cw, &ch );
+
+ rect.SetLeft( wxMax(0, left) );
+ rect.SetTop( wxMax(0, top) );
+ rect.SetRight( wxMin(cw, right) );
+ rect.SetBottom( wxMin(ch, bottom) );
+
return rect;
}
+
//
// ------ Grid event classes
//
projects / wxWidgets.git / blobdiff