#pragma implementation "grid.h"
#endif
-// For compilers that support precompilation, includes "wx/wx.h".
+// For compilers that support precompilatixon, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/grid.h"
#include "wx/generic/gridsel.h"
+#if defined(__WXMOTIF__)
+ #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)
+#else
+ #define WXUNUSED_MOTIF(identifier) identifier
+#endif
+
+#if defined(__WXGTK__)
+ #define WXUNUSED_GTK(identifier) WXUNUSED(identifier)
+#else
+ #define WXUNUSED_GTK(identifier) identifier
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>
+
// ----------------------------------------------------------------------------
// array classes
// ----------------------------------------------------------------------------
-WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
struct wxGridCellWithAttr
{
wxGridCellAttr *attr;
};
-WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
#include "wx/arrimpl.cpp"
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
+ void OnKeyUp( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
void OnPaint( wxPaintEvent &event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
+ void OnKeyUp( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
+ void OnKeyUp( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
void OnPaint( wxPaintEvent &event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& );
+ void OnKeyUp( wxKeyEvent& );
void OnEraseBackground( wxEraseEvent& );
};
-WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
class WXDLLEXPORT wxGridTypeRegistry
{
public:
+ wxGridTypeRegistry() {}
~wxGridTypeRegistry();
void RegisterDataType(const wxString& typeName,
event.Skip();
}
+bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+ // accept the simple key presses, not anything with Ctrl/Alt/Meta
+ return !(event.ControlDown() || event.AltDown());
+}
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
{
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize
#if defined(__WXMSW__)
- , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
+ , wxTE_PROCESS_TAB | wxTE_MULTILINE |
+ wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
#endif
);
}
#else // !GTK
int extra_x = ( rect.x > 2 )? 2 : 1;
+
+// MB: treat MSW separately here otherwise the caret doesn't show
+// when the editor is in the first row.
+#if defined(__WXMSW__)
+ int extra_y = 2;
+#else
int extra_y = ( rect.y > 2 )? 2 : 1;
+#endif // MSW
+
#if defined(__WXMOTIF__)
extra_x *= 2;
extra_y *= 2;
Text()->SetInsertionPointEnd();
}
+bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+ if ( wxGridCellEditor::IsAcceptedKey(event) )
+ {
+ int keycode = event.GetKeyCode();
+ switch ( keycode )
+ {
+ case WXK_NUMPAD0:
+ case WXK_NUMPAD1:
+ case WXK_NUMPAD2:
+ case WXK_NUMPAD3:
+ case WXK_NUMPAD4:
+ case WXK_NUMPAD5:
+ case WXK_NUMPAD6:
+ case WXK_NUMPAD7:
+ case WXK_NUMPAD8:
+ case WXK_NUMPAD9:
+ case WXK_MULTIPLY:
+ case WXK_NUMPAD_MULTIPLY:
+ case WXK_ADD:
+ case WXK_NUMPAD_ADD:
+ case WXK_SUBTRACT:
+ case WXK_NUMPAD_SUBTRACT:
+ case WXK_DECIMAL:
+ case WXK_NUMPAD_DECIMAL:
+ case WXK_DIVIDE:
+ case WXK_NUMPAD_DIVIDE:
+ return TRUE;
+
+ default:
+ // accept 8 bit chars too if isprint() agrees
+ if ( (keycode < 255) && (isprint(keycode)) )
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
{
- if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
- {
- // insert the key in the control
- long keycode = event.KeyCode();
- if ( isprint(keycode) )
- {
- // FIXME this is not going to work for non letters...
- if ( !event.ShiftDown() )
- {
- keycode = tolower(keycode);
- }
+ // we don't check for !HasModifiers() because IsAcceptedKey() did it
+
+ // insert the key in the control
+ wxChar ch;
+ int keycode = event.GetKeyCode();
+ switch ( keycode )
+ {
+ case WXK_NUMPAD0:
+ case WXK_NUMPAD1:
+ case WXK_NUMPAD2:
+ case WXK_NUMPAD3:
+ case WXK_NUMPAD4:
+ case WXK_NUMPAD5:
+ case WXK_NUMPAD6:
+ case WXK_NUMPAD7:
+ case WXK_NUMPAD8:
+ case WXK_NUMPAD9:
+ ch = _T('0') + keycode - WXK_NUMPAD0;
+ break;
- Text()->AppendText((wxChar)keycode);
+ case WXK_MULTIPLY:
+ case WXK_NUMPAD_MULTIPLY:
+ ch = _T('*');
+ break;
- return;
- }
+ case WXK_ADD:
+ case WXK_NUMPAD_ADD:
+ ch = _T('+');
+ break;
+ case WXK_SUBTRACT:
+ case WXK_NUMPAD_SUBTRACT:
+ ch = _T('-');
+ break;
+
+ case WXK_DECIMAL:
+ case WXK_NUMPAD_DECIMAL:
+ ch = _T('.');
+ break;
+
+ case WXK_DIVIDE:
+ case WXK_NUMPAD_DIVIDE:
+ ch = _T('/');
+ break;
+
+ default:
+ if ( keycode < 256 && keycode >= 0 && isprint(keycode) )
+ {
+ // FIXME this is not going to work for non letters...
+ if ( !event.ShiftDown() )
+ {
+ keycode = tolower(keycode);
+ }
+
+ ch = (wxChar)keycode;
+ }
+ else
+ {
+ ch = _T('\0');
+ }
}
- event.Skip();
+ if ( ch )
+ {
+ Text()->AppendText(ch);
+ }
+ else
+ {
+ event.Skip();
+ }
}
-void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
+void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
+ WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
{
#if defined(__WXMOTIF__) || defined(__WXGTK__)
// wxMotif needs a little extra help...
- int pos = Text()->GetInsertionPoint();
+ size_t pos = (size_t)( Text()->GetInsertionPoint() );
wxString s( Text()->GetValue() );
s = s.Left(pos) + "\n" + s.Mid(pos);
Text()->SetValue(s);
long tmp;
if ( !params.ToLong(&tmp) )
{
- wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string "
- "'%s' ignored"), params.c_str());
+ wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str());
}
else
{
if ( HasRange() )
{
- Spin()->SetValue(m_valueOld);
+ Spin()->SetValue((int)m_valueOld);
+ Spin()->SetFocus();
}
else
{
if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
grid->GetTable()->SetValueAsLong(row, col, value);
else
- grid->GetTable()->SetValue(row, col, wxString::Format("%ld", value));
+ grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%ld"), value));
}
return changed;
{
if ( HasRange() )
{
- Spin()->SetValue(m_valueOld);
+ Spin()->SetValue((int)m_valueOld);
}
else
{
}
}
+bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+ if ( wxGridCellEditor::IsAcceptedKey(event) )
+ {
+ int keycode = event.GetKeyCode();
+ switch ( keycode )
+ {
+ case WXK_NUMPAD0:
+ case WXK_NUMPAD1:
+ case WXK_NUMPAD2:
+ case WXK_NUMPAD3:
+ case WXK_NUMPAD4:
+ case WXK_NUMPAD5:
+ case WXK_NUMPAD6:
+ case WXK_NUMPAD7:
+ case WXK_NUMPAD8:
+ case WXK_NUMPAD9:
+ case WXK_ADD:
+ case WXK_NUMPAD_ADD:
+ case WXK_SUBTRACT:
+ case WXK_NUMPAD_SUBTRACT:
+ case WXK_UP:
+ case WXK_DOWN:
+ return TRUE;
+
+ default:
+ if ( (keycode < 128) && isdigit(keycode) )
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
{
if ( !HasRange() )
{
- long keycode = event.KeyCode();
+ int keycode = (int) event.KeyCode();
if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
{
wxGridCellTextEditor::StartingKey(event);
}
}
- wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string "
- "'%s' ignored"), params.c_str());
+ wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
}
}
// wxGridCellFloatEditor
// ----------------------------------------------------------------------------
+wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision)
+{
+ m_width = width;
+ m_precision = precision;
+}
+
void wxGridCellFloatEditor::Create(wxWindow* parent,
wxWindowID id,
wxEvtHandler* evtHandler)
if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
grid->GetTable()->SetValueAsDouble(row, col, value);
else
- grid->GetTable()->SetValue(row, col, wxString::Format("%f", value));
+ grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%f"), value));
return TRUE;
}
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{
- long keycode = event.KeyCode();
+ int keycode = (int)event.KeyCode();
if ( isdigit(keycode) ||
keycode == '+' || keycode == '-' || keycode == '.' )
{
event.Skip();
}
+void wxGridCellFloatEditor::SetParameters(const wxString& params)
+{
+ if ( !params )
+ {
+ // reset to default
+ m_width =
+ m_precision = -1;
+ }
+ else
+ {
+ long tmp;
+ if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+ {
+ m_width = (int)tmp;
+
+ if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+ {
+ m_precision = (int)tmp;
+
+ // skip the error message below
+ return;
+ }
+ }
+
+ wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
+ }
+}
+
+wxString wxGridCellFloatEditor::GetString() const
+{
+ wxString fmt;
+ if ( m_width == -1 )
+ {
+ // default width/precision
+ fmt = _T("%g");
+ }
+ else if ( m_precision == -1 )
+ {
+ // default precision
+ fmt.Printf(_T("%%%d.g"), m_width);
+ }
+ else
+ {
+ fmt.Printf(_T("%%%d.%dg"), m_width, m_precision);
+ }
+
+ return wxString::Format(fmt, m_valueOld);
+}
+
+bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+ if ( wxGridCellEditor::IsAcceptedKey(event) )
+ {
+ int keycode = event.GetKeyCode();
+ switch ( keycode )
+ {
+ case WXK_NUMPAD0:
+ case WXK_NUMPAD1:
+ case WXK_NUMPAD2:
+ case WXK_NUMPAD3:
+ case WXK_NUMPAD4:
+ case WXK_NUMPAD5:
+ case WXK_NUMPAD6:
+ case WXK_NUMPAD7:
+ case WXK_NUMPAD8:
+ case WXK_NUMPAD9:
+ case WXK_ADD:
+ case WXK_NUMPAD_ADD:
+ case WXK_SUBTRACT:
+ case WXK_NUMPAD_SUBTRACT:
+ case WXK_DECIMAL:
+ case WXK_NUMPAD_DECIMAL:
+ return TRUE;
+
+ default:
+ // additionally accept 'e' as in '1e+6'
+ if ( (keycode < 128) &&
+ (isdigit(keycode) || tolower(keycode) == 'e') )
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
// ----------------------------------------------------------------------------
// wxGridCellBoolEditor
// ----------------------------------------------------------------------------
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
m_startValue = grid->GetTable()->GetValueAsBool(row, col);
else
- m_startValue = !!grid->GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid->GetTable()->GetValue(row, col) );
+ m_startValue = !( !cellval || (cellval == "0") );
+ }
CBox()->SetValue(m_startValue);
CBox()->SetFocus();
}
CBox()->SetValue(!CBox()->GetValue());
}
+bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+ if ( wxGridCellEditor::IsAcceptedKey(event) )
+ {
+ int keycode = event.GetKeyCode();
+ switch ( keycode )
+ {
+ case WXK_MULTIPLY:
+ case WXK_NUMPAD_MULTIPLY:
+ case WXK_ADD:
+ case WXK_NUMPAD_ADD:
+ case WXK_SUBTRACT:
+ case WXK_NUMPAD_SUBTRACT:
+ case WXK_SPACE:
+ case '+':
+ case '-':
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
// ----------------------------------------------------------------------------
// wxGridCellChoiceEditor
// ----------------------------------------------------------------------------
wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
- const wxChar* choices[],
+ const wxString choices[],
bool allowOthers)
: m_allowOthers(allowOthers)
{
event.Skip( m_grid->ProcessEvent( event ) );
break;
+ case WXK_NUMPAD_ENTER:
case WXK_RETURN:
if (!m_grid->ProcessEvent(event))
m_editor->HandleReturn(event);
case WXK_ESCAPE:
case WXK_TAB:
case WXK_RETURN:
+ case WXK_NUMPAD_ENTER:
break;
default:
wxGridCellAttr& attr,
wxDC& dc,
const wxRect& rect,
- int row, int col,
+ int WXUNUSED(row), int WXUNUSED(col),
bool isSelected)
{
dc.SetBackgroundMode( wxSOLID );
wxDC& dc,
const wxString& text)
{
- wxCoord x, y;
+ wxCoord x = 0, y = 0, max_x = 0;
dc.SetFont(attr.GetFont());
- dc.GetTextExtent(text, &x, &y);
+ wxStringTokenizer tk(text, _T('\n'));
+ while ( tk.HasMoreTokens() )
+ {
+ dc.GetTextExtent(tk.GetNextToken(), &x, &y);
+ max_x = wxMax(max_x, x);
+ }
- return wxSize(x, y);
+ y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines.
+
+ return wxSize(max_x, y);
}
wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
// draw the text right aligned by default
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- hAlign = wxRIGHT;
+ hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell;
rect.Inflate(-1);
// draw the text right aligned by default
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- hAlign = wxRIGHT;
+ hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell;
rect.Inflate(-1);
if ( !ok )
{
- wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string "
- "'%s ignored"), params.c_str());
+ wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string '%s ignored"), params.c_str());
}
}
}
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
value = grid.GetTable()->GetValueAsBool(row, col);
else
- value = !!grid.GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid.GetTable()->GetValue(row, col) );
+ value = !( !cellval || (cellval == "0") );
+ }
if ( value )
{
wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
{
wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
- renderer->IncRef();
+ if (renderer)
+ renderer->IncRef();
return renderer;
}
wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
{
wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
- editor->IncRef();
+ if (editor)
+ editor->IncRef();
return editor;
}
}
}
-void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows )
-{
- if ( m_attrProvider )
- {
- m_attrProvider->UpdateAttrRows( pos, numRows );
- }
-}
-
-void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
-{
- if ( m_attrProvider )
- {
- m_attrProvider->UpdateAttrCols( pos, numCols );
- }
-}
-
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numRows) )
{
- wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
- "but your derived table class does not override this function") );
+ wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
return FALSE;
}
-bool wxGridTableBase::AppendRows( size_t numRows )
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
{
- wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numRows) )
{
- wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numCols) )
{
- wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::AppendCols( size_t numCols )
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
{
- wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numCols) )
{
- wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
return FALSE;
}
{
}
-long wxGridStringTable::GetNumberRows()
+int wxGridStringTable::GetNumberRows()
{
return m_data.GetCount();
}
-long wxGridStringTable::GetNumberCols()
+int wxGridStringTable::GetNumberCols()
{
if ( m_data.GetCount() > 0 )
return m_data[0].GetCount();
size_t row, col;
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+ size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+ ( GetView() ? GetView()->GetNumberCols() : 0 ) );
if ( pos >= curNumRows )
{
{
m_data.Insert( sa, row );
}
- UpdateAttrRows( pos, numRows );
if ( GetView() )
{
wxGridTableMessage msg( this,
size_t row, col;
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+ size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+ ( GetView() ? GetView()->GetNumberCols() : 0 ) );
wxArrayString sa;
if ( curNumCols > 0 )
if ( pos >= curNumRows )
{
wxString errmsg;
- errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
- "Pos value is invalid for present table with %d rows",
+ errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"),
pos, numRows, curNumRows );
- wxFAIL_MSG( wxT(errmsg) );
+ wxFAIL_MSG( errmsg );
return FALSE;
}
m_data.Remove( pos );
}
}
- UpdateAttrRows( pos, -((int)numRows) );
if ( GetView() )
{
wxGridTableMessage msg( this,
size_t row, col;
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+ size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+ ( GetView() ? GetView()->GetNumberCols() : 0 ) );
if ( pos >= curNumCols )
{
m_data[row].Insert( wxEmptyString, col );
}
}
- UpdateAttrCols( pos, numCols );
if ( GetView() )
{
wxGridTableMessage msg( this,
size_t row, n;
size_t curNumRows = m_data.GetCount();
+#if 0
if ( !curNumRows )
{
// TODO: something better than this ?
//
- wxFAIL_MSG( 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.\nCall AppendRows() first") );
return FALSE;
}
+#endif
for ( row = 0; row < curNumRows; row++ )
{
size_t row, n;
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+ size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+ ( GetView() ? GetView()->GetNumberCols() : 0 ) );
if ( pos >= curNumCols )
{
wxString errmsg;
- errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
- "Pos value is invalid for present table with %d cols",
+ errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"),
pos, numCols, curNumCols );
- wxFAIL_MSG( wxT( errmsg ) );
+ wxFAIL_MSG( errmsg );
return FALSE;
}
}
}
}
- UpdateAttrCols( pos, -((int)numCols) );
if ( GetView() )
{
wxGridTableMessage msg( this,
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
END_EVENT_TABLE()
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
m_owner = parent;
}
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
EVT_PAINT( wxGridColLabelWindow::OnPaint )
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
END_EVENT_TABLE()
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
m_owner = parent;
}
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
END_EVENT_TABLE()
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
EVT_PAINT( wxGridWindow::OnPaint )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridWindow::OnKeyUp )
EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
END_EVENT_TABLE()
}
-// This seems to be required for wxMotif otherwise the mouse
+// This seems to be required for wxMotif/wxGTK otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridWindow::OnKeyDown( wxKeyEvent& event )
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
-void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
{
}
EVT_PAINT( wxGrid::OnPaint )
EVT_SIZE( wxGrid::OnSize )
EVT_KEY_DOWN( wxGrid::OnKeyDown )
+ EVT_KEY_UP( wxGrid::OnKeyUp )
EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
END_EVENT_TABLE()
void wxGrid::Create()
{
m_created = FALSE; // set to TRUE by CreateGrid
- m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint
m_table = (wxGridTableBase *) NULL;
m_ownTable = FALSE;
// Set default cell attributes
m_defaultCellAttr->SetFont(GetFont());
- m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
+ m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
m_defaultCellAttr->SetTextColour(
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
m_defaultCellAttr->SetBackgroundColour(
bool wxGrid::CreateGrid( int numRows, int numCols,
wxGrid::wxGridSelectionModes selmode )
{
- if ( m_created )
- {
- wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
- return FALSE;
- }
- else
- {
- m_numRows = numRows;
- m_numCols = numCols;
+ wxCHECK_MSG( !m_created,
+ FALSE,
+ wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
+
+ m_numRows = numRows;
+ m_numCols = numCols;
+
+ m_table = new wxGridStringTable( m_numRows, m_numCols );
+ m_table->SetView( this );
+ m_ownTable = TRUE;
+ m_selection = new wxGridSelection( this, selmode );
+ Init();
+ m_created = TRUE;
- m_table = new wxGridStringTable( m_numRows, m_numCols );
- m_table->SetView( this );
- m_ownTable = TRUE;
- Init();
- m_selection = new wxGridSelection( this, selmode );
- m_created = TRUE;
- }
return m_created;
}
// View at runtime. Is there anything in the implmentation that would
// prevent this?
- // At least, you now have to copy with m_selection
+ // At least, you now have to cope with m_selection
wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
return FALSE;
}
m_table->SetView( this );
if (takeOwnership)
m_ownTable = TRUE;
- Init();
m_selection = new wxGridSelection( this, selmode );
+ Init();
m_created = TRUE;
}
void wxGrid::Init()
{
- if ( m_numRows <= 0 )
- m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
-
- if ( m_numCols <= 0 )
- m_numCols = WXGRID_DEFAULT_NUMBER_COLS;
-
m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
m_labelFont = this->GetFont();
m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
- m_rowLabelHorizAlign = wxLEFT;
- m_rowLabelVertAlign = wxCENTRE;
+ m_rowLabelHorizAlign = wxALIGN_LEFT;
+ m_rowLabelVertAlign = wxALIGN_CENTRE;
- m_colLabelHorizAlign = wxCENTRE;
- m_colLabelVertAlign = wxTOP;
+ m_colLabelHorizAlign = wxALIGN_CENTRE;
+ m_colLabelVertAlign = wxALIGN_TOP;
m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH;
m_defaultRowHeight = m_gridWin->GetCharHeight();
m_gridLineColour = wxColour( 128, 128, 255 );
m_gridLinesEnabled = TRUE;
+ m_cellHighlightColour = m_gridLineColour;
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_winCapture = (wxWindow *)NULL;
int cw, ch;
GetClientSize( &cw, &ch );
- if ( m_numRows > 0 && m_numCols > 0 )
+ if ( m_numRows > 0 || m_numCols > 0 )
{
- int right = GetColRight( m_numCols-1 ) + m_extraWidth;
- int bottom = GetRowBottom( m_numRows-1 ) + m_extraHeight;
+ int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0;
+ int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0;
// TODO: restore the scroll position that we had before sizing
//
bool wxGrid::Redimension( wxGridTableMessage& msg )
{
int i;
+ bool result = FALSE;
+#if 0
// if we were using the default widths/heights so far, we must change them
// now
if ( m_colWidths.IsEmpty() )
{
InitRowHeights();
}
+#endif
switch ( msg.GetId() )
{
{
size_t pos = msg.GetCommandInt();
int numRows = msg.GetCommandInt2();
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Insert( m_defaultRowHeight, pos );
- m_rowBottoms.Insert( 0, pos );
- }
+
m_numRows += numRows;
- int bottom = 0;
- if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+ if ( !m_rowHeights.IsEmpty() )
+ {
+ for ( i = 0; i < numRows; i++ )
+ {
+ m_rowHeights.Insert( m_defaultRowHeight, pos );
+ m_rowBottoms.Insert( 0, pos );
+ }
+
+ int bottom = 0;
+ if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+
+ for ( i = pos; i < m_numRows; i++ )
+ {
+ bottom += m_rowHeights[i];
+ m_rowBottoms[i] = bottom;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ {
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ m_selection->UpdateRows( pos, numRows );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider)
+ attrProvider->UpdateAttrRows( pos, numRows );
- for ( i = pos; i < m_numRows; i++ )
+ if ( !GetBatchCount() )
{
- bottom += m_rowHeights[i];
- m_rowBottoms[i] = bottom;
+ CalcDimensions();
+ m_rowLabelWin->Refresh();
}
- CalcDimensions();
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
{
int numRows = msg.GetCommandInt();
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Add( m_defaultRowHeight );
- m_rowBottoms.Add( 0 );
- }
-
int oldNumRows = m_numRows;
m_numRows += numRows;
- int bottom = 0;
- if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+ if ( !m_rowHeights.IsEmpty() )
+ {
+ for ( i = 0; i < numRows; i++ )
+ {
+ m_rowHeights.Add( m_defaultRowHeight );
+ m_rowBottoms.Add( 0 );
+ }
+
+ int bottom = 0;
+ if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
- for ( i = oldNumRows; i < m_numRows; i++ )
+ for ( i = oldNumRows; i < m_numRows; i++ )
+ {
+ bottom += m_rowHeights[i];
+ m_rowBottoms[i] = bottom;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ {
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ if ( !GetBatchCount() )
{
- bottom += m_rowHeights[i];
- m_rowBottoms[i] = bottom;
+ CalcDimensions();
+ m_rowLabelWin->Refresh();
}
- CalcDimensions();
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
{
size_t pos = msg.GetCommandInt();
int numRows = msg.GetCommandInt2();
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Remove( pos );
- m_rowBottoms.Remove( pos );
- }
m_numRows -= numRows;
- if ( !m_numRows )
+ if ( !m_rowHeights.IsEmpty() )
{
- m_numCols = 0;
- m_colWidths.Clear();
- m_colRights.Clear();
- m_currentCellCoords = wxGridNoCellCoords;
- }
- else
- {
- if ( m_currentCellCoords.GetRow() >= m_numRows )
- m_currentCellCoords.Set( 0, 0 );
+ for ( i = 0; i < numRows; i++ )
+ {
+ m_rowHeights.Remove( pos );
+ m_rowBottoms.Remove( pos );
+ }
int h = 0;
for ( i = 0; i < m_numRows; i++ )
m_rowBottoms[i] = h;
}
}
-
- CalcDimensions();
+ if ( !m_numRows )
+ {
+ m_currentCellCoords = wxGridNoCellCoords;
+ }
+ else
+ {
+ if ( m_currentCellCoords.GetRow() >= m_numRows )
+ m_currentCellCoords.Set( 0, 0 );
+ }
+ m_selection->UpdateRows( pos, -((int)numRows) );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider) {
+ attrProvider->UpdateAttrRows( pos, -((int)numRows) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+ // No need to touch column attributes, unless we
+ // removed _all_ rows, in this case, we remove
+ // all column attributes.
+ // I hate to do this here, but the
+ // needed data is not available inside UpdateAttrRows.
+ if ( !GetNumberRows() )
+ attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
+#endif
+ }
+ if ( !GetBatchCount() )
+ {
+ CalcDimensions();
+ m_rowLabelWin->Refresh();
+ }
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
{
size_t pos = msg.GetCommandInt();
int numCols = msg.GetCommandInt2();
- for ( i = 0; i < numCols; i++ )
- {
- m_colWidths.Insert( m_defaultColWidth, pos );
- m_colRights.Insert( 0, pos );
- }
m_numCols += numCols;
- int right = 0;
- if ( pos > 0 ) right = m_colRights[pos-1];
-
- for ( i = pos; i < m_numCols; i++ )
+ if ( !m_colWidths.IsEmpty() )
{
- right += m_colWidths[i];
- m_colRights[i] = right;
- }
- CalcDimensions();
- }
- return TRUE;
+ for ( i = 0; i < numCols; i++ )
+ {
+ m_colWidths.Insert( m_defaultColWidth, pos );
+ m_colRights.Insert( 0, pos );
+ }
- case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
- {
- int numCols = msg.GetCommandInt();
- for ( i = 0; i < numCols; i++ )
+ int right = 0;
+ if ( pos > 0 ) right = m_colRights[pos-1];
+
+ for ( i = pos; i < m_numCols; i++ )
+ {
+ right += m_colWidths[i];
+ m_colRights[i] = right;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
{
- m_colWidths.Add( m_defaultColWidth );
- m_colRights.Add( 0 );
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ m_selection->UpdateCols( pos, numCols );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider)
+ attrProvider->UpdateAttrCols( pos, numCols );
+ if ( !GetBatchCount() )
+ {
+ CalcDimensions();
+ m_colLabelWin->Refresh();
}
+ }
+ result = TRUE;
+ break;
+
+ case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+ {
+ int numCols = msg.GetCommandInt();
int oldNumCols = m_numCols;
m_numCols += numCols;
+ if ( !m_colWidths.IsEmpty() )
+ {
+ for ( i = 0; i < numCols; i++ )
+ {
+ m_colWidths.Add( m_defaultColWidth );
+ m_colRights.Add( 0 );
+ }
- int right = 0;
- if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+ int right = 0;
+ if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
- for ( i = oldNumCols; i < m_numCols; i++ )
+ for ( i = oldNumCols; i < m_numCols; i++ )
+ {
+ right += m_colWidths[i];
+ m_colRights[i] = right;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
{
- right += m_colWidths[i];
- m_colRights[i] = right;
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ if ( !GetBatchCount() )
+ {
+ CalcDimensions();
+ m_colLabelWin->Refresh();
}
- CalcDimensions();
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_COLS_DELETED:
{
size_t pos = msg.GetCommandInt();
int numCols = msg.GetCommandInt2();
- for ( i = 0; i < numCols; i++ )
- {
- m_colWidths.Remove( pos );
- m_colRights.Remove( pos );
- }
m_numCols -= numCols;
- if ( !m_numCols )
- {
-#if 0 // leave the row alone here so that AppendCols will work subsequently
- m_numRows = 0;
- m_rowHeights.Clear();
- m_rowBottoms.Clear();
-#endif
- m_currentCellCoords = wxGridNoCellCoords;
- }
- else
+ if ( !m_colWidths.IsEmpty() )
{
- if ( m_currentCellCoords.GetCol() >= m_numCols )
- m_currentCellCoords.Set( 0, 0 );
+ for ( i = 0; i < numCols; i++ )
+ {
+ m_colWidths.Remove( pos );
+ m_colRights.Remove( pos );
+ }
int w = 0;
for ( i = 0; i < m_numCols; i++ )
m_colRights[i] = w;
}
}
- CalcDimensions();
+ if ( !m_numCols )
+ {
+ m_currentCellCoords = wxGridNoCellCoords;
+ }
+ else
+ {
+ if ( m_currentCellCoords.GetCol() >= m_numCols )
+ m_currentCellCoords.Set( 0, 0 );
+ }
+ m_selection->UpdateCols( pos, -((int)numCols) );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider) {
+ attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+ // No need to touch row attributes, unless we
+ // removed _all_ columns, in this case, we remove
+ // all row attributes.
+ // I hate to do this here, but the
+ // needed data is not available inside UpdateAttrCols.
+ if ( !GetNumberCols() )
+ attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
+#endif
+ }
+ if ( !GetBatchCount() )
+ {
+ CalcDimensions();
+ m_colLabelWin->Refresh();
+ }
+ return TRUE;
}
- return TRUE;
+#if 0
+// There is no path to this code !!!!!!
+ result = TRUE;
+ break;
+#endif
}
- return FALSE;
+ if (result && !GetBatchCount() )
+ m_gridWin->Refresh();
+ return result;
}
-void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+void wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
}
-void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+void wxGrid::CalcColLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
}
-void wxGrid::CalcCellsExposed( wxRegion& reg )
+void wxGrid::CalcCellsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
break;
case WXGRID_CURSOR_SELECT_ROW:
- if ( (row = YToRow( y )) >= 0 &&
- !IsInSelection( row, 0 ) )
+ if ( (row = YToRow( y )) >= 0 )
{
- SelectRow( row, TRUE );
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
// default label to suppress warnings about "enumeration value
if ( row >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
- SelectRow( row, event.ShiftDown() );
+ if ( !event.ShiftDown() && !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ 0,
+ row,
+ GetNumberCols() - 1,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ else
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
}
}
break;
case WXGRID_CURSOR_SELECT_COL:
- if ( (col = XToCol( x )) >= 0 &&
- !IsInSelection( 0, col ) )
+ if ( (col = XToCol( x )) >= 0 )
{
- SelectCol( col, TRUE );
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
// default label to suppress warnings about "enumeration value
if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
- SelectCol( col, event.ShiftDown() );
+ if ( !event.ShiftDown() && !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ m_selection->SelectBlock( 0,
+ m_currentCellCoords.GetCol(),
+ GetNumberRows() - 1, col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ else
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
}
}
{
// Hide the edit control, so it
// won't interfer with drag-shrinking.
- if ( IsCellEditControlEnabled() )
+ if ( IsCellEditControlShown() )
{
HideCellEditControl();
SaveEditControlValue();
if ( coords != wxGridNoCellCoords )
{
- if ( !IsSelection() )
+ if ( event.ControlDown() )
{
- SelectBlock( coords, coords );
+ if ( m_selectingKeyboard == wxGridNoCellCoords)
+ m_selectingKeyboard = coords;
+ HighlightBlock ( m_selectingKeyboard, coords );
}
else
{
- SelectBlock( m_currentCellCoords, coords );
+ if ( !IsSelection() )
+ {
+ HighlightBlock( coords, coords );
+ }
+ else
+ {
+ HighlightBlock( m_currentCellCoords, coords );
+ }
}
if (! IsVisible(coords))
{
MakeCellVisible(coords);
// TODO: need to introduce a delay or something here. The
- // scrolling is way to fast, at least on MSW.
+ // scrolling is way to fast, at least on MSW - also on GTK.
}
}
}
//
if ( event.LeftDown() && coords != wxGridNoCellCoords )
{
- if ( !event.ShiftDown() && !event.ControlDown() )
- ClearSelection();
- if ( event.ShiftDown() )
- {
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- coords.GetRow(),
- coords.GetCol() );
- }
- else if ( XToEdgeOfCol(x) < 0 &&
- YToEdgeOfRow(y) < 0 )
+ if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
{
- if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ if ( !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ {
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ coords.GetRow(),
+ coords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ else if ( XToEdgeOfCol(x) < 0 &&
+ YToEdgeOfRow(y) < 0 )
{
DisableCellEditControl();
MakeCellVisible( coords );
}
else
{
- m_selection->ToggleCellSelection( coords.GetRow(),
- coords.GetCol() );
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
- SetCurrentCell( coords );
+ if ( event.ControlDown() )
+ {
+ 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
+ {
+ SetCurrentCell( coords );
+ if ( m_selection->GetSelectionMode()
+ != wxGrid::wxGridSelectCells)
+ HighlightBlock( coords, coords );
+ }
m_waitForSlowClick = TRUE;
}
}
m_selectingTopLeft.GetCol(),
m_selectingBottomRight.GetRow(),
m_selectingBottomRight.GetCol(),
- & event );
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- bool ok = m_table->InsertRows( pos, numRows );
+ return m_table->InsertRows( pos, numRows );
// the table will have sent the results of the insert row
// operation to this view object as a grid table message
- //
- if ( ok )
- {
- if ( m_numCols == 0 )
- {
- m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS );
- //
- // TODO: perhaps instead of appending the default number of cols
- // we should remember what the last non-zero number of cols was ?
- //
- }
-
- if ( m_currentCellCoords == wxGridNoCellCoords )
- {
- // if we have just inserted cols into an empty grid the current
- // cell will be undefined...
- //
- SetCurrentCell( 0, 0 );
- }
-
- m_selection->UpdateRows( pos, numRows );
- if ( !GetBatchCount() ) Refresh();
- }
-
- return ok;
- }
- else
- {
- return FALSE;
}
+ return FALSE;
}
return FALSE;
}
- if ( m_table && m_table->AppendRows( numRows ) )
- {
- if ( m_currentCellCoords == wxGridNoCellCoords )
- {
- // if we have just inserted cols into an empty grid the current
- // cell will be undefined...
- //
- SetCurrentCell( 0, 0 );
- }
-
- // the table will have sent the results of the append row
- // operation to this view object as a grid table message
- //
- if ( !GetBatchCount() ) Refresh();
- return TRUE;
- }
- else
- {
- 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 (IsCellEditControlEnabled())
DisableCellEditControl();
- if (m_table->DeleteRows( pos, numRows ))
- {
-
- // the table will have sent the results of the delete row
- // operation to this view object as a grid table message
- //
- m_selection->UpdateRows( pos, -((int)numRows) );
- if ( !GetBatchCount() ) Refresh();
- return TRUE;
- }
+ return (m_table->DeleteRows( pos, numRows ));
+ // the table will have sent the results of the delete row
+ // operation to this view object as a grid table message
}
return FALSE;
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- bool ok = m_table->InsertCols( pos, numCols );
-
+ return m_table->InsertCols( pos, numCols );
// the table will have sent the results of the insert col
// operation to this view object as a grid table message
- //
- if ( ok )
- {
- if ( m_currentCellCoords == wxGridNoCellCoords )
- {
- // if we have just inserted cols into an empty grid the current
- // cell will be undefined...
- //
- SetCurrentCell( 0, 0 );
- }
-
- m_selection->UpdateCols( pos, numCols );
- if ( !GetBatchCount() ) Refresh();
- }
-
- return ok;
- }
- else
- {
- return FALSE;
}
+ return FALSE;
}
return FALSE;
}
- if ( 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_currentCellCoords == wxGridNoCellCoords )
- {
- // if we have just inserted cols into an empty grid the current
- // cell will be undefined...
- //
- SetCurrentCell( 0, 0 );
- }
-
- if ( !GetBatchCount() ) Refresh();
- return TRUE;
- }
- else
- {
- 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 (IsCellEditControlEnabled())
DisableCellEditControl();
- if ( m_table->DeleteCols( pos, numCols ) )
- {
- // the table will have sent the results of the delete col
- // operation to this view object as a grid table message
- //
- m_selection->UpdateCols( pos, -((int)numCols) );
- if ( !GetBatchCount() ) Refresh();
- return TRUE;
- }
+ return ( m_table->DeleteCols( pos, numCols ) );
+ // the table will have sent the results of the delete col
+ // operation to this view object as a grid table message
}
return FALSE;
}
type,
this,
rowOrCol,
- mouseEv.GetX(), mouseEv.GetY(),
+ mouseEv.GetX() + GetColLabelSize(),
+ mouseEv.GetY() + GetRowLabelSize(),
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
}
else if ( type == wxEVT_GRID_RANGE_SELECT )
{
- // Right now, it should _never_ end up here!
+ // Right now, it should _never_ end up here!
wxGridRangeSelectEvent gridEvt( GetId(),
type,
this,
type,
this,
row, col,
- false,
- mouseEv.GetX(), mouseEv.GetY(),
+ mouseEv.GetX() + GetColLabelSize(),
+ mouseEv.GetY() + GetRowLabelSize(),
+ FALSE,
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
- wxPaintDC dc( this );
-
- if ( m_currentCellCoords == wxGridNoCellCoords &&
- m_numRows && m_numCols )
- {
- m_currentCellCoords.Set(0, 0);
- ShowCellEditControl();
- }
-
- m_displayed = TRUE;
+ wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW
}
// the grid view is resized... then the size event is skipped to allow
// the box sizers to handle everything
//
-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) )
{
CalcWindowSizes();
CalcDimensions();
break;
case WXK_RETURN:
+ case WXK_NUMPAD_ENTER:
if ( event.ControlDown() )
{
event.Skip(); // to let the edit control have the return
}
else
{
- MoveCursorDown( event.ShiftDown() );
+ if ( GetGridCursorRow() < GetNumberRows()-1 )
+ {
+ MoveCursorDown( event.ShiftDown() );
+ }
+ else
+ {
+ // at the bottom of a column
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
}
break;
case WXK_ESCAPE:
- m_selection->ClearSelection();
+ ClearSelection();
break;
case WXK_TAB:
if (event.ShiftDown())
- MoveCursorLeft( FALSE );
+ {
+ if ( GetGridCursorCol() > 0 )
+ {
+ MoveCursorLeft( FALSE );
+ }
+ else
+ {
+ // at left of grid
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
+ }
else
- MoveCursorRight( FALSE );
+ {
+ if ( GetGridCursorCol() < GetNumberCols()-1 )
+ {
+ MoveCursorRight( FALSE );
+ }
+ else
+ {
+ // at right of grid
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
+ }
break;
case WXK_HOME:
MovePageDown();
break;
-#if 0
case WXK_SPACE:
+ if ( event.ControlDown() )
+ {
+ m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ break;
+ }
if ( !IsEditable() )
{
MoveCursorRight( FALSE );
break;
}
// Otherwise fall through to default
-#else
- case WXK_SPACE:
- m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
- break;
-#endif
default:
- // alphanumeric keys or F2 (special key just for this) enable
- // the cell edit control
- // On just Shift/Control I get values for event.KeyCode()
- // that are outside the range where isalnum's behaviour is
- // well defined, so do an additional sanity check.
- if ( !(event.AltDown() ||
- event.MetaDown() ||
- event.ControlDown()) &&
- ((isalnum(event.KeyCode()) &&
- (event.KeyCode() < 256 && event.KeyCode() >= 0)) ||
- event.KeyCode() == WXK_F2) &&
- !IsCellEditControlEnabled() &&
- CanEnableCellControl() )
+ // is it possible to edit the current cell at all?
+ if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
{
- EnableCellEditControl();
+ // yes, now check whether the cells editor accepts the key
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor *editor = attr->GetEditor(this, row, col);
- editor->StartingKey(event);
+
+ // <F2> is special and will always start editing, for
+ // other keys - ask the editor itself
+ if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
+ || editor->IsAcceptedKey(event) )
+ {
+ EnableCellEditControl();
+ editor->StartingKey(event);
+ }
+ else
+ {
+ event.Skip();
+ }
+
editor->DecRef();
attr->DecRef();
}
m_inOnKeyDown = FALSE;
}
+void wxGrid::OnKeyUp( wxKeyEvent& event )
+{
+ // try local handlers
+ //
+ if ( event.KeyCode() == WXK_SHIFT )
+ {
+ if ( m_selectingTopLeft != wxGridNoCellCoords &&
+ m_selectingBottomRight != wxGridNoCellCoords )
+ m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+ m_selectingTopLeft.GetCol(),
+ m_selectingBottomRight.GetRow(),
+ m_selectingBottomRight.GetCol(),
+ event.ControlDown(),
+ TRUE,
+ event.AltDown(),
+ event.MetaDown() );
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ m_selectingKeyboard = wxGridNoCellCoords;
+ }
+}
void wxGrid::OnEraseBackground(wxEraseEvent&)
{
void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
{
- if ( m_displayed &&
- m_currentCellCoords != wxGridNoCellCoords )
+ if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
+ {
+ // the event has been intercepted - do nothing
+ return;
+ }
+
+ wxClientDC dc(m_gridWin);
+ PrepareDC(dc);
+
+ if ( m_currentCellCoords != wxGridNoCellCoords )
{
HideCellEditControl();
DisableCellEditControl();
- // Clear the old current cell highlight
- wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ if ( IsVisible( m_currentCellCoords, FALSE ) )
+ {
+ wxRect r;
+ r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ if ( !m_gridLinesEnabled )
+ {
+ r.x--;
+ r.y--;
+ r.width++;
+ r.height++;
+ }
- // Otherwise refresh redraws the highlight!
- m_currentCellCoords = coords;
+ CalcCellsExposed( r );
- m_gridWin->Refresh( FALSE, &r );
+ // Otherwise refresh redraws the highlight!
+ m_currentCellCoords = coords;
+
+ DrawGridCellArea(dc);
+ DrawAllGridLines( dc, r );
+ }
}
m_currentCellCoords = coords;
- if ( m_displayed )
+ wxGridCellAttr* attr = GetCellAttr(coords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
+}
+
+
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+{
+ int temp;
+ wxGridCellCoords updateTopLeft, updateBottomRight;
+
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+ {
+ leftCol = 0;
+ rightCol = GetNumberCols() - 1;
+ }
+ else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+ {
+ topRow = 0;
+ bottomRow = GetNumberRows() - 1;
+ }
+ if ( topRow > bottomRow )
{
- wxClientDC dc(m_gridWin);
- PrepareDC(dc);
+ temp = topRow;
+ topRow = bottomRow;
+ bottomRow = temp;
+ }
- wxGridCellAttr* attr = GetCellAttr(coords);
- DrawCellHighlight(dc, attr);
- attr->DecRef();
-#if 0
- // SN: For my extended selection code, automatic
- // deselection is definitely not a good idea.
- if ( IsSelection() )
+ if ( leftCol > rightCol )
+ {
+ temp = leftCol;
+ leftCol = rightCol;
+ rightCol = temp;
+ }
+
+ updateTopLeft = wxGridCellCoords( topRow, leftCol );
+ updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+ if ( m_selectingTopLeft != updateTopLeft ||
+ m_selectingBottomRight != 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];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
+ int i;
+
+ // Store intermediate values
+ wxCoord oldLeft = m_selectingTopLeft.GetCol();
+ wxCoord oldTop = m_selectingTopLeft.GetRow();
+ wxCoord oldRight = m_selectingBottomRight.GetCol();
+ wxCoord oldBottom = m_selectingBottomRight.GetRow();
+
+ // Determine the outer/inner coordinates.
+ if (oldLeft > leftCol)
{
- wxRect r( SelectionToDeviceRect() );
- ClearSelection();
- if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+ temp = oldLeft;
+ oldLeft = leftCol;
+ leftCol = temp;
}
-#endif
+ 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_selectingTopLeft = updateTopLeft;
+ m_selectingBottomRight = updateBottomRight;
+
+ // various Refresh() calls
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
+
+ // never generate an event as it will be generated from
+ // wxGridSelection::SelectBlock!
+ // (old comment from when this was the body of SelectBlock)
}
void wxGrid::DrawGridSpace( wxDC& dc )
{
- if ( m_numRows && m_numCols )
- {
- int cw, ch;
- m_gridWin->GetClientSize( &cw, &ch );
+ int cw, ch;
+ m_gridWin->GetClientSize( &cw, &ch );
- int right, bottom;
- CalcUnscrolledPosition( cw, ch, &right, &bottom );
+ int right, bottom;
+ CalcUnscrolledPosition( cw, ch, &right, &bottom );
- if ( right > GetColRight(m_numCols-1) ||
- bottom > GetRowBottom(m_numRows-1) )
- {
- int left, top;
- CalcUnscrolledPosition( 0, 0, &left, &top );
+ int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0;
+ int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ;
- dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
- dc.SetPen( *wxTRANSPARENT_PEN );
+ if ( right > rightCol || bottom > bottomRow )
+ {
+ int left, top;
+ CalcUnscrolledPosition( 0, 0, &left, &top );
- if ( right > GetColRight(m_numCols-1) )
- dc.DrawRectangle( GetColRight(m_numCols-1), top,
- right - GetColRight(m_numCols-1), ch );
+ dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
- if ( bottom > GetRowBottom(m_numRows-1) )
- dc.DrawRectangle( left, GetRowBottom(m_numRows-1),
- cw, bottom - GetRowBottom(m_numRows-1) );
- }
- }
+ if ( right > rightCol )
+ {
+ dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+ }
+
+ if ( bottom > bottomRow )
+ {
+ dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+ }
+ }
}
bool isCurrent = coords == m_currentCellCoords;
- wxRect rect;
- rect.x = GetColLeft(col);
- rect.y = GetRowTop(row);
- rect.width = GetColWidth(col) - 1;
- rect.height = GetRowHeight(row) - 1;
+ wxRect rect = CellToRect( row, col );
// if the editor is shown, we should use it and not the renderer
- if ( isCurrent && IsCellEditControlEnabled() )
+ // Note: However, only if it is really _shown_, i.e. not hidden!
+ if ( isCurrent && IsCellEditControlShown() )
{
wxGridCellEditor *editor = attr->GetEditor(this, row, col);
editor->PaintBackground(rect, attr);
if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
- wxRect rect;
- rect.x = GetColLeft(col);
- rect.y = GetRowTop(row);
- rect.width = GetColWidth(col) - 1;
- rect.height = GetRowHeight(row) - 1;
+ wxRect rect = CellToRect(row, col);
// hmmm... what could we do here to show that the cell is disabled?
// for now, I just draw a thinner border than for the other ones, but
// it doesn't look really good
- dc.SetPen(wxPen(m_gridLineColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
+ dc.SetPen(wxPen(m_cellHighlightColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
void wxGrid::DrawHighlight(wxDC& dc)
{
- if ( IsCellEditControlEnabled() )
+ // This if block was previously in wxGrid::OnPaint but that doesn't
+ // seem to get called under wxGTK - MB
+ //
+ if ( m_currentCellCoords == wxGridNoCellCoords &&
+ m_numRows && m_numCols )
+ {
+ m_currentCellCoords.Set(0, 0);
+ }
+
+ if ( IsCellEditControlShown() )
{
// don't show highlight when the edit control is shown
return;
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
-void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
{
if ( !m_gridLinesEnabled ||
!m_numRows ||
int top, bottom, left, right;
-#ifndef __WXGTK__
+#if 0 //#ifndef __WXGTK__
if (reg.IsEmpty())
{
int cw, ch;
void wxGrid::DrawRowLabels( wxDC& dc )
{
- if ( !m_numRows || !m_numCols ) return;
+ if ( !m_numRows ) return;
size_t i;
size_t numLabels = m_rowLabelsExposed.GetCount();
void wxGrid::DrawColLabels( wxDC& dc )
{
- if ( !m_numRows || !m_numCols ) return;
+ if ( !m_numCols ) return;
size_t i;
size_t numLabels = m_colLabelsExposed.GetCount();
float x, y;
switch ( horizAlign )
{
- case wxRIGHT:
+ case wxALIGN_RIGHT:
x = rect.x + (rect.width - textWidth - 1);
break;
- case wxCENTRE:
+ case wxALIGN_CENTRE:
x = rect.x + ((rect.width - textWidth)/2);
break;
- case wxLEFT:
+ case wxALIGN_LEFT:
default:
x = rect.x + 1;
break;
switch ( vertAlign )
{
- case wxBOTTOM:
+ case wxALIGN_BOTTOM:
y = rect.y + (rect.height - textHeight - 1);
break;
- case wxCENTRE:
+ case wxALIGN_CENTRE:
y = rect.y + ((rect.height - textHeight)/2);
break;
- case wxTOP:
+ case wxALIGN_TOP:
default:
y = rect.y + 1;
break;
for ( size_t i = 0; i < lines.GetCount(); i++ )
{
- dc.DrawText( lines[i], (long)x, (long)y );
+ dc.DrawText( lines[i], (int)x, (int)y );
y += lineHeight;
}
}
h += lineH;
}
- *width = w;
- *height = h;
+ *width = w;
+ *height = h;
+}
+
+//
+// ------ Batch processing.
+//
+void wxGrid::EndBatch()
+{
+ if ( m_batchCount > 0 )
+ {
+ m_batchCount--;
+ if ( !m_batchCount )
+ {
+ CalcDimensions();
+ m_rowLabelWin->Refresh();
+ m_colLabelWin->Refresh();
+ m_cornerLabelWin->Refresh();
+ m_gridWin->Refresh();
+ }
+ }
+}
+
+// Use this, rather than wxWindow::Refresh(), to force an immediate
+// repainting of the grid. Has no effect if you are already inside a
+// BeginBatch / EndBatch block.
+//
+void wxGrid::ForceRefresh()
+{
+ BeginBatch();
+ EndBatch();
}
//
if ( edit != m_editable )
{
+ if(!edit) EnableCellEditControl(edit);
m_editable = edit;
-
- // FIXME IMHO this won't disable the edit control if edit == FALSE
- // because of the check in the beginning of
- // EnableCellEditControl() just below (VZ)
- EnableCellEditControl(m_editable);
}
}
return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
}
+bool wxGrid::IsCellEditControlShown() const
+{
+ bool isShown = FALSE;
+
+ if ( m_cellEditCtrlEnabled )
+ {
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ wxGridCellEditor* editor = attr->GetEditor((wxGrid*) this, row, col);
+ attr->DecRef();
+
+ if ( editor )
+ {
+ if ( editor->IsCreated() )
+ {
+ isShown = editor->GetControl()->IsShown();
+ }
+
+ editor->DecRef();
+ }
+ }
+
+ return isShown;
+}
+
void wxGrid::ShowCellEditControl()
{
if ( IsCellEditControlEnabled() )
{
if ( !IsVisible( m_currentCellCoords ) )
{
+ m_cellEditCtrlEnabled = FALSE;
return;
}
else
editor->DecRef();
attr->DecRef();
m_gridWin->SetFocus();
+ wxRect rect( CellToRect( row, col ) );
+ m_gridWin->Refresh( FALSE, &rect );
}
}
rect.height = GetRowHeight(row);
}
+ // if grid lines are enabled, then the area of the cell is a bit smaller
+ if (m_gridLinesEnabled) {
+ rect.width -= 1;
+ rect.height -= 1;
+ }
return rect;
}
bool wxGrid::MoveCursorUp( bool expandSelection )
{
if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() > 0 )
+ m_currentCellCoords.GetRow() >= 0 )
{
- MakeCellVisible( m_currentCellCoords.GetRow() - 1,
- m_currentCellCoords.GetCol() );
-
- SetCurrentCell( m_currentCellCoords.GetRow() - 1,
- m_currentCellCoords.GetCol() );
-
- if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ if ( expandSelection)
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ if ( m_selectingKeyboard.GetRow() > 0 )
+ {
+ m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ }
+ else if ( m_currentCellCoords.GetRow() > 0 )
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow() - 1,
+ m_currentCellCoords.GetCol() );
+ SetCurrentCell( m_currentCellCoords.GetRow() - 1,
+ m_currentCellCoords.GetCol() );
+ }
+ else
+ return FALSE;
return TRUE;
}
bool wxGrid::MoveCursorDown( bool expandSelection )
{
- // TODO: allow for scrolling
- //
if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() < m_numRows-1 )
+ m_currentCellCoords.GetRow() < m_numRows )
{
- MakeCellVisible( m_currentCellCoords.GetRow() + 1,
- m_currentCellCoords.GetCol() );
-
- SetCurrentCell( m_currentCellCoords.GetRow() + 1,
- m_currentCellCoords.GetCol() );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
+ {
+ m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ }
+ else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow() + 1,
+ m_currentCellCoords.GetCol() );
+ SetCurrentCell( m_currentCellCoords.GetRow() + 1,
+ m_currentCellCoords.GetCol() );
+ }
+ else
+ return FALSE;
return TRUE;
}
bool wxGrid::MoveCursorLeft( bool expandSelection )
{
if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() > 0 )
+ m_currentCellCoords.GetCol() >= 0 )
{
- MakeCellVisible( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() - 1 );
-
- SetCurrentCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() - 1 );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ if ( m_selectingKeyboard.GetCol() > 0 )
+ {
+ m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ }
+ else if ( m_currentCellCoords.GetCol() > 0 )
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() - 1 );
+ SetCurrentCell( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() - 1 );
+ }
+ else
+ return FALSE;
return TRUE;
}
bool wxGrid::MoveCursorRight( bool expandSelection )
{
if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() < m_numCols - 1 )
+ m_currentCellCoords.GetCol() < m_numCols )
{
- MakeCellVisible( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() + 1 );
-
- SetCurrentCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() + 1 );
-
if ( expandSelection )
- m_selection->SelectCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords )
+ m_selectingKeyboard = m_currentCellCoords;
+ if ( m_selectingKeyboard.GetCol() < m_numCols - 1 )
+ {
+ m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
+ MakeCellVisible( m_selectingKeyboard.GetRow(),
+ m_selectingKeyboard.GetCol() );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ }
+ else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
+ {
+ ClearSelection();
+ MakeCellVisible( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() + 1 );
+ SetCurrentCell( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol() + 1 );
+ }
+ else
+ return FALSE;
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
-
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
MakeCellVisible( row, col );
if ( expandSelection )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- row, col );
- SetCurrentCell( row, col );
+ {
+ m_selectingKeyboard = wxGridCellCoords( row, col );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
+ }
+ else
+ {
+ ClearSelection();
+ SetCurrentCell( row, col );
+ }
return TRUE;
}
void wxGrid::SetRowLabelAlignment( int horiz, int vert )
{
- if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+ // allow old (incorrect) defs to be used
+ switch ( horiz )
+ {
+ case wxLEFT: horiz = wxALIGN_LEFT; break;
+ case wxRIGHT: horiz = wxALIGN_RIGHT; break;
+ case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+ }
+
+ switch ( vert )
+ {
+ case wxTOP: vert = wxALIGN_TOP; break;
+ case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+ case wxCENTRE: vert = wxALIGN_CENTRE; break;
+ }
+
+ if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{
m_rowLabelHorizAlign = horiz;
}
- if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+ if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
{
m_rowLabelVertAlign = vert;
}
void wxGrid::SetColLabelAlignment( int horiz, int vert )
{
- if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+ // allow old (incorrect) defs to be used
+ switch ( horiz )
+ {
+ case wxLEFT: horiz = wxALIGN_LEFT; break;
+ case wxRIGHT: horiz = wxALIGN_RIGHT; break;
+ case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+ }
+
+ switch ( vert )
+ {
+ case wxTOP: vert = wxALIGN_TOP; break;
+ case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+ case wxCENTRE: vert = wxALIGN_CENTRE; break;
+ }
+
+ if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{
m_colLabelHorizAlign = horiz;
}
- if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+ if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
{
m_colLabelVertAlign = vert;
}
if ( rect.height > 0 )
{
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
- rect.x = m_left;
+ rect.x = 0;
rect.width = m_rowLabelWidth;
m_rowLabelWin->Refresh( TRUE, &rect );
}
if ( rect.width > 0 )
{
CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
- rect.y = m_top;
+ rect.y = 0;
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect );
}
}
}
+
+void wxGrid::SetCellHighlightColour( const wxColour& colour )
+{
+ if ( m_cellHighlightColour != colour )
+ {
+ m_cellHighlightColour = colour;
+
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
+ }
+}
+
void wxGrid::EnableGridLines( bool enable )
{
if ( enable != m_gridLinesEnabled )
if ( !LookupAttr(row, col, &attr) || !attr )
{
wxASSERT_MSG( m_table,
- _T("we may only be called if CanHaveAttributes() "
- "returned TRUE and then m_table should be !NULL") );
+ _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
attr = m_table->GetAttr(row, col);
if ( !attr )
// leave some space around text
extentMax += 10;
}
+ else
+ {
+ extentMax += 6;
+ }
}
if ( column )
AutoSize();
}
+
+wxPen& wxGrid::GetDividerPen() const
+{
+ return wxNullPen;
+}
+
// ----------------------------------------------------------------------------
// cell value accessor functions
// ----------------------------------------------------------------------------
{
if ( m_table )
{
- m_table->SetValue( row, col, s.c_str() );
+ m_table->SetValue( row, col, s );
if ( !GetBatchCount() )
{
wxClientDC dc( m_gridWin );
if ( m_currentCellCoords.GetRow() == row &&
m_currentCellCoords.GetCol() == col &&
- IsCellEditControlEnabled())
+ IsCellEditControlShown())
+ // Note: If we are using IsCellEditControlEnabled,
+ // this interacts badly with calling SetCellValue from
+ // an EVT_GRID_CELL_CHANGE handler.
{
HideCellEditControl();
ShowCellEditControl(); // will reread data from table
void wxGrid::SelectRow( int row, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
- m_selection->ClearSelection();
+ ClearSelection();
- m_selection->SelectRow( row );
+ m_selection->SelectRow( row, FALSE, addToSelected );
}
void wxGrid::SelectCol( int col, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
- m_selection->ClearSelection();
+ ClearSelection();
- m_selection->SelectCol( col );
+ m_selection->SelectCol( col, FALSE, addToSelected );
}
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+ bool addToSelected )
{
- int temp;
- wxGridCellCoords updateTopLeft, updateBottomRight;
-
- if ( topRow > bottomRow )
- {
- temp = topRow;
- topRow = bottomRow;
- bottomRow = temp;
- }
-
- if ( leftCol > rightCol )
- {
- temp = leftCol;
- leftCol = rightCol;
- rightCol = temp;
- }
-
- updateTopLeft = wxGridCellCoords( topRow, leftCol );
- updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
-
- if ( m_selectingTopLeft != updateTopLeft ||
- m_selectingBottomRight != 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];
- need_refresh[0] =
- need_refresh[1] =
- need_refresh[2] =
- need_refresh[3] = FALSE;
- int i;
-
- // Store intermediate values
- wxCoord oldLeft = m_selectingTopLeft.GetCol();
- wxCoord oldTop = m_selectingTopLeft.GetRow();
- wxCoord oldRight = m_selectingBottomRight.GetCol();
- wxCoord oldBottom = m_selectingBottomRight.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_selectingTopLeft = updateTopLeft;
- m_selectingBottomRight = updateBottomRight;
-
- // various Refresh() calls
- for (i = 0; i < 4; i++ )
- if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
- }
+ if ( IsSelection() && !addToSelected )
+ ClearSelection();
- // never generate an event as it will be generated from
- // wxGridSelection::SelectBlock!
+ m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+ FALSE, addToSelected );
}
+
void wxGrid::SelectAll()
{
m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
+ if (right < 0 || bottom < 0 || left > cw || top > ch)
+ return wxRect( 0, 0, 0, 0);
+
rect.SetLeft( wxMax(0, left) );
rect.SetTop( wxMax(0, top) );
rect.SetRight( wxMin(cw, right) );
projects / wxWidgets.git / blobdiff