#if wxUSE_GRID
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
- #include "gridg.cpp"
-#else // wxUSE_NEW_GRID
-
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dcclient.h"
// array classes
// ----------------------------------------------------------------------------
-WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(wxGridCellAttr *, wxArrayAttrs,
+ class WXDLLIMPEXP_ADV);
struct wxGridCellWithAttr
{
wxGridCellCoords coords;
wxGridCellAttr *attr;
+
+// Cannot do this:
+// DECLARE_NO_COPY_CLASS(wxGridCellWithAttr)
+// without rewriting the macros, which require a public copy constructor.
};
-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray,
+ class WXDLLIMPEXP_ADV);
#include "wx/arrimpl.cpp"
// private classes
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
{
public:
wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)
};
-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
{
public:
wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)
};
-class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
{
public:
wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
};
-class WXDLLEXPORT wxGridWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
{
public:
wxGridWindow()
void ScrollWindow( int dx, int dy, const wxRect *rect );
+ wxGrid* GetOwner() { return m_owner; }
+
private:
wxGrid *m_owner;
wxGridRowLabelWindow *m_rowLabelWin;
DECLARE_DYNAMIC_CLASS(wxGridWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridWindow)
};
wxGridCellEditor* m_editor;
DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
};
// ----------------------------------------------------------------------------
// this class stores attributes set for cells
-class WXDLLEXPORT wxGridCellAttrData
+class WXDLLIMPEXP_ADV wxGridCellAttrData
{
public:
void SetAttr(wxGridCellAttr *attr, int row, int col);
};
// this class stores attributes set for rows or columns
-class WXDLLEXPORT wxGridRowOrColAttrData
+class WXDLLIMPEXP_ADV wxGridRowOrColAttrData
{
public:
// empty ctor to suppress warnings
// NB: this is just a wrapper around 3 objects: one which stores cell
// attributes, and 2 others for row/col ones
-class WXDLLEXPORT wxGridCellAttrProviderData
+class WXDLLIMPEXP_ADV wxGridCellAttrProviderData
{
public:
wxGridCellAttrData m_cellAttrs;
wxString m_typeName;
wxGridCellRenderer* m_renderer;
wxGridCellEditor* m_editor;
+
+ DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo)
};
-WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray,
+ class WXDLLIMPEXP_ADV);
-class WXDLLEXPORT wxGridTypeRegistry
+class WXDLLIMPEXP_ADV wxGridTypeRegistry
{
public:
wxGridTypeRegistry() {}
wxGridCellEditor::wxGridCellEditor()
{
m_control = NULL;
+ m_attr = NULL;
}
{
// erase the background because we might not fill the cell
wxClientDC dc(m_control->GetParent());
+ wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow);
+ if (gridWindow)
+ gridWindow->GetOwner()->PrepareDC(dc);
+
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
dc.DrawRectangle(rectCell);
#endif
);
- // TODO: use m_maxChars
+ // set max length allowed in the textctrl, if the parameter was set
+ if (m_maxChars != 0)
+ {
+ ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars);
+ }
wxGridCellEditor::Create(parent, id, evtHandler);
}
default:
// accept 8 bit chars too if isprint() agrees
- if ( (keycode < 255) && (isprint(keycode)) )
+ if ( (keycode < 255) && (wxIsprint(keycode)) )
return TRUE;
}
}
}
}
+// return the value in the text control
+wxString wxGridCellTextEditor::GetValue() const
+{
+ return Text()->GetValue();
+}
+
// ----------------------------------------------------------------------------
// wxGridCellNumberEditor
// ----------------------------------------------------------------------------
return TRUE;
default:
- if ( (keycode < 128) && isdigit(keycode) )
+ if ( (keycode < 128) && wxIsdigit(keycode) )
return TRUE;
}
}
{
if ( !HasRange() )
{
- int keycode = (int) event.KeyCode();
- if ( isdigit(keycode) || keycode == '+' || keycode == '-'
+ int keycode = event.GetKeyCode();
+ if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
|| keycode == WXK_NUMPAD0
|| keycode == WXK_NUMPAD1
|| keycode == WXK_NUMPAD2
}
}
+// return the value in the spin control if it is there (the text control otherwise)
+wxString wxGridCellNumberEditor::GetValue() const
+{
+ wxString s;
+
+ if( HasRange() )
+ {
+ long value = Spin()->GetValue();
+ s.Printf(wxT("%ld"), value);
+ }
+ else
+ {
+ s = Text()->GetValue();
+ }
+ return s;
+}
+
// ----------------------------------------------------------------------------
// wxGridCellFloatEditor
// ----------------------------------------------------------------------------
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{
- int keycode = (int)event.KeyCode();
- if ( isdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.'
+ int keycode = event.GetKeyCode();
+ if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.'
|| keycode == WXK_NUMPAD0
|| keycode == WXK_NUMPAD1
|| keycode == WXK_NUMPAD2
default:
// additionally accept 'e' as in '1e+6'
if ( (keycode < 128) &&
- (isdigit(keycode) || tolower(keycode) == 'e') )
+ (wxIsdigit(keycode) || tolower(keycode) == 'e') )
return TRUE;
}
}
size.y -= 2;
#endif
- m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2);
+ int hAlign = wxALIGN_CENTRE;
+ int vAlign = wxALIGN_CENTRE;
+ if (GetCellAttr())
+ GetCellAttr()->GetAlignment(& hAlign, & vAlign);
+
+ int x = 0, y = 0;
+ if (hAlign == wxALIGN_LEFT)
+ {
+ x = r.x + 2;
+#ifdef __WXMSW__
+ x += 2;
+#endif
+ y = r.y + r.height/2 - size.y/2;
+ }
+ else if (hAlign == wxALIGN_RIGHT)
+ {
+ x = r.x + r.width - size.x - 2;
+ y = r.y + r.height/2 - size.y/2;
+ }
+ else if (hAlign == wxALIGN_CENTRE)
+ {
+ x = r.x + r.width/2 - size.x/2;
+ y = r.y + r.height/2 - size.y/2;
+ }
+
+ m_control->Move(x, y);
}
void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
return FALSE;
}
+// return the value as "1" for true and the empty string for false
+wxString wxGridCellBoolEditor::GetValue() const
+{
+ bool bSet = CBox()->GetValue();
+ return bSet ? _T("1") : wxEmptyString;
+}
+
#endif // wxUSE_CHECKBOX
#if wxUSE_COMBOBOX
m_startValue = grid->GetTable()->GetValue(row, col);
- Combo()->SetValue(m_startValue);
- size_t count = m_choices.GetCount();
- for (size_t i=0; i<count; i++)
+ if (m_allowOthers)
+ Combo()->SetValue(m_startValue);
+ else
{
- if (m_startValue == m_choices[i])
- {
- Combo()->SetSelection(i);
- break;
- }
+ // find the right position, or default to the first if not found
+ int pos = Combo()->FindString(m_startValue);
+ if (pos == -1)
+ pos = 0;
+ Combo()->SetSelection(pos);
}
Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
grid->GetTable()->SetValue(row, col, value);
m_startValue = wxEmptyString;
- Combo()->SetValue(m_startValue);
+ if (m_allowOthers)
+ Combo()->SetValue(m_startValue);
+ else
+ Combo()->SetSelection(0);
return changed;
}
}
}
+// return the value in the text control
+wxString wxGridCellChoiceEditor::GetValue() const
+{
+ return Combo()->GetValue();
+}
+
#endif // wxUSE_COMBOBOX
// ----------------------------------------------------------------------------
void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
{
- switch ( event.KeyCode() )
+ switch ( event.GetKeyCode() )
{
case WXK_ESCAPE:
m_editor->Reset();
void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
{
- switch ( event.KeyCode() )
+ switch ( event.GetKeyCode() )
{
case WXK_ESCAPE:
case WXK_TAB:
{
dc.SetBackgroundMode( wxSOLID );
- if ( isSelected )
+ // grey out fields if the grid is disabled
+ if( grid.IsEnabled() )
{
- dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ if ( isSelected )
+ {
+ dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ }
+ else
+ {
+ dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ }
}
else
{
- dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
}
dc.SetPen( *wxTRANSPARENT_PEN );
// TODO some special colours for attr.IsReadOnly() case?
- if ( isSelected )
+ // different coloured text when the grid is disabled
+ if( grid.IsEnabled() )
{
- dc.SetTextBackground( grid.GetSelectionBackground() );
- dc.SetTextForeground( grid.GetSelectionForeground() );
+ if ( isSelected )
+ {
+ dc.SetTextBackground( grid.GetSelectionBackground() );
+ dc.SetTextForeground( grid.GetSelectionForeground() );
+ }
+ else
+ {
+ dc.SetTextBackground( attr.GetBackgroundColour() );
+ dc.SetTextForeground( attr.GetTextColour() );
+ }
}
else
{
- dc.SetTextBackground( attr.GetBackgroundColour() );
- dc.SetTextForeground( attr.GetTextColour() );
+ dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+ dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT));
}
dc.SetFont( attr.GetFont() );
bool isSelected)
{
wxRect rect = rectCell;
+ rect.Inflate(-1);
+
+ // erase only this cells background, overflow cells should have been erased
+ wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+
+ int hAlign, vAlign;
+ attr.GetAlignment(&hAlign, &vAlign);
+
+ int overflowCols = 0;
if (attr.GetOverflow())
{
int i, c_cols, c_rows;
for (i = col+cell_cols; i < cols; i++)
{
- // check w/ anchor cell for multicell block
- grid.GetCellSize(row, i, &c_rows, &c_cols);
- if (c_rows > 0) c_rows = 0;
- if (grid.GetTable()->IsEmptyCell(row+c_rows, i))
+ bool is_empty = TRUE;
+ for (int j=row; j<row+cell_rows; j++)
{
+ // check w/ anchor cell for multicell block
+ grid.GetCellSize(j, i, &c_rows, &c_cols);
+ if (c_rows > 0) c_rows = 0;
+ if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
+ {
+ is_empty = FALSE;
+ break;
+ }
+ }
+ if (is_empty)
rect.width += grid.GetColSize(i);
- if (rect.width >= best_width) break;
+ else
+ {
+ i--;
+ break;
}
- else break;
+ if (rect.width >= best_width) break;
}
+ overflowCols = i - col - cell_cols + 1;
+ if (overflowCols >= cols) overflowCols = cols - 1;
}
- }
- // erase only this cells background, overflow cells should have been erased
- wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+ if (overflowCols > 0) // redraw overflow cells w/ proper hilight
+ {
+ hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned
+ wxRect clip = rect;
+ clip.x += rectCell.width;
+ // draw each overflow cell individually
+ int col_end = col+cell_cols+overflowCols;
+ if (col_end >= grid.GetNumberCols())
+ col_end = grid.GetNumberCols() - 1;
+ for (int i = col+cell_cols; i <= col_end; i++)
+ {
+ clip.width = grid.GetColSize(i) - 1;
+ dc.DestroyClippingRegion();
+ dc.SetClippingRegion(clip);
- // now we only have to draw the text
- SetTextColoursAndFont(grid, attr, dc, isSelected);
+ SetTextColoursAndFont(grid, attr, dc,
+ grid.IsInSelection(row,i));
- int hAlign, vAlign;
- attr.GetAlignment(&hAlign, &vAlign);
+ grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+ rect, hAlign, vAlign);
+ clip.x += grid.GetColSize(i) - 1;
+ }
- rect.Inflate(-1);
+ rect = rectCell;
+ rect.Inflate(-1);
+ rect.width++;
+ dc.DestroyClippingRegion();
+ }
+ }
+
+ // now we only have to draw the text
+ SetTextColoursAndFont(grid, attr, dc, isSelected);
grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
rect, hAlign, vAlign);
{
if ( m_precision == -1 )
{
- // default width/precision
- m_format = _T("%f");
- }
+ // default width/precision
+ m_format = _T("%f");
+ }
else
{
m_format.Printf(_T("%%.%df"), m_precision);
}
// draw a border around checkmark
+ int vAlign, hAlign;
+ attr.GetAlignment(& hAlign, &vAlign);
+
wxRect rectBorder;
- rectBorder.x = rect.x + rect.width/2 - size.x/2;
- rectBorder.y = rect.y + rect.height/2 - size.y/2;
- rectBorder.width = size.x;
- rectBorder.height = size.y;
+ if (hAlign == wxALIGN_CENTRE)
+ {
+ rectBorder.x = rect.x + rect.width/2 - size.x/2;
+ rectBorder.y = rect.y + rect.height/2 - size.y/2;
+ rectBorder.width = size.x;
+ rectBorder.height = size.y;
+ }
+ else if (hAlign == wxALIGN_LEFT)
+ {
+ rectBorder.x = rect.x + 2;
+ rectBorder.y = rect.y + rect.height/2 - size.y/2;
+ rectBorder.width = size.x;
+ rectBorder.height = size.y;
+ }
+ else if (hAlign == wxALIGN_RIGHT)
+ {
+ rectBorder.x = rect.x + rect.width - size.x - 2;
+ rectBorder.y = rect.y + rect.height/2 - size.y/2;
+ rectBorder.width = size.x;
+ rectBorder.height = size.y;
+ }
bool value;
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
m_attrkind = wxGridCellAttr::Cell;
m_sizeRows = m_sizeCols = 1;
- m_overflow = TRUE;
+ m_overflow = UnsetOverflow;
SetDefAttr(attrDefault);
}
if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
SetReadOnly(mergefrom->IsReadOnly());
+ if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
+ SetOverflow(mergefrom->GetOverflow());
+
SetDefAttr(mergefrom->m_defGridAttr);
}
if ( numRows >= curNumRows )
{
- m_data.Clear(); // don't release memory just yet
+ m_data.Clear();
}
else
{
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE )
{
m_owner = parent;
}
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE )
{
m_owner = parent;
}
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE )
{
m_owner = parent;
}
int client_width = 0;
GetClientSize( &client_width, &client_height );
- dc.SetPen( *wxBLACK_PEN );
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
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 );
+
+ dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( 1, 1, client_width-1, 1 );
+ dc.DrawLine( 1, 1, 1, client_height-1 );
}
wxGridWindow::wxGridWindow( wxGrid *parent,
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
- wxWindowID id, const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS, wxT("grid window") )
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN,
+ wxT("grid window") )
+
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
const wxArrayInt& BorderArray, int nMax,
- bool maxOnOverflow);
+ bool clipToMinMax);
#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
- WXGRID_MIN_COL_WIDTH, \
+ m_minAcceptableColWidth, \
m_colRights, m_numCols, TRUE)
#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
- WXGRID_MIN_ROW_HEIGHT, \
+ m_minAcceptableRowHeight, \
m_rowBottoms, m_numRows, TRUE)
/////////////////////////////////////////////////////////////////////
{
if ( m_created )
{
- // RD: Actually, this should probably be allowed. I think it would be
- // nice to be able to switch multiple Tables in and out of a single
- // View at runtime. Is there anything in the implementation that
- // would prevent this?
+ // stop all processing
+ m_created = FALSE;
- // At least, you now have to cope with m_selection
- wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
- return FALSE;
+ if (m_ownTable)
+ {
+ wxGridTableBase *t=m_table;
+ m_table=0;
+ delete t;
+ }
+ delete m_selection;
+
+ m_table=0;
+ m_selection=0;
+ m_numRows=0;
+ m_numCols=0;
}
- else
+ if (table)
{
m_numRows = table->GetNumberRows();
m_numCols = table->GetNumberCols();
// init attr cache
m_attrCache.row = -1;
+ m_attrCache.col = -1;
+ m_attrCache.attr = NULL;
// TODO: something better than this ?
//
m_labelFont = this->GetFont();
- m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+ m_labelFont.SetWeight( wxBOLD );
- m_rowLabelHorizAlign = wxALIGN_LEFT;
+ m_rowLabelHorizAlign = wxALIGN_CENTRE;
m_rowLabelVertAlign = wxALIGN_CENTRE;
m_colLabelHorizAlign = wxALIGN_CENTRE;
- m_colLabelVertAlign = wxALIGN_TOP;
+ m_colLabelVertAlign = wxALIGN_CENTRE;
+ m_colLabelTextOrientation = wxHORIZONTAL;
m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH;
m_defaultRowHeight = m_gridWin->GetCharHeight();
+ m_minAcceptableColWidth = WXGRID_MIN_COL_WIDTH;
+ m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT;
+
#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl()
m_defaultRowHeight += 8;
#else
m_defaultRowHeight += 4;
#endif
- m_gridLineColour = wxColour( 128, 128, 255 );
+ m_gridLineColour = wxColour( 192,192,192 );
m_gridLinesEnabled = TRUE;
- m_cellHighlightColour = m_gridLineColour;
+ m_cellHighlightColour = *wxBLACK;
m_cellHighlightPenWidth = 2;
m_cellHighlightROPenWidth = 1;
m_rowBottoms.Alloc( m_numRows );
int rowBottom = 0;
-
+
m_rowHeights.Add( m_defaultRowHeight, m_numRows );
for ( int i = 0; i < m_numRows; i++ )
int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+ // take into account editor if shown
+ if( IsCellEditControlShown() )
+ {
+ int w2, h2;
+ int r = m_currentCellCoords.GetRow();
+ int c = m_currentCellCoords.GetCol();
+ int x = GetColLeft(c);
+ int y = GetRowTop(r);
+
+ // how big is the editor
+ wxGridCellAttr* attr = GetCellAttr(r, c);
+ wxGridCellEditor* editor = attr->GetEditor(this, r, c);
+ editor->GetControl()->GetSize(&w2, &h2);
+ w2 += x;
+ h2 += y;
+ if( w2 > w ) w = w2;
+ if( h2 > h ) h = h2;
+ editor->DecRef();
+ attr->DecRef();
+ }
+
// preserve (more or less) the previous position
int x, y;
GetViewStart( &x, &y );
//
else if (event.LeftDClick() )
{
- if ( YToEdgeOfRow(y) < 0 )
+ int row = YToEdgeOfRow(y);
+ if ( row < 0 )
{
row = YToRow(y);
- SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
+ if ( row >=0 &&
+ !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+ {
+ // no default action at the moment
+ }
+ }
+ else
+ {
+ // adjust row height depending on label text
+ AutoSizeRowLabelSize( row );
+
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+ m_dragLastPos = -1;
}
}
else if ( event.RightDown() )
{
row = YToRow(y);
- if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+ if ( row >=0 &&
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
{
// no default action at the moment
}
else if ( event.RightDClick() )
{
row = YToRow(y);
- if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+ if ( row >= 0 &&
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
{
// no default action at the moment
}
//
if ( event.LeftDClick() )
{
- if ( XToEdgeOfCol(x) < 0 )
+ int col = XToEdgeOfCol(x);
+ if ( col < 0 )
{
col = XToCol(x);
- SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event );
+ if ( col >= 0 &&
+ ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
+ {
+ // no default action at the moment
+ }
+ }
+ else
+ {
+ // adjust column width depending on label text
+ AutoSizeColLabelSize( col );
+
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+ m_dragLastPos = -1;
}
}
else if ( event.RightDown() )
{
col = XToCol(x);
- if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+ if ( col >= 0 &&
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
{
// no default action at the moment
}
else if ( event.RightDClick() )
{
col = XToCol(x);
- if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+ if ( col >= 0 &&
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
{
// no default action at the moment
}
DisableCellEditControl();
MakeCellVisible( coords );
- // if this is the second click on this cell then start
- // the edit control
- if ( m_waitForSlowClick &&
- (coords == m_currentCellCoords) &&
- CanEnableCellControl())
+ if ( event.ControlDown() )
{
- EnableCellEditControl();
-
- wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
- wxGridCellEditor *editor = attr->GetEditor(this,
- coords.GetRow(),
- coords.GetCol());
- editor->StartingClick();
- editor->DecRef();
- attr->DecRef();
-
- m_waitForSlowClick = FALSE;
+ if ( m_selection )
+ {
+ m_selection->ToggleCellSelection( coords.GetRow(),
+ coords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ m_selectingKeyboard = coords;
}
else
{
- if ( event.ControlDown() )
- {
- if ( m_selection )
- {
- m_selection->ToggleCellSelection( coords.GetRow(),
- coords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
- m_selectingKeyboard = coords;
- }
- else
+ m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
+ SetCurrentCell( coords );
+ if ( m_selection )
{
- SetCurrentCell( coords );
- if ( m_selection )
+ if ( m_selection->GetSelectionMode() !=
+ wxGrid::wxGridSelectCells )
{
- if ( m_selection->GetSelectionMode() !=
- wxGrid::wxGridSelectCells )
- {
- HighlightBlock( coords, coords );
- }
+ HighlightBlock( coords, coords );
}
}
- m_waitForSlowClick = TRUE;
}
}
}
{
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- if ( m_selectingTopLeft != wxGridNoCellCoords &&
- m_selectingBottomRight != wxGridNoCellCoords )
+ if (m_winCapture)
{
- if (m_winCapture)
- {
- if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
- m_winCapture = NULL;
- }
+ if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+ m_winCapture = NULL;
+ }
+
+ if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl())
+ {
+ ClearSelection();
+ EnableCellEditControl();
+
+ wxGridCellAttr* attr = GetCellAttr(coords);
+ wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+ editor->StartingClick();
+ editor->DecRef();
+ attr->DecRef();
+ m_waitForSlowClick = FALSE;
+ }
+ else if ( m_selectingTopLeft != wxGridNoCellCoords &&
+ m_selectingBottomRight != wxGridNoCellCoords )
+ {
if ( m_selection )
{
m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
- }
- // Show the edit control, if it has been hidden for
- // drag-shrinking.
- ShowCellEditControl();
+ // Show the edit control, if it has been hidden for
+ // drag-shrinking.
+ ShowCellEditControl();
+ }
}
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{
//
else if ( event.Moving() && !event.IsButton() )
{
+ if( coords.GetRow() < 0 || coords.GetCol() < 0 )
+ {
+ // out of grid cell area
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ return;
+ }
+
int dragRow = YToEdgeOfRow( y );
int dragCol = XToEdgeOfCol( x );
return;
}
- if ( dragRow >= 0 && dragRow < GetNumberRows())
+ if ( dragRow >= 0 )
{
m_dragRowOrCol = dragRow;
return;
}
- if ( dragCol >= 0 && dragCol < GetNumberCols())
+ if ( dragCol >= 0 )
{
m_dragRowOrCol = dragCol;
int rowTop = GetRowTop(m_dragRowOrCol);
SetRowSize( m_dragRowOrCol,
- wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+ wxMax( m_dragLastPos - rowTop, m_minAcceptableRowHeight ) );
if ( !GetBatchCount() )
{
{
int i, cell_rows, cell_cols, subtract_rows = 0;
int leftCol = XToCol(left);
- int rightCol = XToCol(left+cw);
+ int rightCol = internalXToCol(left+cw);
if (leftCol >= 0)
{
- if (rightCol < 0) rightCol = m_numCols;
for (i=leftCol; i<rightCol; i++)
{
GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
{
int i, cell_rows, cell_cols, subtract_cols = 0;
int topRow = YToRow(top);
- int bottomRow = YToRow(top+cw);
+ int bottomRow = internalYToRow(top+cw);
if (topRow >= 0)
{
- if (bottomRow < 0) bottomRow = m_numRows;
for (i=topRow; i<bottomRow; i++)
{
GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
if (IsCellEditControlEnabled())
DisableCellEditControl();
- return m_table->InsertRows( pos, numRows );
+ bool done = m_table->InsertRows( pos, numRows );
+ return done;
// the table will have sent the results of the insert row
// operation to this view object as a grid table message
return FALSE;
}
- return ( m_table && m_table->AppendRows( numRows ) );
- // the table will have sent the results of the append row
- // operation to this view object as a grid table message
+ if ( m_table )
+ {
+ bool done = m_table && m_table->AppendRows( numRows );
+ return done;
+ // the table will have sent the results of the append row
+ // operation to this view object as a grid table message
+ }
+ return FALSE;
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- return (m_table->DeleteRows( pos, numRows ));
+ bool done = m_table->DeleteRows( pos, numRows );
+ return done;
// the table will have sent the results of the delete row
// operation to this view object as a grid table message
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- return m_table->InsertCols( pos, numCols );
+ bool done = m_table->InsertCols( pos, numCols );
+ return done;
// the table will have sent the results of the insert col
// operation to this view object as a grid table message
}
return FALSE;
}
- return ( m_table && m_table->AppendCols( numCols ) );
- // the table will have sent the results of the append col
- // operation to this view object as a grid table message
+ if ( m_table )
+ {
+ bool done = m_table->AppendCols( numCols );
+ return done;
+ // the table will have sent the results of the append col
+ // operation to this view object as a grid table message
+ }
+ return FALSE;
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- return ( m_table->DeleteCols( pos, numCols ) );
+ bool done = m_table->DeleteCols( pos, numCols );
+ return done;
// the table will have sent the results of the delete col
// operation to this view object as a grid table message
}
else
{
m_cornerLabelWin->Refresh(eraseb, NULL);
- m_colLabelWin->Refresh(eraseb, NULL);
+ m_colLabelWin->Refresh(eraseb, NULL);
m_rowLabelWin->Refresh(eraseb, NULL);
m_gridWin->Refresh(eraseb, NULL);
}
// try local handlers
//
- switch ( event.KeyCode() )
+ switch ( event.GetKeyCode() )
{
case WXK_UP:
if ( event.ControlDown() )
// <F2> is special and will always start editing, for
// other keys - ask the editor itself
- if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
+ if ( (event.GetKeyCode() == WXK_F2 && !event.HasModifiers())
|| editor->IsAcceptedKey(event) )
{
+ // ensure cell is visble
+ MakeCellVisible(row, col);
EnableCellEditControl();
- // the editor could be not shown for a variety of
- // reasons (i.e. blocked by the app or whatever), so
- // check if it really was created
- if ( m_cellEditCtrlEnabled )
- {
- editor->StartingKey(event);
- }
+ // a problem can arise if the cell is not completely
+ // visible (even after calling MakeCellVisible the
+ // control is not created and calling StartingKey will
+ // crash the app
+ if( editor->IsCreated() && m_cellEditCtrlEnabled ) editor->StartingKey(event);
}
else
{
{
// try local handlers
//
- if ( event.KeyCode() == WXK_SHIFT )
+ if ( event.GetKeyCode() == WXK_SHIFT )
{
if ( m_selectingTopLeft != wxGridNoCellCoords &&
m_selectingBottomRight != wxGridNoCellCoords )
wxRect rect;
rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
wxGridCellCoords ( bottomRow, rightCol ) );
- m_gridWin->Refresh( FALSE, &rect );
+ m_gridWin->Refresh( FALSE, &rect );
}
// Now handle changing an existing selection area.
else if ( m_selectingTopLeft != updateTopLeft ||
{
if ( !m_numRows || !m_numCols ) return;
- int i, j, k, l, numCells = cells.GetCount();
+ int i, numCells = cells.GetCount();
int row, col, cell_rows, cell_cols;
wxGridCellCoordsArray redrawCells;
{
wxGridCellCoords cell(row+cell_rows, col+cell_cols);
bool marked = FALSE;
- for ( j = 0; j < numCells; j++ )
+ for ( int j = 0; j < numCells; j++ )
{
if ( cell == cells[j] )
{
if (!marked)
{
int count = redrawCells.GetCount();
- for (j = 0; j < count; j++)
+ for (int j = 0; j < count; j++)
{
if ( cell == redrawCells[j] )
{
// If this cell is empty, find cell to left that might want to overflow
if (m_table && m_table->IsEmptyCell(row, col))
{
- for ( l = 0; l < cell_rows; l++ )
+ for ( int l = 0; l < cell_rows; l++ )
{
- for (j = col-1; j >= 0; j--)
+ // find a cell in this row to left alreay marked for repaint
+ int left = col;
+ for (int k = 0; k < int(redrawCells.GetCount()); k++)
+ if ((redrawCells[k].GetCol() < left) &&
+ (redrawCells[k].GetRow() == row))
+ left=redrawCells[k].GetCol();
+
+ if (left == col) left = 0; // oh well
+
+ for (int j = col-1; j >= left; j--)
{
if (!m_table->IsEmptyCell(row+l, j))
{
wxGridCellCoords cell(row+l, j);
bool marked = FALSE;
- for (k = 0; k < numCells; k++)
+ for (int k = 0; k < numCells; k++)
{
if ( cell == cells[k] )
{
if (!marked)
{
int count = redrawCells.GetCount();
- for (k = 0; k < count; k++)
+ for (int k = 0; k < count; k++)
{
if ( cell == redrawCells[k] )
{
// Now draw the rectangle
- dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID));
+ // use the cellHighlightColour if the cell is inside a selection, this
+ // will ensure the cell is always visible.
+ dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
}
bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
// no gridlines inside multicells, clip them out
- int leftCol = XToCol(left);
- int topRow = YToRow(top);
- int rightCol = XToCol(right);
- int bottomRow = YToRow(bottom);
+ int leftCol = internalXToCol(left);
+ int topRow = internalYToRow(top);
+ int rightCol = internalXToCol(right);
+ int bottomRow = internalYToRow(bottom);
wxRegion clippedcells(0, 0, cw, ch);
- if ((leftCol >= 0) && (topRow >= 0))
- {
- if (rightCol < 0) rightCol = m_numCols;
- if (bottomRow < 0) bottomRow = m_numRows;
- int i, j, cell_rows, cell_cols;
- wxRect rect;
+ int i, j, cell_rows, cell_cols;
+ wxRect rect;
- for (j=topRow; j<bottomRow; j++)
+ for (j=topRow; j<bottomRow; j++)
+ {
+ for (i=leftCol; i<rightCol; i++)
{
- for (i=leftCol; i<rightCol; i++)
+ GetCellSize( j, i, &cell_rows, &cell_cols );
+ if ((cell_rows > 1) || (cell_cols > 1))
{
- GetCellSize( j, i, &cell_rows, &cell_cols );
- if ((cell_rows > 1) || (cell_cols > 1))
- {
- rect = CellToRect(j,i);
- CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
- clippedcells.Subtract(rect);
- }
- else if ((cell_rows < 0) || (cell_cols < 0))
- {
- rect = CellToRect(j+cell_rows, i+cell_cols);
- CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
- clippedcells.Subtract(rect);
- }
+ rect = CellToRect(j,i);
+ CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+ clippedcells.Subtract(rect);
+ }
+ else if ((cell_rows < 0) || (cell_cols < 0))
+ {
+ rect = CellToRect(j+cell_rows, i+cell_cols);
+ CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+ clippedcells.Subtract(rect);
}
}
}
// horizontal grid lines
//
- int i;
+ // already declared above - int i;
for ( i = internalYToRow(top); i < m_numRows; i++ )
{
int bot = GetRowBottom(i) - 1;
int rowTop = GetRowTop(row),
rowBottom = GetRowBottom(row) - 1;
- dc.SetPen( *wxBLACK_PEN );
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
dc.DrawLine( m_rowLabelWidth-1, rowTop,
m_rowLabelWidth-1, rowBottom );
- dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
+ dc.DrawLine( 0, rowTop, 0, rowBottom );
+
+ dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );
dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( 0, rowTop, 0, rowBottom );
- dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+ dc.DrawLine( 1, rowTop, 1, rowBottom );
+ dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
int colLeft = GetColLeft(col),
colRight = GetColRight(col) - 1;
- dc.SetPen( *wxBLACK_PEN );
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
dc.DrawLine( colRight, 0,
colRight, m_colLabelHeight-1 );
+ dc.DrawLine( colLeft, 0, colRight, 0 );
+
dc.DrawLine( colLeft, m_colLabelHeight-1,
- colRight, m_colLabelHeight-1 );
+ colRight+1, m_colLabelHeight-1 );
dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
- dc.DrawLine( colLeft, 0, colRight, 0 );
+ dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+ dc.DrawLine( colLeft, 1, colRight, 1 );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
- dc.SetBackgroundMode( wxTRANSPARENT );
- dc.SetTextForeground( GetLabelTextColour() );
- dc.SetFont( GetLabelFont() );
-
- int hAlign, vAlign;
+ int hAlign, vAlign, orient;
GetColLabelAlignment( &hAlign, &vAlign );
+ orient = GetColLabelTextOrientation();
wxRect rect;
rect.SetX( colLeft + 2 );
rect.SetY( 2 );
rect.SetWidth( GetColWidth(col) - 4 );
rect.SetHeight( m_colLabelHeight - 4 );
- DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
+ DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign, orient );
}
void wxGrid::DrawTextRectangle( wxDC& dc,
const wxString& value,
const wxRect& rect,
int horizAlign,
- int vertAlign )
+ int vertAlign,
+ int textOrientation )
{
wxArrayString lines;
//Forward to new API.
DrawTextRectangle( dc,
- lines,
- rect,
- horizAlign,
- vertAlign );
+ lines,
+ rect,
+ horizAlign,
+ vertAlign,
+ textOrientation );
}
void wxGrid::DrawTextRectangle( wxDC& dc,
- const wxArrayString& lines,
- const wxRect& rect,
- int horizAlign,
- int vertAlign )
+ const wxArrayString& lines,
+ const wxRect& rect,
+ int horizAlign,
+ int vertAlign,
+ int textOrientation )
{
long textWidth, textHeight;
long lineWidth, lineHeight;
+ int nLines;
dc.SetClippingRegion( rect );
- if ( lines.GetCount() )
+
+ nLines = lines.GetCount();
+ if( nLines > 0 )
{
- GetTextBoxSize( dc, lines, &textWidth, &textHeight );
- dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
+ int l;
+ float x = 0.0, y = 0.0;
- float x, y;
- switch ( horizAlign )
+ if( textOrientation == wxHORIZONTAL )
+ GetTextBoxSize(dc, lines, &textWidth, &textHeight);
+ else
+ GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+
+ switch( vertAlign )
{
- case wxALIGN_RIGHT:
- x = rect.x + (rect.width - textWidth - 1);
- break;
+ case wxALIGN_BOTTOM:
+ if( textOrientation == wxHORIZONTAL )
+ y = rect.y + (rect.height - textHeight - 1);
+ else
+ x = rect.x + rect.width - textWidth;
+ break;
- case wxALIGN_CENTRE:
+ case wxALIGN_CENTRE:
+ if( textOrientation == wxHORIZONTAL )
+ y = rect.y + ((rect.height - textHeight)/2);
+ else
x = rect.x + ((rect.width - textWidth)/2);
- break;
+ break;
- case wxALIGN_LEFT:
- default:
+ case wxALIGN_TOP:
+ default:
+ if( textOrientation == wxHORIZONTAL )
+ y = rect.y + 1;
+ else
x = rect.x + 1;
- break;
+ break;
}
- switch ( vertAlign )
+ // Align each line of a multi-line label
+ for( l = 0; l < nLines; l++ )
{
- case wxALIGN_BOTTOM:
- y = rect.y + (rect.height - textHeight - 1);
+ dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+
+ switch( horizAlign )
+ {
+ case wxALIGN_RIGHT:
+ if( textOrientation == wxHORIZONTAL )
+ x = rect.x + (rect.width - lineWidth - 1);
+ else
+ y = rect.y + lineWidth + 1;
break;
case wxALIGN_CENTRE:
- y = rect.y + ((rect.height - textHeight)/2);
+ if( textOrientation == wxHORIZONTAL )
+ x = rect.x + ((rect.width - lineWidth)/2);
+ else
+ y = rect.y + rect.height - ((rect.height - lineWidth)/2);
break;
- case wxALIGN_TOP:
+ case wxALIGN_LEFT:
default:
- y = rect.y + 1;
+ if( textOrientation == wxHORIZONTAL )
+ x = rect.x + 1;
+ else
+ y = rect.y + rect.height - 1;
break;
- }
+ }
- for ( size_t i = 0; i < lines.GetCount(); i++ )
- {
- dc.DrawText( lines[i], (int)x, (int)y );
- y += lineHeight;
+ if( textOrientation == wxHORIZONTAL )
+ {
+ dc.DrawText( lines[l], (int)x, (int)y );
+ y += lineHeight;
+ }
+ else
+ {
+ dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
+ x += lineHeight;
+ }
}
}
-
dc.DestroyClippingRegion();
}
GetEventHandler()->ProcessEvent(evt);
}
- editor->Show( TRUE, attr );
// resize editor to overflow into righthand cells if allowed
+ int maxWidth = rect.width;
wxString value = GetCellValue(row, col);
if ( (value != wxEmptyString) && (attr->GetOverflow()) )
{
- wxClientDC dc(m_gridWin);
- wxCoord y = 0, best_width = 0;
- dc.SetFont(attr->GetFont());
- dc.GetTextExtent(value, &best_width, &y);
-
- int cell_rows, cell_cols;
- attr->GetSize( &cell_rows, &cell_cols );
+ int y;
+ GetTextExtent(value, &maxWidth, &y,
+ NULL, NULL, &attr->GetFont());
+ if (maxWidth < rect.width) maxWidth = rect.width;
+ }
+ int client_right = m_gridWin->GetClientSize().GetWidth();
+ if (rect.x+maxWidth > client_right)
+ maxWidth = client_right - rect.x;
- if ((best_width > rect.width) && (col < m_numCols) && m_table)
+ if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
+ {
+ GetCellSize( row, col, &cell_rows, &cell_cols );
+ // may have changed earlier
+ for (int i = col+cell_cols; i < m_numCols; i++)
{
- int i;
- for (i = col+cell_cols; i < m_numCols; i++)
- {
- if (m_table->IsEmptyCell(row,i))
- {
- rect.width += GetColWidth(i);
- if (rect.width >= best_width) break;
- }
- else
- break;
- }
+ int c_rows, c_cols;
+ GetCellSize( row, i, &c_rows, &c_cols );
+ // looks weird going over a multicell
+ if (m_table->IsEmptyCell(row,i) &&
+ (rect.width < maxWidth) && (c_rows == 1))
+ rect.width += GetColWidth(i);
+ else
+ break;
}
+ if (rect.GetRight() > client_right)
+ rect.SetRight(client_right-1);
}
+
+ editor->SetCellAttr(attr);
editor->SetSize( rect );
+ editor->Show( TRUE, attr );
+
+ // recalc dimensions in case we need to
+ // expand the scrolled window to account for editor
+ CalcDimensions();
editor->BeginEdit(row, col, this);
+ editor->SetCellAttr(NULL);
editor->DecRef();
attr->DecRef();
- }
+ }
}
}
static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
const wxArrayInt& BorderArray, int nMax,
- bool maxOnOverflow)
+ bool clipToMinMax)
{
+
+ if (coord < 0)
+ return clipToMinMax && (nMax > 0) ? 0 : -1;
+
+
if (!defaultDist)
defaultDist = 1;
+
size_t i_max = coord / defaultDist,
i_min = 0;
+
if (BorderArray.IsEmpty())
{
- if((int) i_max <= nMax)
+ if((int) i_max < nMax)
return i_max;
- return maxOnOverflow ? (int)i_max : -1;
+ return clipToMinMax ? nMax - 1 : -1;
}
if ( i_max >= BorderArray.GetCount())
i_max = BorderArray.GetCount() - 1;
}
if ( coord >= BorderArray[i_max])
- return maxOnOverflow ? (int)i_max : -1;
+ return clipToMinMax ? (int)i_max : -1;
if ( coord < BorderArray[0] )
return 0;
int wxGrid::YToRow( int y )
{
return CoordToRowOrCol(y, m_defaultRowHeight,
- WXGRID_MIN_ROW_HEIGHT, m_rowBottoms, m_numRows, FALSE);
+ m_minAcceptableRowHeight, m_rowBottoms, m_numRows, FALSE);
}
int wxGrid::XToCol( int x )
{
return CoordToRowOrCol(x, m_defaultColWidth,
- WXGRID_MIN_COL_WIDTH, m_colRights, m_numCols, FALSE);
+ m_minAcceptableColWidth, m_colRights, m_numCols, FALSE);
}
}
else if ( right > cw )
{
- int w = r.GetWidth();
- xpos = r.GetLeft();
- for ( i = col-1; i >= 0; i-- )
- {
- int colWidth = GetColWidth(i);
- if ( w + colWidth > cw )
- break;
-
- w += colWidth;
- xpos -= colWidth;
- }
+ // position the view so that the cell is on the right
+ int x0, y0;
+ CalcUnscrolledPosition(0, 0, &x0, &y0);
+ xpos = x0 + (right - cw);
// see comment for ypos above
xpos += GRID_SCROLL_LINE_X;
m_gridWin->GetClientSize( &cw, &ch );
int y = GetRowTop(row);
- int newRow = YToRow( y - ch + 1 );
- if ( newRow == -1 )
- {
- newRow = 0;
- }
- else if ( newRow == row )
+ int newRow = internalYToRow( y - ch + 1 );
+
+ if ( newRow == row )
{
+ //row > 0 , so newrow can never be less than 0 here.
newRow = row - 1;
}
if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
int row = m_currentCellCoords.GetRow();
- if ( row < m_numRows )
+ if ( (row+1) < m_numRows )
{
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
int y = GetRowTop(row);
- int newRow = YToRow( y + ch );
- if ( newRow == -1 )
+ int newRow = internalYToRow( y + ch );
+ if ( newRow == row )
{
- newRow = m_numRows - 1;
- }
- else if ( newRow == row )
- {
- newRow = row + 1;
+ // row < m_numRows , so newrow can't overflow here.
+ newRow = row + 1;
}
MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
*vert = m_colLabelVertAlign;
}
+int wxGrid::GetColLabelTextOrientation()
+{
+ return m_colLabelTextOrientation;
+}
+
wxString wxGrid::GetRowLabelValue( int row )
{
if ( m_table )
}
}
+// Note: under MSW, the default column label font must be changed because it
+// does not support vertical printing
+//
+// Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD);
+// pGrid->SetLabelFont(font);
+// pGrid->SetColLabelTextOrientation(wxVERTICAL);
+//
+void wxGrid::SetColLabelTextOrientation( int textOrientation )
+{
+ if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
+ {
+ m_colLabelTextOrientation = textOrientation;
+ }
+
+ if ( !GetBatchCount() )
+ {
+ m_colLabelWin->Refresh();
+ }
+}
+
void wxGrid::SetRowLabelValue( int row, const wxString& s )
{
if ( m_table )
void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
{
- wxGrid *self = (wxGrid *)this; // const_cast
+ if ( attr != NULL )
+ {
+ wxGrid *self = (wxGrid *)this; // const_cast
- self->ClearAttrCache();
- self->m_attrCache.row = row;
- self->m_attrCache.col = col;
- self->m_attrCache.attr = attr;
- wxSafeIncRef(attr);
+ self->ClearAttrCache();
+ self->m_attrCache.row = row;
+ self->m_attrCache.col = col;
+ self->m_attrCache.attr = attr;
+ wxSafeIncRef(attr);
+ }
}
bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
{
- m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
+ m_defaultRowHeight = wxMax( height, m_minAcceptableRowHeight );
if ( resizeExistingRows )
{
{
wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
+ // See comment in SetColSize
+ if ( height < GetRowMinimalAcceptableHeight()) { return; }
+
if ( m_rowHeights.IsEmpty() )
{
// need to really create the array
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
{
- m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+ m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
if ( resizeExistingCols )
{
wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
// should we check that it's bigger than GetColMinimalWidth(col) here?
-
+ // (VZ)
+ // No, because it is reasonable to assume the library user know's
+ // what he is doing. However whe should test against the weaker
+ // constariant of minimalAcceptableWidth, as this breaks rendering
+ //
+ // This test then fixes sf.net bug #645734
+
+ if ( width < GetColMinimalAcceptableWidth()) { return; }
+
if ( m_colWidths.IsEmpty() )
{
// need to really create the array
InitColWidths();
}
+ // if < 0 calc new width from label
+ if( width < 0 )
+ {
+ long w, h;
+ wxArrayString lines;
+ wxClientDC dc(m_colLabelWin);
+ dc.SetFont(GetLabelFont());
+ StringToLines(GetColLabelValue(col), lines);
+ GetTextBoxSize(dc, lines, &w, &h);
+ width = w + 6;
+ }
int w = wxMax( 0, width );
int diff = w - m_colWidths[col];
m_colWidths[col] = w;
void wxGrid::SetColMinimalWidth( int col, int width )
{
- m_colMinWidths.Put(col, width);
+ if (width > GetColMinimalAcceptableWidth()) {
+ m_colMinWidths[col] = width;
+ }
}
void wxGrid::SetRowMinimalHeight( int row, int width )
{
- m_rowMinHeights.Put(row, width);
+ if (width > GetRowMinimalAcceptableHeight()) {
+ m_rowMinHeights[row] = width;
+ }
}
int wxGrid::GetColMinimalWidth(int col) const
{
- long value = m_colMinWidths.Get(col);
- return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;
+ wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(col);
+ return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
}
int wxGrid::GetRowMinimalHeight(int row) const
{
- long value = m_rowMinHeights.Get(row);
- return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
+ wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(row);
+ return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
+}
+
+void wxGrid::SetColMinimalAcceptableWidth( int width )
+{
+ if ( width<1 )
+ return;
+ m_minAcceptableColWidth = width;
+}
+
+void wxGrid::SetRowMinimalAcceptableHeight( int height )
+{
+ if ( height<1 )
+ return;
+ m_minAcceptableRowHeight = height;
+};
+
+int wxGrid::GetColMinimalAcceptableWidth() const
+{
+ return m_minAcceptableColWidth;
+}
+
+int wxGrid::GetRowMinimalAcceptableHeight() const
+{
+ return m_minAcceptableRowHeight;
}
// ----------------------------------------------------------------------------
dc.SetFont( GetLabelFont() );
if ( column )
+ {
dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+ if( GetColLabelTextOrientation() == wxVERTICAL )
+ w = h;
+ }
else
dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
// round up the size to a multiple of scroll step - this ensures that we
// won't get the scrollbars if we're sized exactly to this width
- wxSize sizeFit(GetScrollX(size.x) * GRID_SCROLL_LINE_X,
- GetScrollY(size.y) * GRID_SCROLL_LINE_Y);
+ // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
+ // scrollbar steps
+ wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
+ GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);
- // distribute the extra space between teh columns/rows to avoid having
+ // distribute the extra space between the columns/rows to avoid having
// extra white space
- wxCoord diff = sizeFit.x - size.x;
- if ( diff )
+
+ // Remove the extra m_extraWidth + 1 added above
+ wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+ if ( diff && m_numCols )
{
// try to resize the columns uniformly
wxCoord diffPerCol = diff / m_numCols;
}
// same for rows
- diff = sizeFit.y - size.y;
- if ( diff )
+ diff = sizeFit.y - size.y - (m_extraHeight + 1);
+ if ( diff && m_numRows )
{
// try to resize the columns uniformly
wxCoord diffPerRow = diff / m_numRows;
SetClientSize(sizeFit);
}
+void wxGrid::AutoSizeRowLabelSize( int row )
+{
+ wxArrayString lines;
+ long w, h;
+
+ // Hide the edit control, so it
+ // won't interfer with drag-shrinking.
+ if( IsCellEditControlShown() )
+ {
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
+
+ // autosize row height depending on label text
+ StringToLines( GetRowLabelValue( row ), lines );
+ wxClientDC dc( m_rowLabelWin );
+ GetTextBoxSize( dc, lines, &w, &h);
+ if( h < m_defaultRowHeight )
+ h = m_defaultRowHeight;
+ SetRowSize(row, h);
+ ForceRefresh();
+}
+
+void wxGrid::AutoSizeColLabelSize( int col )
+{
+ wxArrayString lines;
+ long w, h;
+
+ // Hide the edit control, so it
+ // won't interfer with drag-shrinking.
+ if( IsCellEditControlShown() )
+ {
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
+
+ // autosize column width depending on label text
+ StringToLines( GetColLabelValue( col ), lines );
+ wxClientDC dc( m_colLabelWin );
+ if( GetColLabelTextOrientation() == wxHORIZONTAL )
+ GetTextBoxSize( dc, lines, &w, &h);
+ else
+ GetTextBoxSize( dc, lines, &h, &w);
+ if( w < m_defaultColWidth )
+ w = m_defaultColWidth;
+ SetColSize(col, w);
+ ForceRefresh();
+}
+
wxSize wxGrid::DoGetBestSize() const
{
// don't set sizes, only calculate them
return rect;
}
-
-
//
// ------ Grid event classes
//
m_ctrl = ctrl;
}
-
-#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID
-
#endif // wxUSE_GRID
+
projects / wxWidgets.git / blobdiff