X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/962a48f6f991a4924eaf03302988a490e97b2ee5..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index e4c865c618..69debf7727 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1,33 +1,25 @@ /////////////////////////////////////////////////////////////////////////// -// Name: generic/grid.cpp +// Name: src/generic/grid.cpp // Purpose: wxGrid and related classes // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: Robin Dunn, Vadim Zeitlin +// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios // Created: 1/08/1999 // RCS-ID: $Id$ // Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilatixon, includes "wx/wx.h". +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #ifdef __BORLANDC__ #pragma hdrstop #endif #if wxUSE_GRID +#include "wx/grid.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dcclient.h" @@ -39,6 +31,7 @@ #include "wx/valtext.h" #include "wx/intl.h" #include "wx/math.h" + #include "wx/listbox.h" #endif #include "wx/textfile.h" @@ -46,9 +39,10 @@ #include "wx/tokenzr.h" #include "wx/renderer.h" -#include "wx/grid.h" #include "wx/generic/gridsel.h" +const wxChar wxGridNameStr[] = wxT("grid"); + #if defined(__WXMOTIF__) #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier) #else @@ -114,6 +108,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE) DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_COL_MOVE) DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT) DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE) DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL) @@ -125,22 +120,48 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED) // private classes // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow +// common base class for various grid subwindows +class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow +{ +public: + wxGridSubwindow() { m_owner = NULL; } + wxGridSubwindow(wxGrid *owner, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + int additionalStyle = 0, + const wxString& name = wxPanelNameStr) + : wxWindow(owner, id, pos, size, + wxBORDER_NONE | additionalStyle, + name) + { + m_owner = owner; + } + + virtual bool AcceptsFocus() const { return false; } + + wxGrid *GetOwner() { return m_owner; } + +protected: + void OnMouseCaptureLost(wxMouseCaptureLostEvent& event); + + wxGrid *m_owner; + + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxGridSubwindow) +}; + +class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow { public: - wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridRowLabelWindow() { } wxGridRowLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); private: - wxGrid *m_owner; - void OnPaint( wxPaintEvent& event ); void OnMouseEvent( wxMouseEvent& event ); void OnMouseWheel( wxMouseEvent& event ); - void OnKeyDown( wxKeyEvent& event ); - void OnKeyUp( wxKeyEvent& ); - void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) DECLARE_EVENT_TABLE() @@ -148,22 +169,17 @@ private: }; -class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow { public: - wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridColLabelWindow() { } wxGridColLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); private: - wxGrid *m_owner; - - void OnPaint( wxPaintEvent &event ); + void OnPaint( wxPaintEvent& event ); void OnMouseEvent( wxMouseEvent& event ); void OnMouseWheel( wxMouseEvent& event ); - void OnKeyDown( wxKeyEvent& event ); - void OnKeyUp( wxKeyEvent& ); - void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) DECLARE_EVENT_TABLE() @@ -171,21 +187,16 @@ private: }; -class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow { public: - wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridCornerLabelWindow() { } wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); private: - wxGrid *m_owner; - void OnMouseEvent( wxMouseEvent& event ); void OnMouseWheel( wxMouseEvent& event ); - void OnKeyDown( wxKeyEvent& event ); - void OnKeyUp( wxKeyEvent& ); - void OnChar( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) @@ -193,28 +204,25 @@ private: DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow) }; -class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow { public: wxGridWindow() { - m_owner = (wxGrid *)NULL; - m_rowLabelWin = (wxGridRowLabelWindow *)NULL; - m_colLabelWin = (wxGridColLabelWindow *)NULL; + m_rowLabelWin = NULL; + m_colLabelWin = NULL; } wxGridWindow( wxGrid *parent, wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ); - ~wxGridWindow() {} void ScrollWindow( int dx, int dy, const wxRect *rect ); - wxGrid* GetOwner() { return m_owner; } + virtual bool AcceptsFocus() const { return true; } private: - wxGrid *m_owner; wxGridRowLabelWindow *m_rowLabelWin; wxGridColLabelWindow *m_colLabelWin; @@ -250,8 +258,8 @@ public: void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; } private: - wxGrid* m_grid; - wxGridCellEditor* m_editor; + wxGrid *m_grid; + wxGridCellEditor *m_editor; // Work around the fact that a focus kill event can be sent to // a combobox within a set focus event. @@ -272,7 +280,6 @@ BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) END_EVENT_TABLE() - // ---------------------------------------------------------------------------- // the internal data representation used by wxGridCellAttrProvider // ---------------------------------------------------------------------------- @@ -298,7 +305,7 @@ class WXDLLIMPEXP_ADV wxGridRowOrColAttrData { public: // empty ctor to suppress warnings - wxGridRowOrColAttrData() { } + wxGridRowOrColAttrData() {} ~wxGridRowOrColAttrData(); void SetAttr(wxGridCellAttr *attr, int rowOrCol); @@ -331,7 +338,7 @@ struct wxGridDataTypeInfo wxGridCellRenderer* renderer, wxGridCellEditor* editor) : m_typeName(typeName), m_renderer(renderer), m_editor(editor) - { } + {} ~wxGridDataTypeInfo() { @@ -380,6 +387,7 @@ private: wxGridDataTypeInfoArray m_typeinfo; }; + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -396,14 +404,14 @@ private: #ifdef DEBUG_ATTR_CACHE static size_t gs_nAttrCacheHits = 0; static size_t gs_nAttrCacheMisses = 0; -#endif // DEBUG_ATTR_CACHE +#endif // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- wxGridCellCoords wxGridNoCellCoords( -1, -1 ); -wxRect wxGridNoCellRect( -1, -1, -1, -1 ); +wxRect wxGridNoCellRect( -1, -1, -1, -1 ); // scroll line size // TODO: this doesn't work at all, grid cells have different sizes and approx @@ -454,7 +462,6 @@ wxGridCellEditor::wxGridCellEditor() m_attr = NULL; } - wxGridCellEditor::~wxGridCellEditor() { Destroy(); @@ -478,7 +485,7 @@ void wxGridCellEditor::PaintBackground(const wxRect& rectCell, gridWindow->GetOwner()->PrepareDC(dc); dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); + dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID)); dc.DrawRectangle(rectCell); // redraw the control we just painted over @@ -489,7 +496,7 @@ void wxGridCellEditor::Destroy() { if (m_control) { - m_control->PopEventHandler(true /* delete it*/); + m_control->PopEventHandler( true /* delete it*/ ); m_control->Destroy(); m_control = NULL; @@ -498,8 +505,8 @@ void wxGridCellEditor::Destroy() void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) { - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); + m_control->Show(show); if ( show ) @@ -518,6 +525,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) m_fontOld = m_control->GetFont(); m_control->SetFont(attr->GetFont()); #endif + // can't do anything more in the base class version, the other // attributes may only be used by the derived classes } @@ -536,6 +544,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) m_control->SetBackgroundColour(m_colBgOld); m_colBgOld = wxNullColour; } + // Workaround for GTK+1 font setting problem on some platforms #if !defined(__WXGTK__) || defined(__WXGTK20__) if ( m_fontOld.Ok() ) @@ -549,8 +558,8 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) void wxGridCellEditor::SetSize(const wxRect& rect) { - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); + m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); } @@ -563,6 +572,7 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) { bool ctrl = event.ControlDown(); bool alt = event.AltDown(); + #ifdef __WXMAC__ // On the Mac the Alt key is more like shift and is used for entry of // valid characters, so check for Ctrl and Meta instead. @@ -575,26 +585,32 @@ bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) if ((ctrl || alt) && !(ctrl && alt)) return false; -#if wxUSE_UNICODE - int key = event.GetUnicodeKey(); + int key = 0; bool keyOk = true; +#ifdef __WXGTK20__ + // If it's a F-Key or other special key then it shouldn't start the + // editor. + if (event.GetKeyCode() >= WXK_START) + return false; +#endif +#if wxUSE_UNICODE // if the unicode key code is not really a unicode character (it may // be a function key or etc., the platforms appear to always give us a - // small value in this case) then fallback to the ascii key code but + // small value in this case) then fallback to the ASCII key code but // don't do anything for function keys or etc. + key = event.GetUnicodeKey(); if (key <= 127) { key = event.GetKeyCode(); keyOk = (key <= 127); } +#else + key = event.GetKeyCode(); + keyOk = (key <= 255); +#endif + return keyOk; -#else // !wxUSE_UNICODE - int key = event.GetKeyCode(); - if (key <= 255) - return true; - return false; -#endif // wxUSE_UNICODE/!wxUSE_UNICODE } void wxGridCellEditor::StartingKey(wxKeyEvent& event) @@ -621,17 +637,27 @@ void wxGridCellTextEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { + DoCreate(parent, id, evtHandler); +} + +void wxGridCellTextEditor::DoCreate(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler, + long style) +{ + style |= wxTE_PROCESS_ENTER | + wxTE_PROCESS_TAB | + wxTE_AUTO_SCROLL | + wxNO_BORDER; + m_control = new wxTextCtrl(parent, id, wxEmptyString, - wxDefaultPosition, wxDefaultSize -#if defined(__WXMSW__) - , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL -#endif - ); + wxDefaultPosition, wxDefaultSize, + style); // set max length allowed in the textctrl, if the parameter was set - if (m_maxChars != 0) + if ( m_maxChars != 0 ) { - ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars); + Text()->SetMaxLength(m_maxChars); } wxGridCellEditor::Create(parent, id, evtHandler); @@ -640,19 +666,17 @@ void wxGridCellTextEditor::Create(wxWindow* parent, void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell), wxGridCellAttr * WXUNUSED(attr)) { - // as we fill the entire client area, don't do anything here to minimize - // flicker + // as we fill the entire client area, + // don't do anything here to minimize flicker } void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) { wxRect rect(rectOrig); - // Make the edit control large enough to allow for internal - // margins + // Make the edit control large enough to allow for internal margins // - // TODO: remove this if the text ctrl sizing is improved esp. for - // unix + // TODO: remove this if the text ctrl sizing is improved esp. for unix // #if defined(__WXGTK__) if (rect.x != 0) @@ -662,34 +686,40 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) rect.width -= 1; rect.height -= 1; } -#else // !GTK - int extra_x = ( rect.x > 2 )? 2 : 1; +#elif defined(__WXMSW__) + if ( rect.x == 0 ) + rect.x += 2; + else + rect.x += 3; + + if ( rect.y == 0 ) + rect.y += 2; + else + rect.y += 3; -// 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; + rect.width -= 2; + rect.height -= 2; #else - int extra_y = ( rect.y > 2 )? 2 : 1; -#endif // MSW + int extra_x = ( rect.x > 2 ) ? 2 : 1; + int extra_y = ( rect.y > 2 ) ? 2 : 1; + + #if defined(__WXMOTIF__) + extra_x *= 2; + extra_y *= 2; + #endif -#if defined(__WXMOTIF__) - extra_x *= 2; - extra_y *= 2; -#endif rect.SetLeft( wxMax(0, rect.x - extra_x) ); rect.SetTop( wxMax(0, rect.y - extra_y) ); - rect.SetRight( rect.GetRight() + 2*extra_x ); - rect.SetBottom( rect.GetBottom() + 2*extra_y ); -#endif // GTK/!GTK + rect.SetRight( rect.GetRight() + 2 * extra_x ); + rect.SetBottom( rect.GetBottom() + 2 * extra_y ); +#endif wxGridCellEditor::SetSize(rect); } void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid) { - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); m_startValue = grid->GetTable()->GetValue(row, col); @@ -700,15 +730,13 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue) { Text()->SetValue(startValue); Text()->SetInsertionPointEnd(); - Text()->SetSelection(-1,-1); + Text()->SetSelection(-1, -1); Text()->SetFocus(); } -bool wxGridCellTextEditor::EndEdit(int row, int col, - wxGrid* grid) +bool wxGridCellTextEditor::EndEdit(int row, int col, wxGrid* grid) { - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); bool changed = false; wxString value = Text()->GetValue(); @@ -719,17 +747,16 @@ bool wxGridCellTextEditor::EndEdit(int row, int col, grid->GetTable()->SetValue(row, col, value); m_startValue = wxEmptyString; + // No point in setting the text of the hidden control //Text()->SetValue(m_startValue); return changed; } - void wxGridCellTextEditor::Reset() { - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!")); DoReset(m_startValue); } @@ -763,20 +790,21 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) #else ch = (wxChar)event.GetKeyCode(); #endif + switch (ch) { case WXK_DELETE: // delete the character at the cursor pos = tc->GetInsertionPoint(); if (pos < tc->GetLastPosition()) - tc->Remove(pos, pos+1); + tc->Remove(pos, pos + 1); break; case WXK_BACK: // delete the character before the cursor pos = tc->GetInsertionPoint(); if (pos > 0) - tc->Remove(pos-1, pos); + tc->Remove(pos - 1, pos); break; default: @@ -812,13 +840,13 @@ void wxGridCellTextEditor::SetParameters(const wxString& params) else { long tmp; - if ( !params.ToLong(&tmp) ) + if ( params.ToLong(&tmp) ) { - wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str()); + m_maxChars = (size_t)tmp; } else { - m_maxChars = (size_t)tmp; + wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() ); } } } @@ -826,7 +854,7 @@ void wxGridCellTextEditor::SetParameters(const wxString& params) // return the value in the text control wxString wxGridCellTextEditor::GetValue() const { - return Text()->GetValue(); + return Text()->GetValue(); } // ---------------------------------------------------------------------------- @@ -862,7 +890,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent, #if wxUSE_VALIDATORS Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); -#endif // wxUSE_VALIDATORS +#endif } } @@ -985,6 +1013,7 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) } } #endif + event.Skip(); } @@ -1054,7 +1083,7 @@ void wxGridCellFloatEditor::Create(wxWindow* parent, #if wxUSE_VALIDATORS Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); -#endif // wxUSE_VALIDATORS +#endif } void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) @@ -1095,6 +1124,7 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col, return true; } + return false; } @@ -1110,12 +1140,14 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) tmpbuf[0] = (char) keycode; tmpbuf[1] = '\0'; wxString strbuf(tmpbuf, *wxConvCurrent); + #if wxUSE_INTL bool is_decimal_point = ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) ); #else bool is_decimal_point = ( strbuf == _T(".") ); #endif + if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' || is_decimal_point ) { @@ -1159,20 +1191,25 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params) wxString wxGridCellFloatEditor::GetString() const { wxString fmt; - if ( m_width == -1 ) - { - // default width/precision - fmt = _T("%f"); - } - else if ( m_precision == -1 ) + if ( m_precision == -1 && m_width != -1) { // default precision fmt.Printf(_T("%%%d.f"), m_width); } - else + else if ( m_precision != -1 && m_width == -1) + { + // default width + fmt.Printf(_T("%%.%df"), m_precision); + } + else if ( m_precision != -1 && m_width != -1 ) { fmt.Printf(_T("%%%d.%df"), m_width, m_precision); } + else + { + // default width/precision + fmt = _T("%f"); + } return wxString::Format(fmt, m_valueOld); } @@ -1181,24 +1218,31 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) { if ( wxGridCellEditor::IsAcceptedKey(event) ) { - int keycode = event.GetKeyCode(); - printf("%d\n", keycode); - // accept digits, 'e' as in '1e+6', also '-', '+', and '.' - char tmpbuf[2]; - tmpbuf[0] = (char) keycode; - tmpbuf[1] = '\0'; - wxString strbuf(tmpbuf, *wxConvCurrent); + const int keycode = event.GetKeyCode(); + if ( isascii(keycode) ) + { + char tmpbuf[2]; + tmpbuf[0] = (char) keycode; + tmpbuf[1] = '\0'; + wxString strbuf(tmpbuf, *wxConvCurrent); + #if wxUSE_INTL - bool is_decimal_point = - ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, - wxLOCALE_CAT_NUMBER) ); + const wxString decimalPoint = + wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER); #else - bool is_decimal_point = ( strbuf == _T(".") ); + const wxString decimalPoint(_T('.')); #endif - if ( (keycode < 128) && - (wxIsdigit(keycode) || tolower(keycode) == 'e' || - is_decimal_point || keycode == '+' || keycode == '-') ) - return true; + + // accept digits, 'e' as in '1e+6', also '-', '+', and '.' + if ( wxIsdigit(keycode) || + tolower(keycode) == 'e' || + keycode == decimalPoint || + keycode == '+' || + keycode == '-' ) + { + return true; + } + } } return false; @@ -1212,6 +1256,9 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) // wxGridCellBoolEditor // ---------------------------------------------------------------------------- +// the default values for GetValue() +wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") }; + void wxGridCellBoolEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) @@ -1273,20 +1320,22 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) if (hAlign == wxALIGN_LEFT) { x = r.x + 2; + #ifdef __WXMSW__ x += 2; #endif - y = r.y + r.height/2 - size.y/2; + + 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; + 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; + x = r.x + r.width / 2 - size.x / 2; + y = r.y + r.height / 2 - size.y / 2; } m_control->Move(x, y); @@ -1306,15 +1355,30 @@ void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr) void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) { wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxT("The wxGridCellEditor must be created first!")); if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) + { m_startValue = grid->GetTable()->GetValueAsBool(row, col); + } else { wxString cellval( grid->GetTable()->GetValue(row, col) ); - m_startValue = !( !cellval || (cellval == wxT("0")) ); + + if ( cellval == ms_stringValues[false] ) + m_startValue = false; + else if ( cellval == ms_stringValues[true] ) + m_startValue = true; + else + { + // do not try to be smart here and convert it to true or false + // because we'll still overwrite it with something different and + // this risks to be very surprising for the user code, let them + // know about it + wxFAIL_MSG( _T("invalid value for a cell with bool editor!") ); + } } + CBox()->SetValue(m_startValue); CBox()->SetFocus(); } @@ -1323,7 +1387,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col, wxGrid* grid) { wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxT("The wxGridCellEditor must be created first!")); bool changed = false; bool value = CBox()->GetValue(); @@ -1332,10 +1396,11 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col, if ( changed ) { - if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) - grid->GetTable()->SetValueAsBool(row, col, value); + wxGridTableBase * const table = grid->GetTable(); + if ( table->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) + table->SetValueAsBool(row, col, value); else - grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString); + table->SetValue(row, col, GetValue()); } return changed; @@ -1344,7 +1409,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col, void wxGridCellBoolEditor::Reset() { wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxT("The wxGridCellEditor must be created first!")); CBox()->SetValue(m_startValue); } @@ -1390,12 +1455,23 @@ void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event) } } - -// 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; + return ms_stringValues[CBox()->GetValue()]; +} + +/* static */ void +wxGridCellBoolEditor::UseStringValues(const wxString& valueTrue, + const wxString& valueFalse) +{ + ms_stringValues[false] = valueFalse; + ms_stringValues[true] = valueTrue; +} + +/* static */ bool +wxGridCellBoolEditor::IsTrueValue(const wxString& value) +{ + return value == ms_stringValues[true]; } #endif // wxUSE_CHECKBOX @@ -1439,10 +1515,16 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { + int style = wxTE_PROCESS_ENTER | + wxTE_PROCESS_TAB | + wxBORDER_NONE; + + if ( !m_allowOthers ) + style |= wxCB_READONLY; m_control = new wxComboBox(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_choices, - m_allowOthers ? 0 : wxCB_READONLY); + style); wxGridCellEditor::Create(parent, id, evtHandler); } @@ -1454,15 +1536,15 @@ void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell, // flicker // TODO: It doesn't actually fill the client area since the height of a - // combo always defaults to the standard... Until someone has time to - // figure out the right rectangle to paint, just do it the normal way... + // combo always defaults to the standard. Until someone has time to + // figure out the right rectangle to paint, just do it the normal way. wxGridCellEditor::PaintBackground(rectCell, attr); } void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) { wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + wxT("The wxGridCellEditor must be created first!")); wxGridCellEditorEvtHandler* evtHandler = NULL; if (m_control) @@ -1475,8 +1557,11 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) m_startValue = grid->GetTable()->GetValue(row, col); if (m_allowOthers) + { Combo()->SetValue(m_startValue); - else + Combo()->SetInsertionPointEnd(); + } + else // the combobox is read-only { // find the right position, or default to the first if not found int pos = Combo()->FindString(m_startValue); @@ -1484,7 +1569,7 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) pos = 0; Combo()->SetSelection(pos); } - Combo()->SetInsertionPointEnd(); + Combo()->SetFocus(); if (evtHandler) @@ -1577,11 +1662,21 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) default: event.Skip(); + break; } } void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) { + int row = m_grid->GetGridCursorRow(); + int col = m_grid->GetGridCursorCol(); + wxRect rect = m_grid->CellToRect( row, col ); + int cw, ch; + m_grid->GetGridWindow()->GetClientSize( &cw, &ch ); + + // if cell width is smaller than grid client area, cell is wholly visible + bool wholeCellVisible = (rect.GetWidth() < cw); + switch ( event.GetKeyCode() ) { case WXK_ESCAPE: @@ -1590,8 +1685,92 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) case WXK_NUMPAD_ENTER: break; + case WXK_HOME: + { + if ( wholeCellVisible ) + { + // no special processing needed... + event.Skip(); + break; + } + + // do special processing for partly visible cell... + + // get the widths of all cells previous to this one + int colXPos = 0; + for ( int i = 0; i < col; i++ ) + { + colXPos += m_grid->GetColSize(i); + } + + int xUnit = 1, yUnit = 1; + m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit); + if (col != 0) + { + m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL)); + } + else + { + m_grid->Scroll(colXPos / xUnit, m_grid->GetScrollPos(wxVERTICAL)); + } + event.Skip(); + break; + } + + case WXK_END: + { + if ( wholeCellVisible ) + { + // no special processing needed... + event.Skip(); + break; + } + + // do special processing for partly visible cell... + + int textWidth = 0; + wxString value = m_grid->GetCellValue(row, col); + if ( wxEmptyString != value ) + { + // get width of cell CONTENTS (text) + int y; + wxFont font = m_grid->GetCellFont(row, col); + m_grid->GetTextExtent(value, &textWidth, &y, NULL, NULL, &font); + + // try to RIGHT align the text by scrolling + int client_right = m_grid->GetGridWindow()->GetClientSize().GetWidth(); + + // (m_grid->GetScrollLineX()*2) is a factor for not scrolling to far, + // otherwise the last part of the cell content might be hidden below the scroll bar + // FIXME: maybe there is a more suitable correction? + textWidth -= (client_right - (m_grid->GetScrollLineX() * 2)); + if ( textWidth < 0 ) + { + textWidth = 0; + } + } + + // get the widths of all cells previous to this one + int colXPos = 0; + for ( int i = 0; i < col; i++ ) + { + colXPos += m_grid->GetColSize(i); + } + + // and add the (modified) text width of the cell contents + // as we'd like to see the last part of the cell contents + colXPos += textWidth; + + int xUnit = 1, yUnit = 1; + m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit); + m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL)); + event.Skip(); + break; + } + default: event.Skip(); + break; } } @@ -1624,23 +1803,28 @@ void wxGridCellRenderer::Draw(wxGrid& grid, int WXUNUSED(row), int WXUNUSED(col), bool isSelected) { - dc.SetBackgroundMode( wxSOLID ); + dc.SetBackgroundMode( wxBRUSHSTYLE_SOLID ); // grey out fields if the grid is disabled if ( grid.IsEnabled() ) { if ( isSelected ) { - dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + wxColour clr; + if ( grid.HasFocus() ) + clr = grid.GetSelectionBackground(); + else + clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); + dc.SetBrush( wxBrush(clr, wxBRUSHSTYLE_SOLID) ); } else { - dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxBRUSHSTYLE_SOLID) ); } } else { - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID)); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxBRUSHSTYLE_SOLID)); } dc.SetPen( *wxTRANSPARENT_PEN ); @@ -1656,28 +1840,33 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid, wxDC& dc, bool isSelected) { - dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT ); // TODO some special colours for attr.IsReadOnly() case? // different coloured text when the grid is disabled if ( grid.IsEnabled() ) { - if ( isSelected ) - { - dc.SetTextBackground( grid.GetSelectionBackground() ); - dc.SetTextForeground( grid.GetSelectionForeground() ); - } - else - { - dc.SetTextBackground( attr.GetBackgroundColour() ); - dc.SetTextForeground( attr.GetTextColour() ); - } + if ( isSelected ) + { + wxColour clr; + if ( grid.HasFocus() ) + clr = grid.GetSelectionBackground(); + else + clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); + dc.SetTextBackground( clr ); + dc.SetTextForeground( grid.GetSelectionForeground() ); + } + else + { + dc.SetTextBackground( attr.GetBackgroundColour() ); + dc.SetTextForeground( attr.GetTextColour() ); + } } else { - dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); + dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); } dc.SetFont( attr.GetFont() ); @@ -1732,34 +1921,40 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, int cols = grid.GetNumberCols(); int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth(); int cell_rows, cell_cols; - attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <=0 + attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <= 0 if ((best_width > rectCell.width) && (col < cols) && grid.GetTable()) { int i, c_cols, c_rows; for (i = col+cell_cols; i < cols; i++) { bool is_empty = true; - for (int j=row; j 0) c_rows = 0; - if (!grid.GetTable()->IsEmptyCell(j+c_rows, i)) + 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); + } else { i--; break; } + if (rect.width >= best_width) break; } + overflowCols = i - col - cell_cols + 1; if (overflowCols >= cols) overflowCols = cols - 1; @@ -1771,10 +1966,10 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, wxRect clip = rect; clip.x += rectCell.width; // draw each overflow cell individually - int col_end = col+cell_cols+overflowCols; + 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++) + for (int i = col + cell_cols; i <= col_end; i++) { clip.width = grid.GetColSize(i) - 1; dc.DestroyClippingRegion(); @@ -1978,6 +2173,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); } } + tmp = params.AfterFirst(_T(',')); if ( !tmp.empty() ) { @@ -1994,7 +2190,6 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) } } - // ---------------------------------------------------------------------------- // wxGridCellBoolRenderer // ---------------------------------------------------------------------------- @@ -2018,10 +2213,9 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, // get checkbox size wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString); wxSize size = checkbox->GetBestSize(); - wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN; + wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN; - // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXMOTIF__) checkSize -= size.y / 2; #endif @@ -2050,64 +2244,52 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, if ( size.x >= minSize || size.y >= minSize ) { // and even leave (at least) 1 pixel margin - size.x = size.y = minSize - 2; + size.x = size.y = minSize; } // draw a border around checkmark int vAlign, hAlign; - attr.GetAlignment(& hAlign, &vAlign); + attr.GetAlignment(&hAlign, &vAlign); wxRect rectBorder; 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.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.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.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) ) + { value = grid.GetTable()->GetValueAsBool(row, col); + } else { wxString cellval( grid.GetTable()->GetValue(row, col) ); - value = !( !cellval || (cellval == wxT("0")) ); + value = wxGridCellBoolEditor::IsTrueValue(cellval); } - if ( value ) - { - wxRect rectMark = rectBorder; -#ifdef __WXMSW__ - // MSW DrawCheckMark() is weird (and should probably be changed...) - rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2); - rectMark.x++; - rectMark.y++; -#else // !MSW - rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN); -#endif // MSW/!MSW - - dc.SetTextForeground(attr.GetTextColour()); - dc.DrawCheckMark(rectMark); - } + int flags = 0; + if (value) + flags |= wxCONTROL_CHECKED; - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID)); - dc.DrawRectangle(rectBorder); + wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags ); } // ---------------------------------------------------------------------------- @@ -2160,6 +2342,7 @@ wxGridCellAttr *wxGridCellAttr::Clone() const if ( IsReadOnly() ) attr->SetReadOnly(); + attr->SetOverflow( m_overflow == Overflow ); attr->SetKind( m_attrkind ); return attr; @@ -2196,10 +2379,10 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) m_editor = mergefrom->m_editor; m_editor->IncRef(); } - if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) + if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) SetReadOnly(mergefrom->IsReadOnly()); - if (!HasOverflowMode() && mergefrom->HasOverflowMode() ) + if (!HasOverflowMode() && mergefrom->HasOverflowMode() ) SetOverflow(mergefrom->GetOverflow()); SetDefAttr(mergefrom->m_defGridAttr); @@ -2217,9 +2400,9 @@ void wxGridCellAttr::SetSize(int num_rows, int num_cols) // Size of 0,0 is NOT valid, neither is <=0 and any positive value - wxASSERT_MSG( (!((num_rows>0)&&(num_cols<=0)) || - !((num_rows<=0)&&(num_cols>0)) || - !((num_rows==0)&&(num_cols==0))), + wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) || + !((num_rows <= 0) && (num_cols > 0)) || + !((num_rows == 0) && (num_cols == 0))), wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values")); m_sizeRows = num_rows; @@ -2243,13 +2426,16 @@ const wxColour& wxGridCellAttr::GetTextColour() const } } - const wxColour& wxGridCellAttr::GetBackgroundColour() const { if (HasBackgroundColour()) + { return m_colBack; + } else if (m_defGridAttr && m_defGridAttr != this) + { return m_defGridAttr->GetBackgroundColour(); + } else { wxFAIL_MSG(wxT("Missing default cell attribute")); @@ -2257,13 +2443,16 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const } } - const wxFont& wxGridCellAttr::GetFont() const { if (HasFont()) + { return m_font; + } else if (m_defGridAttr && m_defGridAttr != this) + { return m_defGridAttr->GetFont(); + } else { wxFAIL_MSG(wxT("Missing default cell attribute")); @@ -2271,7 +2460,6 @@ const wxFont& wxGridCellAttr::GetFont() const } } - void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const { if (HasAlignment()) @@ -2282,7 +2470,9 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const *vAlign = m_vAlign; } else if (m_defGridAttr && m_defGridAttr != this) + { m_defGridAttr->GetAlignment(hAlign, vAlign); + } else { wxFAIL_MSG(wxT("Missing default cell attribute")); @@ -2302,11 +2492,11 @@ void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const // used, otherwise the default editor or renderer is fetched from the grid and // used. It should be the default for the data type of the cell. If it is // NULL (because the table has a type that the grid does not have in its -// registry,) then the grid's default editor or renderer is used. +// registry), then the grid's default editor or renderer is used. -wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const +wxGridCellRenderer* wxGridCellAttr::GetRenderer(const wxGrid* grid, int row, int col) const { - wxGridCellRenderer *renderer; + wxGridCellRenderer *renderer = NULL; if ( m_renderer && this != m_defGridAttr ) { @@ -2314,7 +2504,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) renderer = m_renderer; renderer->IncRef(); } - else // no non default cell renderer + else // no non-default cell renderer { // get default renderer for the data type if ( grid ) @@ -2322,14 +2512,10 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) // GetDefaultRendererForCell() will do IncRef() for us renderer = grid->GetDefaultRendererForCell(row, col); } - else - { - renderer = NULL; - } - if ( !renderer ) + if ( renderer == NULL ) { - if (m_defGridAttr && this != m_defGridAttr ) + if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) ) { // if we still don't have one then use the grid default // (no need for IncRef() here neither) @@ -2352,9 +2538,9 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) } // same as above, except for s/renderer/editor/g -wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const +wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const { - wxGridCellEditor *editor; + wxGridCellEditor *editor = NULL; if ( m_editor && this != m_defGridAttr ) { @@ -2370,14 +2556,10 @@ wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) cons // GetDefaultEditorForCell() will do IncRef() for us editor = grid->GetDefaultEditorForCell(row, col); } - else - { - editor = NULL; - } - if ( !editor ) + if ( editor == NULL ) { - if ( m_defGridAttr && this != m_defGridAttr ) + if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) ) { // if we still don't have one then use the grid default // (no need for IncRef() here neither) @@ -2408,8 +2590,12 @@ void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col) int n = FindIndex(row, col); if ( n == wxNOT_FOUND ) { - // add the attribute - m_attrs.Add(new wxGridCellWithAttr(row, col, attr)); + if ( attr ) + { + // add the attribute + m_attrs.Add(new wxGridCellWithAttr(row, col, attr)); + } + //else: nothing to do } else { @@ -2507,7 +2693,8 @@ void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols ) // No need to DecRef the attribute itself since this is // done be wxGridCellWithAttr's destructor! m_attrs.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -2535,7 +2722,7 @@ int wxGridCellAttrData::FindIndex(int row, int col) const wxGridRowOrColAttrData::~wxGridRowOrColAttrData() { - size_t count = m_attrs.Count(); + size_t count = m_attrs.GetCount(); for ( size_t n = 0; n < count; n++ ) { m_attrs[n]->DecRef(); @@ -2561,9 +2748,13 @@ void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) int i = m_rowsOrCols.Index(rowOrCol); if ( i == wxNOT_FOUND ) { - // add the attribute - m_rowsOrCols.Add(rowOrCol); - m_attrs.Add(attr); + if ( attr ) + { + // add the attribute + m_rowsOrCols.Add(rowOrCol); + m_attrs.Add(attr); + } + // nothing to remove } else { @@ -2700,27 +2891,28 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, } } } - break; + break; case (wxGridCellAttr::Cell): attr = m_data->m_cellAttrs.GetAttr(row, col); - break; + break; case (wxGridCellAttr::Col): attr = m_data->m_colAttrs.GetAttr(col); - break; + break; case (wxGridCellAttr::Row): attr = m_data->m_rowAttrs.GetAttr(row); - break; + break; default: // unused as yet... // (wxGridCellAttr::Default): // (wxGridCellAttr::Merged): - break; + break; } } + return attr; } @@ -2775,12 +2967,11 @@ void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols ) wxGridTypeRegistry::~wxGridTypeRegistry() { - size_t count = m_typeinfo.Count(); + size_t count = m_typeinfo.GetCount(); for ( size_t i = 0; i < count; i++ ) delete m_typeinfo[i]; } - void wxGridTypeRegistry::RegisterDataType(const wxString& typeName, wxGridCellRenderer* renderer, wxGridCellEditor* editor) @@ -2918,6 +3109,7 @@ wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index) wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer; if (renderer) renderer->IncRef(); + return renderer; } @@ -2926,6 +3118,7 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) wxGridCellEditor* editor = m_typeinfo[index]->m_editor; if (editor) editor->IncRef(); + return editor; } @@ -2935,7 +3128,6 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject ) - wxGridTableBase::wxGridTableBase() { m_view = (wxGrid *) NULL; @@ -2960,6 +3152,7 @@ bool wxGridTableBase::CanHaveAttributes() // use the default attr provider by default SetAttrProvider(new wxGridCellAttrProvider); } + return true; } @@ -2971,7 +3164,6 @@ wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAtt return (wxGridCellAttr *)NULL; } - void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) { if ( m_attrProvider ) @@ -3066,8 +3258,11 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), wxString wxGridTableBase::GetRowLabelValue( int row ) { wxString s; - s << row + 1; // RD: Starting the rows at zero confuses users, no matter - // how much it makes sense to us geeks. + + // RD: Starting the rows at zero confuses users, + // no matter how much it makes sense to us geeks. + s << row + 1; + return s; } @@ -3082,17 +3277,17 @@ wxString wxGridTableBase::GetColLabelValue( int col ) unsigned int i, n; for ( n = 1; ; n++ ) { - s += (wxChar) (_T('A') + (wxChar)( col%26 )); - col = col/26 - 1; + s += (wxChar) (_T('A') + (wxChar)(col % 26)); + col = col / 26 - 1; if ( col < 0 ) break; } // reverse the string... wxString s2; - for ( i = 0; i < n; i++ ) + for ( i = 0; i < n; i++ ) { - s2 += s[n-i-1]; + s2 += s[n - i - 1]; } return s2; @@ -3144,7 +3339,6 @@ void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col), { } - void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col), const wxString& WXUNUSED(typeName) ) { @@ -3180,8 +3374,6 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id, m_comInt2 = commandInt2; } - - ////////////////////////////////////////////////////////////////////// // // A basic grid table for string data. An object of this class will @@ -3262,9 +3454,9 @@ void wxGridStringTable::Clear() { numCols = m_data[0].GetCount(); - for ( row = 0; row < numRows; row++ ) + for ( row = 0; row < numRows; row++ ) { - for ( col = 0; col < numCols; col++ ) + for ( col = 0; col < numCols; col++ ) { m_data[row][col] = wxEmptyString; } @@ -3272,7 +3464,6 @@ void wxGridStringTable::Clear() } } - bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { size_t curNumRows = m_data.GetCount(); @@ -3288,6 +3479,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) sa.Alloc( curNumCols ); sa.Add( wxEmptyString, curNumCols ); m_data.Insert( sa, pos, numRows ); + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3387,9 +3579,18 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) return AppendCols( numCols ); } - for ( row = 0; row < curNumRows; row++ ) + if ( !m_colLabels.IsEmpty() ) + { + m_colLabels.Insert( wxEmptyString, pos, numCols ); + + size_t i; + for ( i = pos; i < pos + numCols; i++ ) + m_colLabels[i] = wxGridTableBase::GetColLabelValue( i ); + } + + for ( row = 0; row < curNumRows; row++ ) { - for ( col = pos; col < pos + numCols; col++ ) + for ( col = pos; col < pos + numCols; col++ ) { m_data[row].Insert( wxEmptyString, col ); } @@ -3413,6 +3614,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) size_t row; size_t curNumRows = m_data.GetCount(); + #if 0 if ( !curNumRows ) { @@ -3423,7 +3625,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) } #endif - for ( row = 0; row < curNumRows; row++ ) + for ( row = 0; row < curNumRows; row++ ) { m_data[row].Add( wxEmptyString, numCols ); } @@ -3460,12 +3662,28 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) return false; } - if ( numCols > curNumCols - pos ) + int colID; + if ( GetView() ) + colID = GetView()->GetColAt( pos ); + else + colID = pos; + + if ( numCols > curNumCols - colID ) + { + numCols = curNumCols - colID; + } + + if ( !m_colLabels.IsEmpty() ) { - numCols = curNumCols - pos; + // m_colLabels stores just as many elements as it needs, e.g. if only + // the label of the first column had been set it would have only one + // element and not numCols, so account for it + int nToRm = m_colLabels.size() - colID; + if ( nToRm > 0 ) + m_colLabels.RemoveAt( colID, nToRm ); } - for ( row = 0; row < curNumRows; row++ ) + for ( row = 0; row < curNumRows; row++ ) { if ( numCols >= curNumCols ) { @@ -3473,7 +3691,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } else { - m_data[row].RemoveAt( pos, numCols ); + m_data[row].RemoveAt( colID, numCols ); } } @@ -3500,7 +3718,7 @@ wxString wxGridStringTable::GetRowLabelValue( int row ) } else { - return m_rowLabels[ row ]; + return m_rowLabels[row]; } } @@ -3514,7 +3732,7 @@ wxString wxGridStringTable::GetColLabelValue( int col ) } else { - return m_colLabels[ col ]; + return m_colLabels[col]; } } @@ -3524,7 +3742,8 @@ void wxGridStringTable::SetRowLabelValue( int row, const wxString& value ) { int n = m_rowLabels.GetCount(); int i; - for ( i = n; i <= row; i++ ) + + for ( i = n; i <= row; i++ ) { m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) ); } @@ -3539,7 +3758,8 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) { int n = m_colLabels.GetCount(); int i; - for ( i = n; i <= col; i++ ) + + for ( i = n; i <= col; i++ ) { m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) ); } @@ -3552,21 +3772,27 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// +BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow) + EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost) +END_EVENT_TABLE() + +void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + m_owner->CancelMouseCapture(); +} + IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) -BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow ) +BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow ) EVT_PAINT( wxGridRowLabelWindow::OnPaint ) - EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel) + EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel ) EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent ) - EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown ) - EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp ) - EVT_CHAR ( wxGridRowLabelWindow::OnChar ) END_EVENT_TABLE() wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) + : wxGridSubwindow(parent, id, pos, size) { m_owner = parent; } @@ -3583,10 +3809,11 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) int x, y; m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); - dc.SetDeviceOrigin( 0, -y ); + wxPoint pt = dc.GetDeviceOrigin(); + dc.SetDeviceOrigin( pt.x, pt.y-y ); wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); - m_owner->DrawRowLabels( dc , rows ); + m_owner->DrawRowLabels( dc, rows ); } void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) @@ -3596,45 +3823,23 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event ) { - m_owner->GetEventHandler()->ProcessEvent(event); -} - -// This seems to be required for wxMotif otherwise the mouse -// cursor must be in the cell edit control to get key events -// -void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + m_owner->GetEventHandler()->ProcessEvent( event ); } -void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); -} - -void wxGridRowLabelWindow::OnChar( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); -} - - ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow ) -BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow ) +BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow ) EVT_PAINT( wxGridColLabelWindow::OnPaint ) - EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel) + EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel ) EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent ) - EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown ) - EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp ) - EVT_CHAR ( wxGridColLabelWindow::OnChar ) END_EVENT_TABLE() wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) + : wxGridSubwindow(parent, id, pos, size) { m_owner = parent; } @@ -3651,10 +3856,14 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) int x, y; m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); - dc.SetDeviceOrigin( -x, 0 ); + wxPoint pt = dc.GetDeviceOrigin(); + if (GetLayoutDirection() == wxLayout_RightToLeft) + dc.SetDeviceOrigin( pt.x+x, pt.y ); + else + dc.SetDeviceOrigin( pt.x-x, pt.y ); wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() ); - m_owner->DrawColLabels( dc , cols ); + m_owner->DrawColLabels( dc, cols ); } void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) @@ -3664,48 +3873,23 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event ) { - m_owner->GetEventHandler()->ProcessEvent(event); -} - -// This seems to be required for wxMotif otherwise the mouse -// cursor must be in the cell edit control to get key events -// -void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); + m_owner->GetEventHandler()->ProcessEvent( event ); } -void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); -} - -void wxGridColLabelWindow::OnChar( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) - event.Skip(); -} - - ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow ) -BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow ) - EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel) +BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow ) + EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel ) EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent ) - EVT_PAINT( wxGridCornerLabelWindow::OnPaint) - EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown ) - EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp ) - EVT_CHAR ( wxGridCornerLabelWindow::OnChar ) + EVT_PAINT( wxGridCornerLabelWindow::OnPaint ) END_EVENT_TABLE() wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) + : wxGridSubwindow(parent, id, pos, size) { m_owner = parent; } @@ -3719,7 +3903,8 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) GetClientSize( &client_width, &client_height ); // VZ: any reason for this ifdef? (FIXME) -#ifdef __WXGTK__ +#if 0 +def __WXGTK__ wxRect rect; rect.SetX( 1 ); rect.SetY( 1 ); @@ -3728,16 +3913,16 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 ); #else // !__WXGTK__ - 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( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxPENSTYLE_SOLID) ); + 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.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 ); -#endif // __WXGTK__/!__WXGTK__ + dc.DrawLine( 1, 1, client_width - 1, 1 ); + dc.DrawLine( 1, 1, 1, client_height - 1 ); +#endif } void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) @@ -3750,36 +3935,17 @@ void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event ) m_owner->GetEventHandler()->ProcessEvent(event); } -// This seems to be required for wxMotif otherwise the mouse -// cursor must be in the cell edit control to get key events -// -void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); -} - -void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); -} - -void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event ) -{ - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); -} - - ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow ) -BEGIN_EVENT_TABLE( wxGridWindow, wxWindow ) +BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow ) EVT_PAINT( wxGridWindow::OnPaint ) - EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel) + EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel ) EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) EVT_KEY_UP( wxGridWindow::OnKeyUp ) - EVT_CHAR ( wxGridWindow::OnChar ) + EVT_CHAR( wxGridWindow::OnChar ) EVT_SET_FOCUS( wxGridWindow::OnFocus ) EVT_KILL_FOCUS( wxGridWindow::OnFocus ) EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground ) @@ -3791,8 +3957,9 @@ wxGridWindow::wxGridWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE, - wxT("grid window") ) + : wxGridSubwindow(parent, id, pos, size, + wxWANTS_CHARS | wxCLIP_CHILDREN, + wxT("grid window") ) { m_owner = parent; m_rowLabelWin = rowLblWin; @@ -3804,13 +3971,15 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc( this ); m_owner->PrepareDC( dc ); wxRegion reg = GetUpdateRegion(); - wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg ); - m_owner->DrawGridCellArea( dc , DirtyCells); + wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg ); + m_owner->DrawGridCellArea( dc, dirtyCells ); + #if WXGRID_DRAW_LINES m_owner->DrawAllGridLines( dc, reg ); #endif + m_owner->DrawGridSpace( dc ); - m_owner->DrawHighlight( dc , DirtyCells ); + m_owner->DrawHighlight( dc, dirtyCells ); } void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) @@ -3830,7 +3999,7 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) void wxGridWindow::OnMouseWheel( wxMouseEvent& event ) { - m_owner->GetEventHandler()->ProcessEvent(event); + m_owner->GetEventHandler()->ProcessEvent( event ); } // This seems to be required for wxMotif/wxGTK otherwise the mouse @@ -3860,6 +4029,29 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) void wxGridWindow::OnFocus(wxFocusEvent& event) { + // and if we have any selection, it has to be repainted, because it + // uses different colour when the grid is not focused: + if ( m_owner->IsSelection() ) + { + Refresh(); + } + else + { + // NB: Note that this code is in "else" branch only because the other + // branch refreshes everything and so there's no point in calling + // Refresh() again, *not* because it should only be done if + // !IsSelection(). If the above code is ever optimized to refresh + // only selected area, this needs to be moved out of the "else" + // branch so that it's always executed. + + // current cell cursor {dis,re}appears on focus change: + const wxGridCellCoords cursorCoords(m_owner->GetGridCursorRow(), + m_owner->GetGridCursorCol()); + const wxRect cursor = + m_owner->BlockToDeviceRect(cursorCoords, cursorCoords); + Refresh(true, &cursor); + } + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -3877,12 +4069,11 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, const wxArrayInt& BorderArray, int nMax, bool clipToMinMax); -#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \ - m_minAcceptableColWidth, \ - m_colRights, m_numCols, true) +#define internalXToCol(x) XToCol(x, true) #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \ m_minAcceptableRowHeight, \ m_rowBottoms, m_numRows, true) + ///////////////////////////////////////////////////////////////////// #if wxUSE_EXTENDED_RTTI @@ -3912,7 +4103,7 @@ wxBEGIN_FLAGS( wxGridStyle ) wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) wxFLAGS_MEMBER(wxWANTS_CHARS) wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB) wxFLAGS_MEMBER(wxVSCROLL) wxFLAGS_MEMBER(wxHSCROLL) @@ -3931,7 +4122,7 @@ wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* - TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) + TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) @@ -3948,12 +4139,7 @@ END_EVENT_TABLE() wxGrid::wxGrid() { - // in order to make sure that a size event is not - // trigerred in a unfinished state - m_cornerLabelWin = NULL ; - m_rowLabelWin = NULL ; - m_colLabelWin = NULL ; - m_gridWin = NULL ; + InitVars(); } wxGrid::wxGrid( wxWindow *parent, @@ -3962,12 +4148,9 @@ wxGrid::wxGrid( wxWindow *parent, const wxSize& size, long style, const wxString& name ) - : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ), - m_colMinWidths(GRID_HASH_SIZE), - m_rowMinHeights(GRID_HASH_SIZE) { - Create(); - SetBestFittingSize(size); + InitVars(); + Create(parent, id, pos, size, style, name); } bool wxGrid::Create(wxWindow *parent, wxWindowID id, @@ -3975,19 +4158,19 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { if (!wxScrolledWindow::Create(parent, id, pos, size, - style | wxWANTS_CHARS , name)) + style | wxWANTS_CHARS, name)) return false; - m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ; - m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ; + m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE); + m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE); - Create() ; - SetBestFittingSize(size); + Create(); + SetInitialSize(size); + CalcDimensions(); return true; } - wxGrid::~wxGrid() { // Must do this or ~wxScrollHelper will pop the wrong event handler @@ -4003,14 +4186,17 @@ wxGrid::~wxGrid() total ? (gs_nAttrCacheHits*100) / total : 0); #endif - if (m_ownTable) + // if we own the table, just delete it, otherwise at least don't leave it + // with dangling view pointer + if ( m_ownTable ) delete m_table; + else if ( m_table && m_table->GetView() == this ) + m_table->SetView(NULL); delete m_typeRegistry; delete m_selection; } - // // ----- internal init and update functions // @@ -4019,16 +4205,10 @@ wxGrid::~wxGrid() // be removed as well as the #else cases below. #define _USE_VISATTR 0 -#if _USE_VISATTR -#include "wx/listbox.h" -#endif - void wxGrid::Create() { - m_created = false; // set to true by CreateGrid - - m_table = (wxGridTableBase *) NULL; - m_ownTable = false; + // create the type registry + m_typeRegistry = new wxGridTypeRegistry; m_cellEditCtrlEnabled = false; @@ -4063,16 +4243,7 @@ void wxGrid::Create() m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - // create the type registry - m_typeRegistry = new wxGridTypeRegistry; - m_selection = NULL; - // subwindow components that make up the wxGrid - m_cornerLabelWin = new wxGridCornerLabelWindow( this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize ); - m_rowLabelWin = new wxGridRowLabelWindow( this, wxID_ANY, wxDefaultPosition, @@ -4083,6 +4254,11 @@ void wxGrid::Create() wxDefaultPosition, wxDefaultSize ); + m_cornerLabelWin = new wxGridCornerLabelWindow( this, + wxID_ANY, + wxDefaultPosition, + wxDefaultSize ); + m_gridWin = new wxGridWindow( this, m_rowLabelWin, m_colLabelWin, @@ -4103,6 +4279,7 @@ void wxGrid::Create() wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ); #endif + m_cornerLabelWin->SetOwnForegroundColour(lfg); m_cornerLabelWin->SetOwnBackgroundColour(lbg); m_rowLabelWin->SetOwnForegroundColour(lfg); @@ -4116,7 +4293,6 @@ void wxGrid::Create() Init(); } - bool wxGrid::CreateGrid( int numRows, int numCols, wxGrid::wxGridSelectionModes selmode ) { @@ -4158,24 +4334,35 @@ wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, wxGrid::wxGridSelectionModes selmode ) { + bool checkSelection = false; if ( m_created ) { // stop all processing m_created = false; - if (m_ownTable) + if (m_table) { - wxGridTableBase *t=m_table; - m_table=0; - delete t; + m_table->SetView(0); + if( m_ownTable ) + delete m_table; + m_table = NULL; } + delete m_selection; + m_selection = NULL; + + m_ownTable = false; + m_numRows = 0; + m_numCols = 0; + checkSelection = true; - m_table=0; - m_selection=0; - m_numRows=0; - m_numCols=0; + // kill row and column size arrays + m_colWidths.Empty(); + m_colRights.Empty(); + m_rowHeights.Empty(); + m_rowBottoms.Empty(); } + if (table) { m_numRows = table->GetNumberRows(); @@ -4183,10 +4370,30 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, m_table = table; m_table->SetView( this ); - if (takeOwnership) - m_ownTable = true; + m_ownTable = takeOwnership; m_selection = new wxGridSelection( this, selmode ); - + if (checkSelection) + { + // If the newly set table is smaller than the + // original one current cell and selection regions + // might be invalid, + m_selectingKeyboard = wxGridNoCellCoords; + m_currentCellCoords = + wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()), + wxMin(m_numCols, m_currentCellCoords.GetCol())); + if (m_selectingTopLeft.GetRow() >= m_numRows || + m_selectingTopLeft.GetCol() >= m_numCols) + { + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + } + else + m_selectingBottomRight = + wxGridCellCoords(wxMin(m_numRows, + m_selectingBottomRight.GetRow()), + wxMin(m_numCols, + m_selectingBottomRight.GetCol())); + } CalcDimensions(); m_created = true; @@ -4195,6 +4402,23 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, return m_created; } +void wxGrid::InitVars() +{ + m_created = false; + + m_cornerLabelWin = NULL; + m_rowLabelWin = NULL; + m_colLabelWin = NULL; + m_gridWin = NULL; + + m_table = NULL; + m_ownTable = false; + + m_selection = NULL; + m_defaultCellAttr = NULL; + m_typeRegistry = NULL; + m_winCapture = NULL; +} void wxGrid::Init() { @@ -4207,10 +4431,10 @@ void wxGrid::Init() } else { - m_labelBackgroundColour = wxColour( _T("WHITE") ); + m_labelBackgroundColour = *wxWHITE; } - m_labelTextColour = wxColour( _T("BLACK") ); + m_labelTextColour = *wxBLACK; // init attr cache m_attrCache.row = -1; @@ -4247,6 +4471,8 @@ void wxGrid::Init() m_cellHighlightPenWidth = 2; m_cellHighlightROPenWidth = 1; + m_canDragColMove = false; + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_winCapture = (wxWindow *)NULL; m_canDragRowSize = true; @@ -4257,6 +4483,7 @@ void wxGrid::Init() m_dragRowOrCol = -1; m_isDragging = false; m_startDragPos = wxDefaultPosition; + m_nativeColumnLabels = false; m_waitForSlowClick = false; @@ -4265,8 +4492,8 @@ void wxGrid::Init() m_currentCellCoords = wxGridNoCellCoords; - m_selectingTopLeft = wxGridNoCellCoords; - m_selectingBottomRight = wxGridNoCellCoords; + ClearSelection(); + m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); @@ -4288,8 +4515,9 @@ void wxGrid::Init() // default widths/heights are used for all rows/columns, we may not use these // arrays at all // -// with some extra code, it should be possible to only store the -// widths/heights different from default ones but this will be done later... +// with some extra code, it should be possible to only store the widths/heights +// different from default ones (resulting in space savings for huge grids) but +// this is not done currently // ---------------------------------------------------------------------------- void wxGrid::InitRowHeights() @@ -4300,11 +4528,10 @@ void wxGrid::InitRowHeights() m_rowHeights.Alloc( m_numRows ); m_rowBottoms.Alloc( m_numRows ); - int rowBottom = 0; - m_rowHeights.Add( m_defaultRowHeight, m_numRows ); - for ( int i = 0; i < m_numRows; i++ ) + int rowBottom = 0; + for ( int i = 0; i < m_numRows; i++ ) { rowBottom += m_defaultRowHeight; m_rowBottoms.Add( rowBottom ); @@ -4318,13 +4545,13 @@ void wxGrid::InitColWidths() m_colWidths.Alloc( m_numCols ); m_colRights.Alloc( m_numCols ); - int colRight = 0; m_colWidths.Add( m_defaultColWidth, m_numCols ); - for ( int i = 0; i < m_numCols; i++ ) + int colRight = 0; + for ( int i = 0; i < m_numCols; i++ ) { - colRight += m_defaultColWidth; + colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth; m_colRights.Add( colRight ); } } @@ -4336,13 +4563,13 @@ int wxGrid::GetColWidth(int col) const int wxGrid::GetColLeft(int col) const { - return m_colRights.IsEmpty() ? col * m_defaultColWidth + return m_colRights.IsEmpty() ? GetColPos( col ) * m_defaultColWidth : m_colRights[col] - m_colWidths[col]; } int wxGrid::GetColRight(int col) const { - return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth + return m_colRights.IsEmpty() ? (GetColPos( col ) + 1) * m_defaultColWidth : m_colRights[col]; } @@ -4365,39 +4592,34 @@ int wxGrid::GetRowBottom(int row) const void wxGrid::CalcDimensions() { - int cw, ch; - GetClientSize( &cw, &ch ); + // compute the size of the scrollable area + int w = m_numCols > 0 ? GetColRight(GetColAt(m_numCols - 1)) : 0; + int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0; - if ( m_rowLabelWin->IsShown() ) - cw -= m_rowLabelWidth; - if ( m_colLabelWin->IsShown() ) - ch -= m_colLabelHeight; - - // grid total size - 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; + w += m_extraWidth; + h += m_extraHeight; // 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(); + 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 @@ -4412,7 +4634,8 @@ void wxGrid::CalcDimensions() // do set scrollbar parameters SetScrollbars( m_scrollLineX, m_scrollLineY, - GetScrollX(w), GetScrollY(h), x, y, + GetScrollX(w), GetScrollY(h), + x, y, GetBatchCount() != 0); // if our OnSize() hadn't been called (it would if we have scrollbars), we @@ -4420,33 +4643,67 @@ void wxGrid::CalcDimensions() CalcWindowSizes(); } - void wxGrid::CalcWindowSizes() { // escape if the window is has not been fully created yet if ( m_cornerLabelWin == NULL ) - return ; + return; int cw, ch; GetClientSize( &cw, &ch ); + // this block of code tries to work around the following problem: the grid + // could have been just resized to have enough space to show the full grid + // window contents without the scrollbars, but its client size could be + // not big enough because the grid has the scrollbars right now and so the + // scrollbars would remain even though we don't need them any more + // + // to prevent this from happening, check if we have enough space for + // everything without the scrollbars and explicitly disable them then + wxSize size = GetSize() - GetWindowBorderSize(); + if ( size != wxSize(cw, ch) ) + { + // check if we have enough space for grid window after accounting for + // the fixed size elements + size.x -= m_rowLabelWidth; + size.y -= m_colLabelHeight; + + const wxSize vsize = m_gridWin->GetVirtualSize(); + + if ( size.x >= vsize.x && size.y >= vsize.y ) + { + // yes, we do, so remove the scrollbars and use the new client size + // (which should be the same as full window size - borders now) + SetScrollbars(0, 0, 0, 0); + GetClientSize(&cw, &ch); + } + } + + // the grid may be too small to have enough space for the labels yet, don't + // size the windows to negative sizes in this case + int gw = cw - m_rowLabelWidth; + int gh = ch - m_colLabelHeight; + if (gw < 0) + gw = 0; + if (gh < 0) + gh = 0; + if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() ) m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight ); - if ( m_colLabelWin && m_colLabelWin->IsShown() ) - m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight); + if ( m_colLabelWin && m_colLabelWin->IsShown() ) + m_colLabelWin->SetSize( m_rowLabelWidth, 0, gw, m_colLabelHeight ); if ( m_rowLabelWin && m_rowLabelWin->IsShown() ) - m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight); + m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, gh ); if ( m_gridWin && m_gridWin->IsShown() ) - m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight); + m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, gw, gh ); } - -// this is called when the grid table sends a message to say that it -// has been redimensioned +// this is called when the grid table sends a message +// to indicate that it has been redimensioned // bool wxGrid::Redimension( wxGridTableMessage& msg ) { @@ -4456,12 +4713,14 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // Clear the attribute cache as the attribute might refer to a different // cell than stored in the cache after adding/removing rows/columns. ClearAttrCache(); + // By the same reasoning, the editor should be dismissed if columns are // added or removed. And for consistency, it should IMHO always be // removed, not only if the cell "underneath" it actually changes. // For now, I intentionally do not save the editor's content as the // cell it might want to save that stuff to might no longer exist. HideCellEditControl(); + #if 0 // if we were using the default widths/heights so far, we must change them // now @@ -4491,14 +4750,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowBottoms.Insert( 0, pos, numRows ); int bottom = 0; - if ( pos > 0 ) bottom = m_rowBottoms[pos-1]; + if ( pos > 0 ) + bottom = m_rowBottoms[pos - 1]; - for ( i = pos; i < m_numRows; i++ ) + 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 @@ -4534,14 +4795,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowBottoms.Add( 0, numRows ); int bottom = 0; - if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1]; + 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 @@ -4549,6 +4812,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // SetCurrentCell( 0, 0 ); } + if ( !GetBatchCount() ) { CalcDimensions(); @@ -4570,12 +4834,13 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowBottoms.RemoveAt( pos, numRows ); int h = 0; - for ( i = 0; i < m_numRows; i++ ) + for ( i = 0; i < m_numRows; i++ ) { h += m_rowHeights[i]; m_rowBottoms[i] = h; } } + if ( !m_numRows ) { m_currentCellCoords = wxGridNoCellCoords; @@ -4592,6 +4857,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) 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 @@ -4603,6 +4869,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) attrProvider->UpdateAttrCols( 0, -GetNumberCols() ); #endif } + if ( !GetBatchCount() ) { CalcDimensions(); @@ -4618,20 +4885,44 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) int numCols = msg.GetCommandInt2(); m_numCols += numCols; + if ( !m_colAt.IsEmpty() ) + { + //Shift the column IDs + int i; + for ( i = 0; i < m_numCols - numCols; i++ ) + { + if ( m_colAt[i] >= (int)pos ) + m_colAt[i] += numCols; + } + + m_colAt.Insert( pos, pos, numCols ); + + //Set the new columns' positions + for ( i = pos + 1; i < (int)pos + numCols; i++ ) + { + m_colAt[i] = i; + } + } + if ( !m_colWidths.IsEmpty() ) { m_colWidths.Insert( m_defaultColWidth, pos, numCols ); m_colRights.Insert( 0, pos, numCols ); int right = 0; - if ( pos > 0 ) right = m_colRights[pos-1]; + if ( pos > 0 ) + right = m_colRights[GetColAt( pos - 1 )]; - for ( i = pos; i < m_numCols; i++ ) + int colPos; + for ( colPos = pos; colPos < m_numCols; colPos++ ) { + i = GetColAt( colPos ); + right += m_colWidths[i]; m_colRights[i] = right; } } + if ( m_currentCellCoords == wxGridNoCellCoords ) { // if we have just inserted cols into an empty grid the current @@ -4650,7 +4941,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) CalcDimensions(); m_colLabelWin->Refresh(); } - } result = true; break; @@ -4660,20 +4950,38 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) int numCols = msg.GetCommandInt(); int oldNumCols = m_numCols; m_numCols += numCols; + + if ( !m_colAt.IsEmpty() ) + { + m_colAt.Add( 0, numCols ); + + //Set the new columns' positions + int i; + for ( i = oldNumCols; i < m_numCols; i++ ) + { + m_colAt[i] = i; + } + } + if ( !m_colWidths.IsEmpty() ) { m_colWidths.Add( m_defaultColWidth, numCols ); m_colRights.Add( 0, numCols ); int right = 0; - if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; + if ( oldNumCols > 0 ) + right = m_colRights[GetColAt( oldNumCols - 1 )]; - for ( i = oldNumCols; i < m_numCols; i++ ) + int colPos; + for ( colPos = oldNumCols; colPos < m_numCols; colPos++ ) { + i = GetColAt( colPos ); + right += m_colWidths[i]; m_colRights[i] = right; } } + if ( m_currentCellCoords == wxGridNoCellCoords ) { // if we have just inserted cols into an empty grid the current @@ -4696,18 +5004,37 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) int numCols = msg.GetCommandInt2(); m_numCols -= numCols; + if ( !m_colAt.IsEmpty() ) + { + int colID = GetColAt( pos ); + + m_colAt.RemoveAt( pos, numCols ); + + //Shift the column IDs + int colPos; + for ( colPos = 0; colPos < m_numCols; colPos++ ) + { + if ( m_colAt[colPos] > colID ) + m_colAt[colPos] -= numCols; + } + } + if ( !m_colWidths.IsEmpty() ) { m_colWidths.RemoveAt( pos, numCols ); m_colRights.RemoveAt( pos, numCols ); int w = 0; - for ( i = 0; i < m_numCols; i++ ) + int colPos; + for ( colPos = 0; colPos < m_numCols; colPos++ ) { + i = GetColAt( colPos ); + w += m_colWidths[i]; m_colRights[i] = w; } } + if ( !m_numCols ) { m_currentCellCoords = wxGridNoCellCoords; @@ -4724,6 +5051,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) 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 @@ -4735,6 +5063,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) attrProvider->UpdateAttrRows( 0, -GetNumberRows() ); #endif } + if ( !GetBatchCount() ) { CalcDimensions(); @@ -4747,11 +5076,11 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if (result && !GetBatchCount() ) m_gridWin->Refresh(); + return result; } - -wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) +wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const { wxRegionIterator iter( reg ); wxRect r; @@ -4771,7 +5100,8 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) #if defined(__WXMOTIF__) int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); - if ( r.GetTop() > ch ) r.SetTop( 0 ); + if ( r.GetTop() > ch ) + r.SetTop( 0 ); r.SetBottom( wxMin( r.GetBottom(), ch ) ); #endif @@ -4784,7 +5114,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) // find the row labels within these bounds // int row; - for ( row = internalYToRow(top); row < m_numRows; row++ ) + for ( row = internalYToRow(top); row < m_numRows; row++ ) { if ( GetRowBottom(row) < top ) continue; @@ -4801,8 +5131,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) return rowlabels; } - -wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) +wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const { wxRegionIterator iter( reg ); wxRect r; @@ -4822,7 +5151,8 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) #if defined(__WXMOTIF__) int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); - if ( r.GetLeft() > cw ) r.SetLeft( 0 ); + if ( r.GetLeft() > cw ) + r.SetLeft( 0 ); r.SetRight( wxMin( r.GetRight(), cw ) ); #endif @@ -4835,8 +5165,11 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) // find the cells within these bounds // int col; - for ( col = internalXToCol(left); col < m_numCols; col++ ) + int colPos; + for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ ) { + col = GetColAt( colPos ); + if ( GetColRight(col) < left ) continue; @@ -4848,11 +5181,11 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) ++iter; } + return colLabels; } - -wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) +wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const { wxRegionIterator iter( reg ); wxRect r; @@ -4886,7 +5219,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) // find the cells within these bounds // int row, col; - for ( row = internalYToRow(top); row < m_numRows; row++ ) + for ( row = internalYToRow(top); row < m_numRows; row++ ) { if ( GetRowBottom(row) <= top ) continue; @@ -4894,8 +5227,11 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) if ( GetRowTop(row) > bottom ) break; - for ( col = internalXToCol(left); col < m_numCols; col++ ) + int colPos; + for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ ) { + col = GetColAt( colPos ); + if ( GetColRight(col) <= left ) continue; @@ -4982,7 +5318,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if (m_isDragging) { - if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse(); + if (m_rowLabelWin->HasCapture()) + m_rowLabelWin->ReleaseMouse(); m_isDragging = false; } @@ -4993,7 +5330,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); } - // ------------ Left button pressed // else if ( event.LeftDown() ) @@ -5005,10 +5341,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( YToEdgeOfRow(y) < 0 ) { row = YToRow(y); - if ( row >= 0 && + if ( row >= 0 && !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { - if ( !event.ShiftDown() && !event.ControlDown() ) + if ( !event.ShiftDown() && !event.CmdDown() ) ClearSelection(); if ( m_selection ) { @@ -5039,13 +5375,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else { // starting to drag-resize a row - // if ( CanDragRowSize() ) ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin); } } - // ------------ Left double click // else if (event.LeftDClick() ) @@ -5066,11 +5400,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) AutoSizeRowLabelSize( row ); ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); - m_dragLastPos = -1; + m_dragLastPos = -1; } } - // ------------ Left button released // else if ( event.LeftUp() ) @@ -5089,7 +5422,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) m_dragLastPos = -1; } - // ------------ Right button down // else if ( event.RightDown() ) @@ -5102,7 +5434,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) } } - // ------------ Right double click // else if ( event.RightDClick() ) @@ -5115,7 +5446,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) } } - // ------------ No buttons down and mouse moving // else if ( event.Moving() ) @@ -5137,7 +5467,6 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) } } - void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { int x, y, col; @@ -5150,6 +5479,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { m_isDragging = true; m_colLabelWin->CaptureMouse(); + + if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL ) + m_dragRowOrCol = XToCol( x ); } if ( event.LeftIsDown() ) @@ -5170,9 +5502,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { - dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch ); } - dc.DrawLine( x, top, x, top+ch ); + dc.DrawLine( x, top, x, top + ch ); m_dragLastPos = x; } break; @@ -5193,6 +5525,63 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) } break; + case WXGRID_CURSOR_MOVE_COL: + { + if ( x < 0 ) + m_moveToCol = GetColAt( 0 ); + else + m_moveToCol = XToCol( x ); + + int markerX; + + if ( m_moveToCol < 0 ) + markerX = GetColRight( GetColAt( m_numCols - 1 ) ); + else + markerX = GetColLeft( m_moveToCol ); + + if ( markerX != m_dragLastPos ) + { + wxClientDC dc( m_colLabelWin ); + + int cw, ch; + m_colLabelWin->GetClientSize( &cw, &ch ); + + markerX++; + + //Clean up the last indicator + if ( m_dragLastPos >= 0 ) + { + wxPen pen( m_colLabelWin->GetBackgroundColour(), 2 ); + dc.SetPen(pen); + dc.DrawLine( m_dragLastPos + 1, 0, m_dragLastPos + 1, ch ); + dc.SetPen(wxNullPen); + + if ( XToCol( m_dragLastPos ) != -1 ) + DrawColLabel( dc, XToCol( m_dragLastPos ) ); + } + + //Moving to the same place? Don't draw a marker + if ( (m_moveToCol == m_dragRowOrCol) + || (GetColPos( m_moveToCol ) == GetColPos( m_dragRowOrCol ) + 1) + || (m_moveToCol < 0 && m_dragRowOrCol == GetColAt( m_numCols - 1 ))) + { + m_dragLastPos = -1; + return; + } + + //Draw the marker + wxPen pen( *wxBLUE, 2 ); + dc.SetPen(pen); + + dc.DrawLine( markerX, 0, markerX, ch ); + + dc.SetPen(wxNullPen); + + m_dragLastPos = markerX - 1; + } + } + break; + // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch default: @@ -5207,7 +5596,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if (m_isDragging) { - if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse(); + if (m_colLabelWin->HasCapture()) + m_colLabelWin->ReleaseMouse(); m_isDragging = false; } @@ -5218,7 +5608,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); } - // ------------ Left button pressed // else if ( event.LeftDown() ) @@ -5230,34 +5619,49 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( XToEdgeOfCol(x) < 0 ) { col = XToCol(x); - if ( col >= 0 && + if ( col >= 0 && !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) { - if ( !event.ShiftDown() && !event.ControlDown() ) - ClearSelection(); - if ( m_selection ) + if ( m_canDragColMove ) { - if ( event.ShiftDown() ) - { - m_selection->SelectBlock( 0, - m_currentCellCoords.GetCol(), - GetNumberRows() - 1, col, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); - } - else + //Show button as pressed + wxClientDC dc( m_colLabelWin ); + int colLeft = GetColLeft( col ); + int colRight = GetColRight( col ) - 1; + dc.SetPen( wxPen( m_colLabelWin->GetBackgroundColour(), 1 ) ); + dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 ); + dc.DrawLine( colLeft, 1, colRight, 1 ); + + ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, m_colLabelWin); + } + else + { + if ( !event.ShiftDown() && !event.CmdDown() ) + ClearSelection(); + if ( m_selection ) { - m_selection->SelectCol( col, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + 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); + ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin); + } } } else @@ -5269,7 +5673,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) } } - // ------------ Left double click // if ( event.LeftDClick() ) @@ -5290,30 +5693,43 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) AutoSizeColLabelSize( col ); ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); - m_dragLastPos = -1; + m_dragLastPos = -1; } } - // ------------ Left button released // else if ( event.LeftUp() ) { - if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + switch ( m_cursorMode ) { - DoEndDragResizeCol(); + case WXGRID_CURSOR_RESIZE_COL: + DoEndDragResizeCol(); - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); + break; + + case WXGRID_CURSOR_MOVE_COL: + DoEndDragMoveCol(); + + SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event ); + break; + + case WXGRID_CURSOR_SELECT_COL: + case WXGRID_CURSOR_SELECT_CELL: + case WXGRID_CURSOR_RESIZE_ROW: + case WXGRID_CURSOR_SELECT_ROW: + // nothing to do (?) + break; } ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); - m_dragLastPos = -1; + m_dragLastPos = -1; } - // ------------ Right button down // else if ( event.RightDown() ) @@ -5326,7 +5742,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) } } - // ------------ Right double click // else if ( event.RightDClick() ) @@ -5339,7 +5754,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) } } - // ------------ No buttons down and mouse moving // else if ( event.Moving() ) @@ -5361,7 +5775,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) } } - void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) { if ( event.LeftDown() ) @@ -5374,12 +5787,10 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) SelectAll(); } } - else if ( event.LeftDClick() ) { SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); } - else if ( event.RightDown() ) { if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) @@ -5387,7 +5798,6 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) // no default action at the moment } } - else if ( event.RightDClick() ) { if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) @@ -5397,6 +5807,21 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) } } +void wxGrid::CancelMouseCapture() +{ + // cancel operation currently in progress, whatever it is + if ( m_winCapture ) + { + m_isDragging = false; + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + m_winCapture->SetCursor( *wxSTANDARD_CURSOR ); + m_winCapture = NULL; + + // remove traces of whatever we drew on screen + Refresh(); + } +} + void wxGrid::ChangeCursorMode(CursorMode mode, wxWindow *win, bool captureMouse) @@ -5408,7 +5833,8 @@ void wxGrid::ChangeCursorMode(CursorMode mode, _T("RESIZE_ROW"), _T("RESIZE_COL"), _T("SELECT_ROW"), - _T("SELECT_COL") + _T("SELECT_COL"), + _T("MOVE_COL"), }; wxLogTrace(_T("grid"), @@ -5417,7 +5843,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode, : win ? _T("rowLabelWin") : _T("gridWin"), cursorModes[m_cursorMode], cursorModes[mode]); -#endif // __WXDEBUG__ +#endif if ( mode == m_cursorMode && win == m_winCapture && @@ -5432,7 +5858,8 @@ void wxGrid::ChangeCursorMode(CursorMode mode, if ( m_winCapture ) { - if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse(); + if (m_winCapture->HasCapture()) + m_winCapture->ReleaseMouse(); m_winCapture = (wxWindow *)NULL; } @@ -5448,8 +5875,13 @@ void wxGrid::ChangeCursorMode(CursorMode mode, win->SetCursor( m_colResizeCursor ); break; + case WXGRID_CURSOR_MOVE_COL: + win->SetCursor( wxCursor(wxCURSOR_HAND) ); + break; + default: win->SetCursor( *wxSTANDARD_CURSOR ); + break; } // we need to capture mouse when resizing @@ -5509,20 +5941,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) SaveEditControlValue(); } - // Have we captured the mouse yet? - if (! m_winCapture) - { - m_winCapture = m_gridWin; - m_winCapture->CaptureMouse(); - } - if ( coords != wxGridNoCellCoords ) { - if ( event.ControlDown() ) + if ( event.CmdDown() ) { if ( m_selectingKeyboard == wxGridNoCellCoords) m_selectingKeyboard = coords; - HighlightBlock ( m_selectingKeyboard, coords ); + HighlightBlock( m_selectingKeyboard, coords ); } else if ( CanDragCell() ) { @@ -5535,6 +5960,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) coords.GetRow(), coords.GetCol(), event ); + return; } } else @@ -5556,6 +5982,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // scrolling is way to fast, at least on MSW - also on GTK. } } + // Have we captured the mouse yet? + if (! m_winCapture) + { + m_winCapture = m_gridWin; + m_winCapture->CaptureMouse(); + } + + } else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { @@ -5588,9 +6022,9 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { - dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch ); } - dc.DrawLine( x, top, x, top+ch ); + dc.DrawLine( x, top, x, top + ch ); m_dragLastPos = x; } @@ -5621,7 +6055,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) coords.GetCol(), event ) ) { - if ( !event.ControlDown() ) + if ( !event.CmdDown() ) ClearSelection(); if ( event.ShiftDown() ) { @@ -5637,13 +6071,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } - else if ( XToEdgeOfCol(x) < 0 && + else if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) { DisableCellEditControl(); MakeCellVisible( coords ); - if ( event.ControlDown() ) + if ( event.CmdDown() ) { if ( m_selection ) { @@ -5675,14 +6109,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) } } - // ------------ Left double click // else if ( event.LeftDClick() && coords != wxGridNoCellCoords ) { DisableCellEditControl(); - if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) + if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) { if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK, coords.GetRow(), @@ -5694,10 +6127,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) m_waitForSlowClick = true; } } - } - // ------------ Left button released // else if ( event.LeftUp() ) @@ -5706,16 +6137,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if (m_winCapture) { - if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse(); + if (m_winCapture->HasCapture()) + m_winCapture->ReleaseMouse(); m_winCapture = NULL; } - if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl()) + if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() ) { ClearSelection(); EnableCellEditControl(); - wxGridCellAttr* attr = GetCellAttr(coords); + wxGridCellAttr *attr = GetCellAttr(coords); wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol()); editor->StartingClick(); editor->DecRef(); @@ -5770,7 +6202,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) m_dragLastPos = -1; } - // ------------ Right button down // else if ( event.RightDown() && coords != wxGridNoCellCoords ) @@ -5785,7 +6216,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) } } - // ------------ Right double click // else if ( event.RightDClick() && coords != wxGridNoCellCoords ) @@ -5817,7 +6247,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // Dragging on the corner of a cell to resize in both // directions is not implemented yet... // - if ( dragRow >= 0 && dragCol >= 0 ) + if ( dragRow >= 0 && dragCol >= 0 ) { ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); return; @@ -5830,40 +6260,29 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { if ( CanDragRowSize() && CanDragGridSize() ) - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW); - } - - if ( dragCol >= 0 ) - { - m_dragRowOrCol = dragCol; + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false); } - - return; } - - if ( dragCol >= 0 ) + else if ( dragCol >= 0 ) { m_dragRowOrCol = dragCol; if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { if ( CanDragColSize() && CanDragGridSize() ) - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL); + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false); } - - return; } - - // Neither on a row or col edge - // - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) + else // Neither on a row or col edge { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + } } } } - void wxGrid::DoEndDragResizeRow() { if ( m_dragLastPos >= 0 ) @@ -5877,7 +6296,7 @@ void wxGrid::DoEndDragResizeRow() wxClientDC dc( m_gridWin ); PrepareDC( dc ); dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); + dc.DrawLine( left, m_dragLastPos, left + cw, m_dragLastPos ); HideCellEditControl(); SaveEditControlValue(); @@ -5895,12 +6314,13 @@ void wxGrid::DoEndDragResizeRow() rect.height = ch - rect.y; m_rowLabelWin->Refresh( true, &rect ); rect.width = cw; + // if there is a multicell block, paint all of it if (m_table) { int i, cell_rows, cell_cols, subtract_rows = 0; int leftCol = XToCol(left); - int rightCol = internalXToCol(left+cw); + int rightCol = internalXToCol(left + cw); if (leftCol >= 0) { for (i=leftCol; iRefresh( true, &rect ); rect.height = ch; + // if there is a multicell block, paint all of it if (m_table) { int i, cell_rows, cell_cols, subtract_cols = 0; int topRow = YToRow(top); - int bottomRow = internalYToRow(top+cw); + int bottomRow = internalYToRow(top + cw); if (topRow >= 0) { for (i=topRow; iRefresh( false, &rect ); } @@ -5980,6 +6403,110 @@ void wxGrid::DoEndDragResizeCol() } } +void wxGrid::DoEndDragMoveCol() +{ + //The user clicked on the column but didn't actually drag + if ( m_dragLastPos < 0 ) + { + m_colLabelWin->Refresh(); //Do this to "unpress" the column + return; + } + + int newPos; + if ( m_moveToCol == -1 ) + newPos = m_numCols - 1; + else + { + newPos = GetColPos( m_moveToCol ); + if ( newPos > GetColPos( m_dragRowOrCol ) ) + newPos--; + } + + SetColPos( m_dragRowOrCol, newPos ); +} + +void wxGrid::SetColPos( int colID, int newPos ) +{ + if ( m_colAt.IsEmpty() ) + { + m_colAt.Alloc( m_numCols ); + + int i; + for ( i = 0; i < m_numCols; i++ ) + { + m_colAt.Add( i ); + } + } + + int oldPos = GetColPos( colID ); + + //Reshuffle the m_colAt array + if ( newPos > oldPos ) + { + int i; + for ( i = oldPos; i < newPos; i++ ) + { + m_colAt[i] = m_colAt[i+1]; + } + } + else + { + int i; + for ( i = oldPos; i > newPos; i-- ) + { + m_colAt[i] = m_colAt[i-1]; + } + } + + m_colAt[newPos] = colID; + + //Recalculate the column rights + if ( !m_colWidths.IsEmpty() ) + { + int colRight = 0; + int colPos; + for ( colPos = 0; colPos < m_numCols; colPos++ ) + { + int colID = GetColAt( colPos ); + + colRight += m_colWidths[colID]; + m_colRights[colID] = colRight; + } + } + + m_colLabelWin->Refresh(); + m_gridWin->Refresh(); +} + + + +void wxGrid::EnableDragColMove( bool enable ) +{ + if ( m_canDragColMove == enable ) + return; + + m_canDragColMove = enable; + + if ( !m_canDragColMove ) + { + m_colAt.Clear(); + + //Recalculate the column rights + if ( !m_colWidths.IsEmpty() ) + { + int colRight = 0; + int colPos; + for ( colPos = 0; colPos < m_numCols; colPos++ ) + { + colRight += m_colWidths[colPos]; + m_colRights[colPos] = colRight; + } + } + + m_colLabelWin->Refresh(); + m_gridWin->Refresh(); + } +} // @@ -6008,10 +6535,8 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) } } - - // The behaviour of this function depends on the grid table class -// Clear() function. For the default wxGridStringTable class the +// Clear() function. For the default wxGridStringTable class the // behavious is to replace all cell contents with wxEmptyString but // not to change the number of rows or cols. // @@ -6023,11 +6548,11 @@ void wxGrid::ClearGrid() DisableCellEditControl(); m_table->Clear(); - if ( !GetBatchCount() ) m_gridWin->Refresh(); + if (!GetBatchCount()) + m_gridWin->Refresh(); } } - bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag @@ -6049,10 +6574,10 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the insert row // operation to this view object as a grid table message } + return false; } - bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag @@ -6067,13 +6592,14 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) { 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; } - bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag @@ -6094,10 +6620,10 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the delete row // operation to this view object as a grid table message } + return false; } - bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag @@ -6118,10 +6644,10 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the insert col // operation to this view object as a grid table message } + return false; } - bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag @@ -6139,10 +6665,10 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the append col // operation to this view object as a grid table message } + return false; } - bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag @@ -6163,11 +6689,10 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the delete col // operation to this view object as a grid table message } + return false; } - - // // ----- event handlers // @@ -6179,8 +6704,7 @@ int wxGrid::SendEvent( const wxEventType type, int row, int col, wxMouseEvent& mouseEv ) { - bool claimed; - bool vetoed; + bool claimed, vetoed; if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { @@ -6217,6 +6741,32 @@ int wxGrid::SendEvent( const wxEventType type, claimed = GetEventHandler()->ProcessEvent(gridEvt); vetoed = !gridEvt.IsAllowed(); } + else if ( type == wxEVT_GRID_LABEL_LEFT_CLICK || + type == wxEVT_GRID_LABEL_LEFT_DCLICK || + type == wxEVT_GRID_LABEL_RIGHT_CLICK || + type == wxEVT_GRID_LABEL_RIGHT_DCLICK ) + { + wxPoint pos = mouseEv.GetPosition(); + + if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() ) + pos.y += GetColLabelSize(); + if ( mouseEv.GetEventObject() == GetGridColLabelWindow() ) + pos.x += GetRowLabelSize(); + + wxGridEvent gridEvt( GetId(), + type, + this, + row, col, + pos.x, + pos.y, + false, + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); + claimed = GetEventHandler()->ProcessEvent(gridEvt); + vetoed = !gridEvt.IsAllowed(); + } else { wxGridEvent gridEvt( GetId(), @@ -6241,34 +6791,26 @@ int wxGrid::SendEvent( const wxEventType type, return claimed ? 1 : 0; } - // Generate a grid event of specified type and return the result // of ProcessEvent(). // int wxGrid::SendEvent( const wxEventType type, int row, int col ) { - bool claimed; - bool vetoed; + bool claimed, vetoed; if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { int rowOrCol = (row == -1 ? col : row); - wxGridSizeEvent gridEvt( GetId(), - type, - this, - rowOrCol ); + wxGridSizeEvent gridEvt( GetId(), type, this, rowOrCol ); claimed = GetEventHandler()->ProcessEvent(gridEvt); vetoed = !gridEvt.IsAllowed(); } else { - wxGridEvent gridEvt( GetId(), - type, - this, - row, col ); + wxGridEvent gridEvt( GetId(), type, this, row, col ); claimed = GetEventHandler()->ProcessEvent(gridEvt); vetoed = !gridEvt.IsAllowed(); @@ -6283,14 +6825,15 @@ int wxGrid::SendEvent( const wxEventType type, void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) { - wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW + // needed to prevent zillions of paint events on MSW + wxPaintDC dc(this); } void wxGrid::Refresh(bool eraseb, const wxRect* rect) { // Don't do anything if between Begin/EndBatch... // EndBatch() will do all this on the last nested one anyway. - if (! GetBatchCount()) + if ( m_created && !GetBatchCount() ) { // Refresh to get correct scrolled position: wxScrolledWindow::Refresh(eraseb, rect); @@ -6301,7 +6844,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) int width_label, width_cell, height_label, height_cell; int x, y; - //Copy rectangle can get scroll offsets.. + // Copy rectangle can get scroll offsets.. rect_x = rect->GetX(); rect_y = rect->GetY(); rectWidth = rect->GetWidth(); @@ -6312,7 +6855,8 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) width_label = rectWidth; height_label = m_colLabelHeight - rect_y; - if (height_label > rectHeight) height_label = rectHeight; + if (height_label > rectHeight) + height_label = rectHeight; if (rect_x > m_rowLabelWidth) { @@ -6374,17 +6918,15 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) } } -void wxGrid::OnSize( wxSizeEvent& event ) +void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event)) { - // position the child windows - CalcWindowSizes(); - - // don't call CalcDimensions() from here, the base class handles the size - // changes itself - event.Skip(); + if (m_targetWindow != this) // check whether initialisation has been done + { + // update our children window positions and scrollbars + CalcDimensions(); + } } - void wxGrid::OnKeyDown( wxKeyEvent& event ) { if ( m_inOnKeyDown ) @@ -6397,60 +6939,49 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) m_inOnKeyDown = true; // propagate the event up and see if it gets processed - // wxWindow *parent = GetParent(); wxKeyEvent keyEvt( event ); keyEvt.SetEventObject( parent ); if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) { + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + if (event.GetKeyCode() == WXK_RIGHT) + event.m_keyCode = WXK_LEFT; + else if (event.GetKeyCode() == WXK_LEFT) + event.m_keyCode = WXK_RIGHT; + } // try local handlers - // switch ( event.GetKeyCode() ) { case WXK_UP: if ( event.ControlDown() ) - { MoveCursorUpBlock( event.ShiftDown() ); - } else - { MoveCursorUp( event.ShiftDown() ); - } break; case WXK_DOWN: if ( event.ControlDown() ) - { MoveCursorDownBlock( event.ShiftDown() ); - } else - { MoveCursorDown( event.ShiftDown() ); - } break; case WXK_LEFT: if ( event.ControlDown() ) - { MoveCursorLeftBlock( event.ShiftDown() ); - } else - { MoveCursorLeft( event.ShiftDown() ); - } break; case WXK_RIGHT: if ( event.ControlDown() ) - { MoveCursorRightBlock( event.ShiftDown() ); - } else - { MoveCursorRight( event.ShiftDown() ); - } break; case WXK_RETURN: @@ -6492,7 +7023,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } else { - if ( GetGridCursorCol() < GetNumberCols()-1 ) + if ( GetGridCursorCol() < GetNumberCols() - 1 ) { MoveCursorRight( false ); } @@ -6519,8 +7050,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) case WXK_END: if ( event.ControlDown() ) { - MakeCellVisible( m_numRows-1, m_numCols-1 ); - SetCurrentCell( m_numRows-1, m_numCols-1 ); + MakeCellVisible( m_numRows - 1, m_numCols - 1 ); + SetCurrentCell( m_numRows - 1, m_numCols - 1 ); } else { @@ -6528,11 +7059,11 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } break; - case WXK_PRIOR: + case WXK_PAGEUP: MovePageUp(); break; - case WXK_NEXT: + case WXK_PAGEDOWN: MovePageDown(); break; @@ -6541,21 +7072,22 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) { if ( m_selection ) { - m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol(), - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + 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 + event.Skip(); + break; default: event.Skip(); @@ -6577,14 +7109,15 @@ void wxGrid::OnKeyUp( wxKeyEvent& event ) { if ( m_selection ) { - m_selection->SelectBlock( m_selectingTopLeft.GetRow(), - m_selectingTopLeft.GetCol(), - m_selectingBottomRight.GetRow(), - m_selectingBottomRight.GetCol(), - event.ControlDown(), - true, - event.AltDown(), - event.MetaDown() ); + m_selection->SelectBlock( + m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + true, + event.AltDown(), + event.MetaDown() ); } } @@ -6602,7 +7135,7 @@ void wxGrid::OnChar( wxKeyEvent& event ) // 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); + wxGridCellAttr *attr = GetCellAttr(row, col); wxGridCellEditor *editor = attr->GetEditor(this, row, col); // is special and will always start editing, for @@ -6635,7 +7168,6 @@ void wxGrid::OnChar( wxKeyEvent& event ) } } - void wxGrid::OnEraseBackground(wxEraseEvent&) { } @@ -6648,8 +7180,10 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) return; } - wxClientDC dc(m_gridWin); - PrepareDC(dc); +#if !defined(__WXMAC__) + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); +#endif if ( m_currentCellCoords != wxGridNoCellCoords ) { @@ -6658,7 +7192,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) if ( IsVisible( m_currentCellCoords, false ) ) { wxRect r; - r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); + r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords ); if ( !m_gridLinesEnabled ) { r.x--; @@ -6672,19 +7206,24 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) // Otherwise refresh redraws the highlight! m_currentCellCoords = coords; - DrawGridCellArea(dc,cells); +#if defined(__WXMAC__) + m_gridWin->Refresh(true /*, & r */); +#else + DrawGridCellArea( dc, cells ); DrawAllGridLines( dc, r ); +#endif } } m_currentCellCoords = coords; - wxGridCellAttr* attr = GetCellAttr(coords); - DrawCellHighlight(dc, attr); + wxGridCellAttr *attr = GetCellAttr( coords ); +#if !defined(__WXMAC__) + DrawCellHighlight( dc, attr ); +#endif attr->DecRef(); } - void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol ) { int temp; @@ -6730,6 +7269,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo wxGridCellCoords ( bottomRow, rightCol ) ); m_gridWin->Refresh( false, &rect ); } + // Now handle changing an existing selection area. else if ( m_selectingTopLeft != updateTopLeft || m_selectingBottomRight != updateBottomRight ) @@ -6746,9 +7286,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo int i; // Store intermediate values - wxCoord oldLeft = m_selectingTopLeft.GetCol(); - wxCoord oldTop = m_selectingTopLeft.GetRow(); - wxCoord oldRight = m_selectingBottomRight.GetCol(); + 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. @@ -6786,21 +7326,19 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo // Refresh the newly selected or deselected // area to the left of the old or new selection. need_refresh[0] = true; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - oldLeft ), - wxGridCellCoords ( oldBottom, - leftCol - 1 ) ); + rect[0] = BlockToDeviceRect( + wxGridCellCoords( oldTop, oldLeft ), + wxGridCellCoords( oldBottom, leftCol - 1 ) ); } - if ( oldTop < topRow ) + if ( oldTop < topRow ) { // Refresh the newly selected or deselected // area above the old or new selection. need_refresh[1] = true; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - leftCol ), - wxGridCellCoords ( topRow - 1, - rightCol ) ); + rect[1] = BlockToDeviceRect( + wxGridCellCoords( oldTop, leftCol ), + wxGridCellCoords( topRow - 1, rightCol ) ); } if ( oldRight > rightCol ) @@ -6808,10 +7346,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo // Refresh the newly selected or deselected // area to the right of the old or new selection. need_refresh[2] = true; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - rightCol + 1 ), - wxGridCellCoords ( oldBottom, - oldRight ) ); + rect[2] = BlockToDeviceRect( + wxGridCellCoords( oldTop, rightCol + 1 ), + wxGridCellCoords( oldBottom, oldRight ) ); } if ( oldBottom > bottomRow ) @@ -6819,10 +7356,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo // Refresh the newly selected or deselected // area below the old or new selection. need_refresh[3] = true; - rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, - leftCol ), - wxGridCellCoords ( oldBottom, - rightCol ) ); + rect[3] = BlockToDeviceRect( + wxGridCellCoords( bottomRow + 1, leftCol ), + wxGridCellCoords( oldBottom, rightCol ) ); } // various Refresh() calls @@ -6830,7 +7366,8 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) m_gridWin->Refresh( false, &(rect[i]) ); } - // Change Selection + + // change selection m_selectingTopLeft = updateTopLeft; m_selectingBottomRight = updateBottomRight; } @@ -6855,7 +7392,6 @@ bool wxGrid::GetModelValues() return false; } - bool wxGrid::SetModelValues() { int row, col; @@ -6867,9 +7403,9 @@ bool wxGrid::SetModelValues() if ( m_table ) { - for ( row = 0; row < m_numRows; row++ ) + for ( row = 0; row < m_numRows; row++ ) { - for ( col = 0; col < m_numCols; col++ ) + for ( col = 0; col < m_numCols; col++ ) { m_table->SetValue( row, col, GetCellValue(row, col) ); } @@ -6881,8 +7417,6 @@ bool wxGrid::SetModelValues() return false; } - - // Note - this function only draws cells that are in the list of // exposed cells (usually set from the update region by // CalcExposedCells) @@ -6896,7 +7430,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) int row, col, cell_rows, cell_cols; wxGridCellCoordsArray redrawCells; - for ( i = numCells-1; i >= 0; i-- ) + for ( i = numCells - 1; i >= 0; i-- ) { row = cells[i].GetRow(); col = cells[i].GetCol(); @@ -6905,9 +7439,9 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) // If this cell is part of a multicell block, find owner for repaint if ( cell_rows <= 0 || cell_cols <= 0 ) { - wxGridCellCoords cell(row+cell_rows, col+cell_cols); + wxGridCellCoords cell( row + cell_rows, col + cell_cols ); bool marked = false; - for ( int j = 0; j < numCells; j++ ) + for ( int j = 0; j < numCells; j++ ) { if ( cell == cells[j] ) { @@ -6915,6 +7449,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) break; } } + if (!marked) { int count = redrawCells.GetCount(); @@ -6926,10 +7461,13 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) break; } } + if (!marked) redrawCells.Add( cell ); } - continue; // don't bother drawing this cell + + // don't bother drawing this cell + continue; } // If this cell is empty, find cell to left that might want to overflow @@ -6937,23 +7475,25 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { for ( int l = 0; l < cell_rows; l++ ) { - // find a cell in this row to left alreay marked for repaint + // find a cell in this row to leave already 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--) + for (int j = col - 1; j >= left; j--) { - if (!m_table->IsEmptyCell(row+l, j)) + if (!m_table->IsEmptyCell(row + l, j)) { - if (GetCellOverflow(row+l, j)) + if (GetCellOverflow(row + l, j)) { - wxGridCellCoords cell(row+l, j); + wxGridCellCoords cell(row + l, j); bool marked = false; for (int k = 0; k < numCells; k++) @@ -6991,13 +7531,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) numCells = redrawCells.GetCount(); - for ( i = numCells - 1; i >= 0; i-- ) + for ( i = numCells - 1; i >= 0; i-- ) { DrawCell( dc, redrawCells[i] ); } } - void wxGrid::DrawGridSpace( wxDC& dc ) { int cw, ch; @@ -7006,30 +7545,29 @@ void wxGrid::DrawGridSpace( wxDC& dc ) int right, bottom; CalcUnscrolledPosition( cw, ch, &right, &bottom ); - int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0; - int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ; + int rightCol = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) : 0; + int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0; if ( right > rightCol || bottom > bottomRow ) { int left, top; CalcUnscrolledPosition( 0, 0, &left, &top ); - dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) ); + dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxBRUSHSTYLE_SOLID) ); dc.SetPen( *wxTRANSPARENT_PEN ); if ( right > rightCol ) { - dc.DrawRectangle( rightCol, top, right - rightCol, ch); + dc.DrawRectangle( rightCol, top, right - rightCol, ch ); } if ( bottom > bottomRow ) { - dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow); + dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow ); } } } - void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) { int row = coords.GetRow(); @@ -7054,11 +7592,11 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) // Note: However, only if it is really _shown_, i.e. not hidden! if ( isCurrent && IsCellEditControlShown() ) { - // OSAF NB: this "#if..." is temporary and fixes a problem where the + // NB: this "#if..." is temporary and fixes a problem where the // edit control is erased by this code after being rendered. // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered // implicitly, causing this out-of order render. -#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS +#if !defined(__WXMAC__) wxGridCellEditor *editor = attr->GetEditor(this, row, col); editor->PaintBackground(rect, attr); editor->DecRef(); @@ -7066,8 +7604,7 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) } else { - // but all the rest is drawn by the cell renderer and hence may be - // customized + // but all the rest is drawn by the cell renderer and hence may be customized wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col); renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); renderer->DecRef(); @@ -7078,6 +7615,10 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) { + // don't show highlight when the grid doesn't have focus + if ( !HasFocus() ) + return; + int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); @@ -7094,27 +7635,26 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) if (penWidth > 0) { - // The center of th drawn line is where the position/width/height of - // the rectangle is actually at, (on wxMSW atr least,) so we will - // reduce the size of the rectangle to compensate for the thickness of - // the line. If this is too strange on non wxMSW platforms then + // The center of the drawn line is where the position/width/height of + // the rectangle is actually at (on wxMSW at least), so the + // size of the rectangle is reduced to compensate for the thickness of + // the line. If this is too strange on non-wxMSW platforms then // please #ifdef this appropriately. rect.x += penWidth / 2; rect.y += penWidth / 2; rect.width -= penWidth - 1; rect.height -= penWidth - 1; - // Now draw the rectangle // 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.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxPENSTYLE_SOLID)); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRectangle(rect); } #if 0 - // VZ: my experiments with 3d borders... + // VZ: my experiments with 3D borders... // how to properly set colours for arbitrary bg? wxCoord x1 = rect.x, @@ -7127,14 +7667,28 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) dc.DrawLine(x1, y1, x1, y2); dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1); - dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 ); + dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2); + + dc.SetPen(*wxBLACK_PEN); + dc.DrawLine(x1, y2, x2, y2); + dc.DrawLine(x2, y1, x2, y2 + 1); +#endif +} + +wxPen wxGrid::GetDefaultGridLinePen() +{ + return wxPen(GetGridLineColour(), 1, wxPENSTYLE_SOLID); +} - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine(x1, y2, x2, y2); - dc.DrawLine(x2, y1, x2, y2+1); -#endif // 0 +wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row)) +{ + return GetDefaultGridLinePen(); } +wxPen wxGrid::GetColGridLinePen(int WXUNUSED(col)) +{ + return GetDefaultGridLinePen(); +} void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { @@ -7143,27 +7697,26 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; - dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); wxRect rect = CellToRect( row, col ); // right hand border - // + dc.SetPen( GetColGridLinePen(col) ); dc.DrawLine( rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height + 1 ); // bottom border - // - dc.DrawLine( rect.x, rect.y + rect.height, + dc.SetPen( GetRowGridLinePen(row) ); + dc.DrawLine( rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height); } -void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells) +void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells) { // This if block was previously in wxGrid::OnPaint but that doesn't // seem to get called under wxGTK - MB // - if ( m_currentCellCoords == wxGridNoCellCoords && + if ( m_currentCellCoords == wxGridNoCellCoords && m_numRows && m_numCols ) { m_currentCellCoords.Set(0, 0); @@ -7201,9 +7754,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) return; #endif - if ( !m_gridLinesEnabled || - !m_numRows || - !m_numCols ) + if ( !m_gridLinesEnabled || !m_numRows || !m_numCols ) return; int top, bottom, left, right; @@ -7235,26 +7786,27 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) // avoid drawing grid lines past the last row and col // - right = wxMin( right, GetColRight(m_numCols - 1) ); + right = wxMin( right, GetColRight(GetColAt( m_numCols - 1 )) ); bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) ); // no gridlines inside multicells, clip them out - int leftCol = internalXToCol(left); - int topRow = internalYToRow(top); - int rightCol = internalXToCol(right); + int leftCol = GetColPos( internalXToCol(left) ); + int topRow = internalYToRow(top); + int rightCol = GetColPos( internalXToCol(right) ); int bottomRow = internalYToRow(bottom); -#ifndef __WXMAC__ - // CS: I don't know why suddenly unscrolled coordinates are used for clipping wxRegion clippedcells(0, 0, cw, ch); int i, j, cell_rows, cell_cols; wxRect rect; - for (j=topRow; j 1) || (cell_cols > 1)) { @@ -7264,39 +7816,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) } else if ((cell_rows < 0) || (cell_cols < 0)) { - rect = CellToRect(j+cell_rows, i+cell_cols); + rect = CellToRect(j + cell_rows, i + cell_cols); CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); clippedcells.Subtract(rect); } } } -#else - wxRegion clippedcells( left , top, right - left, bottom - top); - - int i, j, cell_rows, cell_cols; - wxRect rect; - for (j=topRow; j 1) || (cell_cols > 1)) - { - rect = CellToRect(j,i); - clippedcells.Subtract(rect); - } - else if ((cell_rows < 0) || (cell_cols < 0)) - { - rect = CellToRect(j+cell_rows, i+cell_cols); - clippedcells.Subtract(rect); - } - } - } -#endif - dc.SetClippingRegion( clippedcells ); + dc.SetDeviceClippingRegion( clippedcells ); - dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); // horizontal grid lines // @@ -7312,15 +7840,24 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) if ( bot >= top ) { + dc.SetPen( GetRowGridLinePen(i) ); dc.DrawLine( left, bot, right, bot ); } } // vertical grid lines // - for ( i = internalXToCol(left); i < m_numCols; i++ ) + int colPos; + for ( colPos = leftCol; colPos < m_numCols; colPos++ ) { - int colRight = GetColRight(i) - 1; + i = GetColAt( colPos ); + + int colRight = GetColRight(i); +#ifdef __WXGTK__ + if (GetLayoutDirection() != wxLayout_RightToLeft) +#endif + colRight--; + if ( colRight > right ) { break; @@ -7328,13 +7865,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) if ( colRight >= left ) { + dc.SetPen( GetColGridLinePen(i) ); dc.DrawLine( colRight, top, colRight, bottom ); } } + dc.DestroyClippingRegion(); } -void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) +void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows) { if ( !m_numRows ) return; @@ -7342,7 +7881,7 @@ void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) size_t i; size_t numLabels = rows.GetCount(); - for ( i = 0; i < numLabels; i++ ) + for ( i = 0; i < numLabels; i++ ) { DrawRowLabel( dc, rows[i] ); } @@ -7354,34 +7893,20 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) return; wxRect rect; -#ifdef __WXGTK20__ - rect.SetX( 1 ); - rect.SetY( GetRowTop(row) + 1 ); - rect.SetWidth( m_rowLabelWidth - 2 ); - rect.SetHeight( GetRowHeight(row) - 2 ); - CalcScrolledPosition( 0, rect.y, NULL, &rect.y ); - - wxWindowDC *win_dc = (wxWindowDC*) &dc; - - wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 ); -#else int rowTop = GetRowTop(row), rowBottom = GetRowBottom(row) - 1; - dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) ); - dc.DrawLine( m_rowLabelWidth-1, rowTop, - m_rowLabelWidth-1, rowBottom ); - + dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxPENSTYLE_SOLID) ); + dc.DrawLine( m_rowLabelWidth - 1, rowTop, m_rowLabelWidth - 1, rowBottom ); dc.DrawLine( 0, rowTop, 0, rowBottom ); - dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom ); dc.SetPen( *wxWHITE_PEN ); dc.DrawLine( 1, rowTop, 1, rowBottom ); - dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop ); -#endif - dc.SetBackgroundMode( wxTRANSPARENT ); + dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop ); + + dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); dc.SetFont( GetLabelFont() ); @@ -7395,6 +7920,18 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign ); } +void wxGrid::SetUseNativeColLabels( bool native ) +{ + m_nativeColumnLabels = native; + if (native) + { + int height = wxRendererNative::Get().GetHeaderButtonHeight( this ); + SetColLabelSize( height ); + } + + m_colLabelWin->Refresh(); +} + void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) { if ( !m_numCols ) @@ -7403,7 +7940,7 @@ void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) size_t i; size_t numLabels = cols.GetCount(); - for ( i = 0; i < numLabels; i++ ) + for ( i = 0; i < numLabels; i++ ) { DrawColLabel( dc, cols[i] ); } @@ -7417,32 +7954,33 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) int colLeft = GetColLeft(col); wxRect rect; -#ifdef __WXGTK20__ - rect.SetX( colLeft + 1 ); - rect.SetY( 1 ); - rect.SetWidth( GetColWidth(col) - 2 ); - rect.SetHeight( m_colLabelHeight - 2 ); - - wxWindowDC *win_dc = (wxWindowDC*) &dc; - wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 ); -#else - int colRight = GetColRight(col) - 1; + if (m_nativeColumnLabels) + { + rect.SetX( colLeft); + rect.SetY( 0 ); + rect.SetWidth( GetColWidth(col)); + rect.SetHeight( m_colLabelHeight ); - dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) ); - dc.DrawLine( colRight, 0, - colRight, m_colLabelHeight-1 ); + wxWindowDC *win_dc = (wxWindowDC*) &dc; + wxRendererNative::Get().DrawHeaderButton( win_dc->GetWindow(), dc, rect, 0 ); + } + else + { + int colRight = GetColRight(col) - 1; - dc.DrawLine( colLeft, 0, colRight, 0 ); + dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxPENSTYLE_SOLID) ); + dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 ); + dc.DrawLine( colLeft, 0, colRight, 0 ); + dc.DrawLine( colLeft, m_colLabelHeight - 1, + colRight + 1, m_colLabelHeight - 1 ); - dc.DrawLine( colLeft, m_colLabelHeight-1, - colRight+1, m_colLabelHeight-1 ); + dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 ); + dc.DrawLine( colLeft, 1, colRight, 1 ); + } - dc.SetPen( *wxWHITE_PEN ); - dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 ); - dc.DrawLine( colLeft, 1, colRight, 1 ); -#endif - dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); dc.SetFont( GetLabelFont() ); @@ -7468,42 +8006,41 @@ void wxGrid::DrawTextRectangle( wxDC& dc, StringToLines( value, lines ); - //Forward to new API. - DrawTextRectangle( dc, + // Forward to new API. + DrawTextRectangle( dc, lines, rect, horizAlign, vertAlign, textOrientation ); - } -void wxGrid::DrawTextRectangle( wxDC& dc, +// VZ: this should be replaced with wxDC::DrawLabel() to which we just have to +// add textOrientation support +void wxGrid::DrawTextRectangle(wxDC& dc, const wxArrayString& lines, const wxRect& rect, int horizAlign, int vertAlign, - int textOrientation ) + int textOrientation) { - long textWidth, textHeight; - long lineWidth, lineHeight; - int nLines; + if ( lines.empty() ) + return; - dc.SetClippingRegion( rect ); + wxDCClipper clip(dc, rect); - nLines = lines.GetCount(); - if ( nLines > 0 ) - { - int l; - float x = 0.0, y = 0.0; + long textWidth, + textHeight; - if ( textOrientation == wxHORIZONTAL ) - GetTextBoxSize(dc, lines, &textWidth, &textHeight); - else - GetTextBoxSize( dc, lines, &textHeight, &textWidth ); + if ( textOrientation == wxHORIZONTAL ) + GetTextBoxSize( dc, lines, &textWidth, &textHeight ); + else + GetTextBoxSize( dc, lines, &textHeight, &textWidth ); - switch ( vertAlign ) - { + int x = 0, + y = 0; + switch ( vertAlign ) + { case wxALIGN_BOTTOM: if ( textOrientation == wxHORIZONTAL ) y = rect.y + (rect.height - textHeight - 1); @@ -7513,9 +8050,9 @@ void wxGrid::DrawTextRectangle( wxDC& dc, case wxALIGN_CENTRE: if ( textOrientation == wxHORIZONTAL ) - y = rect.y + ((rect.height - textHeight)/2); + y = rect.y + ((rect.height - textHeight) / 2); else - x = rect.x + ((rect.width - textWidth)/2); + x = rect.x + ((rect.width - textWidth) / 2); break; case wxALIGN_TOP: @@ -7525,15 +8062,26 @@ void wxGrid::DrawTextRectangle( wxDC& dc, else x = rect.x + 1; break; - } + } + + // Align each line of a multi-line label + size_t nLines = lines.GetCount(); + for ( size_t l = 0; l < nLines; l++ ) + { + const wxString& line = lines[l]; - // Align each line of a multi-line label - for ( l = 0; l < nLines; l++ ) + if ( line.empty() ) { - dc.GetTextExtent(lines[l], &lineWidth, &lineHeight); + *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight(); + continue; + } - switch ( horizAlign ) - { + wxCoord lineWidth = 0, + lineHeight = 0; + dc.GetTextExtent(line, &lineWidth, &lineHeight); + + switch ( horizAlign ) + { case wxALIGN_RIGHT: if ( textOrientation == wxHORIZONTAL ) x = rect.x + (rect.width - lineWidth - 1); @@ -7543,9 +8091,9 @@ void wxGrid::DrawTextRectangle( wxDC& dc, case wxALIGN_CENTRE: if ( textOrientation == wxHORIZONTAL ) - x = rect.x + ((rect.width - lineWidth)/2); + x = rect.x + ((rect.width - lineWidth) / 2); else - y = rect.y + rect.height - ((rect.height - lineWidth)/2); + y = rect.y + rect.height - ((rect.height - lineWidth) / 2); break; case wxALIGN_LEFT: @@ -7555,36 +8103,33 @@ void wxGrid::DrawTextRectangle( wxDC& dc, else y = rect.y + rect.height - 1; break; - } + } - 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; - } + if ( textOrientation == wxHORIZONTAL ) + { + dc.DrawText( line, x, y ); + y += lineHeight; + } + else + { + dc.DrawRotatedText( line, x, y, 90.0 ); + x += lineHeight; } } - - dc.DestroyClippingRegion(); } - -// Split multi line text up into an array of strings. Any existing -// contents of the string array are preserved. +// Split multi-line text up into an array of strings. +// Any existing contents of the string array are preserved. // -void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) +// TODO: refactor wxTextFile::Read() and reuse the same code from here +void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const { int startPos = 0; int pos; wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix ); wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix ); - while ( startPos < (int)tVal.Length() ) + while ( startPos < (int)tVal.length() ) { pos = tVal.Mid(startPos).Find( eol ); if ( pos < 0 ) @@ -7597,28 +8142,28 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) } else { - lines.Add( value.Mid(startPos, pos) ); + lines.Add( tVal.Mid(startPos, pos) ); } + startPos += pos + 1; } - if ( startPos < (int)value.Length() ) + if ( startPos < (int)tVal.length() ) { - lines.Add( value.Mid( startPos ) ); + lines.Add( tVal.Mid( startPos ) ); } } - void wxGrid::GetTextBoxSize( const wxDC& dc, const wxArrayString& lines, - long *width, long *height ) + long *width, long *height ) const { - long w = 0; - long h = 0; - long lineW, lineH; + wxCoord w = 0; + wxCoord h = 0; + wxCoord lineW = 0, lineH = 0; size_t i; - for ( i = 0; i < lines.GetCount(); i++ ) + for ( i = 0; i < lines.GetCount(); i++ ) { dc.GetTextExtent( lines[i], &lineW, &lineH ); w = wxMax( w, lineW ); @@ -7669,7 +8214,6 @@ bool wxGrid::Enable(bool enable) return true; } - // // ------ Edit control functions // @@ -7691,9 +8235,6 @@ void wxGrid::EnableCellEditControl( bool enable ) if (! m_editable) return; - if ( m_currentCellCoords == wxGridNoCellCoords ) - SetCurrentCell( 0, 0 ); - if ( enable != m_cellEditCtrlEnabled ) { if ( enable ) @@ -7702,8 +8243,7 @@ void wxGrid::EnableCellEditControl( bool enable ) return; // this should be checked by the caller! - wxASSERT_MSG( CanEnableCellControl(), - _T("can't enable editing for this cell!") ); + wxASSERT_MSG( CanEnableCellControl(), _T("can't enable editing for this cell!") ); // do it before ShowCellEditControl() m_cellEditCtrlEnabled = enable; @@ -7713,7 +8253,7 @@ void wxGrid::EnableCellEditControl( bool enable ) else { //FIXME:add veto support - SendEvent( wxEVT_GRID_EDITOR_HIDDEN); + SendEvent( wxEVT_GRID_EDITOR_HIDDEN ); HideCellEditControl(); SaveEditControlValue(); @@ -7738,7 +8278,6 @@ bool wxGrid::CanEnableCellControl() const { return m_editable && (m_currentCellCoords != wxGridNoCellCoords) && !IsCurrentCellReadOnly(); - } bool wxGrid::IsCellEditControlEnabled() const @@ -7778,7 +8317,7 @@ void wxGrid::ShowCellEditControl() { if ( IsCellEditControlEnabled() ) { - if ( !IsVisible( m_currentCellCoords ) ) + if ( !IsVisible( m_currentCellCoords, false ) ) { m_cellEditCtrlEnabled = false; return; @@ -7800,20 +8339,21 @@ void wxGrid::ShowCellEditControl() m_currentCellCoords.SetCol( col ); } - // convert to scrolled coords - // - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - - // done in PaintBackground() -#if 0 // erase the highlight and the cell contents because the editor // might not cover the entire cell wxClientDC dc( m_gridWin ); PrepareDC( dc ); - dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID)); + wxGridCellAttr* attr = GetCellAttr(row, col); + dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID)); dc.SetPen(*wxTRANSPARENT_PEN); dc.DrawRectangle(rect); -#endif // 0 + + // convert to scrolled coords + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + + int nXMove = 0; + if (rect.x < 0) + nXMove = rect.x; // cell is shifted by one pixel // However, don't allow x or y to become negative @@ -7824,7 +8364,6 @@ void wxGrid::ShowCellEditControl() if (rect.y > 0) rect.y--; - wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); if ( !editor->IsCreated() ) { @@ -7840,44 +8379,50 @@ void wxGrid::ShowCellEditControl() GetEventHandler()->ProcessEvent(evt); } - // resize editor to overflow into righthand cells if allowed int maxWidth = rect.width; wxString value = GetCellValue(row, col); if ( (value != wxEmptyString) && (attr->GetOverflow()) ) { int y; - GetTextExtent(value, &maxWidth, &y, - NULL, NULL, &attr->GetFont()); - if (maxWidth < rect.width) maxWidth = rect.width; + 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) + if (rect.x + maxWidth > client_right) maxWidth = client_right - rect.x; 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++) + for (int i = col + cell_cols; i < m_numCols; i++) { int c_rows, c_cols; GetCellSize( row, i, &c_rows, &c_cols ); + // looks weird going over a multicell - if (m_table->IsEmptyCell(row,i) && + if (m_table->IsEmptyCell( row, i ) && (rect.width < maxWidth) && (c_rows == 1)) - rect.width += GetColWidth(i); + { + rect.width += GetColWidth( i ); + } else break; } if (rect.GetRight() > client_right) - rect.SetRight(client_right - 1); + rect.SetRight( client_right - 1 ); } - editor->SetCellAttr(attr); + editor->SetCellAttr( attr ); editor->SetSize( rect ); + if (nXMove != 0) + editor->GetControl()->Move( + editor->GetControl()->GetPosition().x + nXMove, + editor->GetControl()->GetPosition().y ); editor->Show( true, attr ); // recalc dimensions in case we need to @@ -7900,7 +8445,7 @@ void wxGrid::HideCellEditControl() int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellAttr *attr = GetCellAttr(row, col); wxGridCellEditor *editor = attr->GetEditor(this, row, col); editor->Show( false ); editor->DecRef(); @@ -7912,10 +8457,12 @@ void wxGrid::HideCellEditControl() wxRect rect( CellToRect(row, col) ); CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y ); rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x; + #ifdef __WXMAC__ // ensure that the pixels under the focus ring get refreshed as well rect.Inflate(10, 10); #endif + m_gridWin->Refresh( false, &rect ); } } @@ -7949,7 +8496,6 @@ void wxGrid::SaveEditControlValue() } } - // // ------ Grid location functions // Note that all of these functions work with the logical coordinates of @@ -7957,12 +8503,12 @@ void wxGrid::SaveEditControlValue() // coordinates for mouse events etc. // -void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) +void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) const { int row = YToRow(y); int col = XToCol(x); - if ( row == -1 || col == -1 ) + if ( row == -1 || col == -1 ) { coords = wxGridNoCellCoords; } @@ -7972,7 +8518,6 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) } } - // Internal Helper function for computing row or column from some // (unscrolled) coordinate value, using either // m_defaultRowHeight/m_defaultColWidth or binary search on array @@ -7999,7 +8544,9 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, } if ( i_max >= BorderArray.GetCount()) + { i_max = BorderArray.GetCount() - 1; + } else { if ( coord >= BorderArray[i_max]) @@ -8038,27 +8585,89 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, return i_max; } -int wxGrid::YToRow( int y ) +int wxGrid::YToRow( int y ) const { return CoordToRowOrCol(y, m_defaultRowHeight, m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false); } -int wxGrid::XToCol( int x ) +int wxGrid::XToCol( int x, bool clipToMinMax ) const { - return CoordToRowOrCol(x, m_defaultColWidth, - m_minAcceptableColWidth, m_colRights, m_numCols, false); + if (x < 0) + return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1; + + wxASSERT_MSG(m_defaultColWidth > 0, wxT("Default column width can not be zero")); + + int maxPos = x / m_defaultColWidth; + int minPos = 0; + + if (m_colRights.IsEmpty()) + { + if(maxPos < m_numCols) + return GetColAt( maxPos ); + return clipToMinMax ? GetColAt( m_numCols - 1 ) : -1; + } + + if ( maxPos >= m_numCols) + maxPos = m_numCols - 1; + else + { + if ( x >= m_colRights[GetColAt( maxPos )]) + { + minPos = maxPos; + if (m_minAcceptableColWidth) + maxPos = x / m_minAcceptableColWidth; + else + maxPos = m_numCols - 1; + } + if ( maxPos >= m_numCols) + maxPos = m_numCols - 1; + } + + //X is beyond the last column + if ( x >= m_colRights[GetColAt( maxPos )]) + return clipToMinMax ? GetColAt( maxPos ) : -1; + + //X is before the first column + if ( x < m_colRights[GetColAt( 0 )] ) + return GetColAt( 0 ); + + //Perform a binary search + while ( maxPos - minPos > 0 ) + { + wxCHECK_MSG(m_colRights[GetColAt( minPos )] <= x && x < m_colRights[GetColAt( maxPos )], + 0, _T("wxGrid: internal error in XToCol")); + + if (x >= m_colRights[GetColAt( maxPos - 1 )]) + return GetColAt( maxPos ); + else + maxPos--; + int median = minPos + (maxPos - minPos + 1) / 2; + if (x < m_colRights[GetColAt( median )]) + maxPos = median; + else + minPos = median; + } + return GetColAt( maxPos ); } -// return the row number that that the y coord is near the edge of, or -// -1 if not near an edge +// return the row number that that the y coord is near +// the edge of, or -1 if not near an edge. +// coords can only possibly be near an edge if +// (a) the row/column is large enough to still allow for an "inner" area +// that is _not_ nead the edge (i.e., if the height/width is smaller +// than WXGRID_LABEL_EDGE_ZONE, coords are _never_ considered to be +// near the edge). +// and +// (b) resizing rows/columns (the thing for which edge detection is +// relevant at all) is enabled. // -int wxGrid::YToEdgeOfRow( int y ) +int wxGrid::YToEdgeOfRow( int y ) const { int i; i = internalYToRow(y); - if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE ) + if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE && CanDragRowSize() ) { // We know that we are in row i, test whether we are // close enough to lower or upper border, respectively. @@ -8073,15 +8682,16 @@ int wxGrid::YToEdgeOfRow( int y ) // return the col number that that the x coord is near the edge of, or // -1 if not near an edge +// See comment at YToEdgeOfRow for conditions on edge detection. // -int wxGrid::XToEdgeOfCol( int x ) +int wxGrid::XToEdgeOfCol( int x ) const { int i; i = internalXToCol(x); - if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE ) + if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE && CanDragColSize() ) { - // We know that we are in column i, test whether we are + // We know that we are in column i; test whether we are // close enough to right or left border, respectively. if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE ) return i; @@ -8092,26 +8702,28 @@ int wxGrid::XToEdgeOfCol( int x ) return -1; } -wxRect wxGrid::CellToRect( int row, int col ) +wxRect wxGrid::CellToRect( int row, int col ) const { wxRect rect( -1, -1, -1, -1 ); - if ( row >= 0 && row < m_numRows && - col >= 0 && col < m_numCols ) + if ( row >= 0 && row < m_numRows && + col >= 0 && col < m_numCols ) { int i, cell_rows, cell_cols; rect.width = rect.height = 0; GetCellSize( row, col, &cell_rows, &cell_cols ); // if negative then find multicell owner - if (cell_rows < 0) row += cell_rows; - if (cell_cols < 0) col += cell_cols; + if (cell_rows < 0) + row += cell_rows; + if (cell_cols < 0) + col += cell_cols; GetCellSize( row, col, &cell_rows, &cell_cols ); rect.x = GetColLeft(col); rect.y = GetRowTop(row); - for (i=col; iGetClientSize( &cw, &ch ); if ( wholeCellVisible ) { // is the cell wholly visible ? - // - return ( left >= 0 && right <= cw && - top >= 0 && bottom <= ch ); + return ( left >= 0 && right <= cw && + top >= 0 && bottom <= ch ); } else { // is the cell partly visible ? // - return ( ((left >=0 && left < cw) || (right > 0 && right <= cw)) && - ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) ); + return ( ((left >= 0 && left < cw) || (right > 0 && right <= cw)) && + ((top >= 0 && top < ch) || (bottom > 0 && bottom <= ch)) ); } } @@ -8166,15 +8776,13 @@ void wxGrid::MakeCellVisible( int row, int col ) int i; int xpos = -1, ypos = -1; - if ( row >= 0 && row < m_numRows && - col >= 0 && col < m_numCols ) + if ( row >= 0 && row < m_numRows && + col >= 0 && col < m_numCols ) { // get the cell rectangle in logical coords - // wxRect r( CellToRect( row, col ) ); // convert to device coords - // int left, top, right, bottom; CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); @@ -8190,7 +8798,7 @@ void wxGrid::MakeCellVisible( int row, int col ) { int h = r.GetHeight(); ypos = r.GetTop(); - for ( i = row-1; i >= 0; i-- ) + for ( i = row - 1; i >= 0; i-- ) { int rowHeight = GetRowHeight(i); if ( h + rowHeight > ch ) @@ -8201,15 +8809,19 @@ void wxGrid::MakeCellVisible( int row, int col ) } // we divide it later by GRID_SCROLL_LINE, make sure that we don't - // have rounding errors (this is important, because if we do, we - // might not scroll at all and some cells won't be redrawn) + // have rounding errors (this is important, because if we do, + // we might not scroll at all and some cells won't be redrawn) // - // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full - // scroll unit... + // Sometimes GRID_SCROLL_LINE / 2 is not enough, + // so just add a full scroll unit... ypos += m_scrollLineY; } - if ( left < 0 ) + // special handling for wide cells - show always left part of the cell! + // Otherwise, e.g. when stepping from row to row, it would jump between + // left and right part of the cell on every step! +// if ( left < 0 ) + if ( left < 0 || (right - left) >= cw ) { xpos = r.GetLeft(); } @@ -8224,7 +8836,7 @@ void wxGrid::MakeCellVisible( int row, int col ) xpos += m_scrollLineX; } - if ( xpos != -1 || ypos != -1 ) + if ( xpos != -1 || ypos != -1 ) { if ( xpos != -1 ) xpos /= m_scrollLineX; @@ -8236,17 +8848,16 @@ void wxGrid::MakeCellVisible( int row, int col ) } } - // // ------ Grid cursor movement functions // bool wxGrid::MoveCursorUp( bool expandSelection ) { - if ( m_currentCellCoords != wxGridNoCellCoords && + if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetRow() >= 0 ) { - if ( expandSelection) + if ( expandSelection ) { if ( m_selectingKeyboard == wxGridNoCellCoords ) m_selectingKeyboard = m_currentCellCoords; @@ -8275,17 +8886,16 @@ bool wxGrid::MoveCursorUp( bool expandSelection ) return false; } - bool wxGrid::MoveCursorDown( bool expandSelection ) { - if ( m_currentCellCoords != wxGridNoCellCoords && + if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetRow() < m_numRows ) { if ( expandSelection ) { if ( m_selectingKeyboard == wxGridNoCellCoords ) m_selectingKeyboard = m_currentCellCoords; - if ( m_selectingKeyboard.GetRow() < m_numRows-1 ) + if ( m_selectingKeyboard.GetRow() < m_numRows - 1 ) { m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 ); MakeCellVisible( m_selectingKeyboard.GetRow(), @@ -8312,7 +8922,7 @@ bool wxGrid::MoveCursorDown( bool expandSelection ) bool wxGrid::MoveCursorLeft( bool expandSelection ) { - if ( m_currentCellCoords != wxGridNoCellCoords && + if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetCol() >= 0 ) { if ( expandSelection ) @@ -8327,11 +8937,12 @@ bool wxGrid::MoveCursorLeft( bool expandSelection ) HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } } - else if ( m_currentCellCoords.GetCol() > 0 ) + else if ( GetColPos( m_currentCellCoords.GetCol() ) > 0 ) { int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol() - 1; + int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) - 1 ); ClearSelection(); + MakeCellVisible( row, col ); SetCurrentCell( row, col ); } @@ -8346,7 +8957,7 @@ bool wxGrid::MoveCursorLeft( bool expandSelection ) bool wxGrid::MoveCursorRight( bool expandSelection ) { - if ( m_currentCellCoords != wxGridNoCellCoords && + if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetCol() < m_numCols ) { if ( expandSelection ) @@ -8361,11 +8972,12 @@ bool wxGrid::MoveCursorRight( bool expandSelection ) HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } } - else if ( m_currentCellCoords.GetCol() < m_numCols - 1 ) + else if ( GetColPos( m_currentCellCoords.GetCol() ) < m_numCols - 1 ) { int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol() + 1; + int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) + 1 ); ClearSelection(); + MakeCellVisible( row, col ); SetCurrentCell( row, col ); } @@ -8394,7 +9006,7 @@ bool wxGrid::MovePageUp() if ( newRow == row ) { - //row > 0 , so newrow can never be less than 0 here. + // row > 0, so newRow can never be less than 0 here. newRow = row - 1; } @@ -8413,7 +9025,7 @@ bool wxGrid::MovePageDown() return false; int row = m_currentCellCoords.GetRow(); - if ( (row+1) < m_numRows ) + if ( (row + 1) < m_numRows ) { int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); @@ -8422,7 +9034,7 @@ bool wxGrid::MovePageDown() int newRow = internalYToRow( y + ch ); if ( newRow == row ) { - // row < m_numRows , so newrow can't overflow here. + // row < m_numRows, so newRow can't overflow here. newRow = row + 1; } @@ -8438,7 +9050,7 @@ bool wxGrid::MovePageDown() bool wxGrid::MoveCursorUpBlock( bool expandSelection ) { if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetRow() > 0 ) { int row = m_currentCellCoords.GetRow(); @@ -8451,19 +9063,19 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) // while ( row > 0 ) { - row-- ; + row--; if ( !(m_table->IsEmptyCell(row, col)) ) break; } } - else if ( m_table->IsEmptyCell(row-1, col) ) + else if ( m_table->IsEmptyCell(row - 1, col) ) { // starting at the top of a block: find the next block // row--; while ( row > 0 ) { - row-- ; + row--; if ( !(m_table->IsEmptyCell(row, col)) ) break; } @@ -8474,10 +9086,10 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) // while ( row > 0 ) { - row-- ; + row--; if ( m_table->IsEmptyCell(row, col) ) { - row++ ; + row++; break; } } @@ -8504,8 +9116,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) bool wxGrid::MoveCursorDownBlock( bool expandSelection ) { if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetRow() < m_numRows-1 ) + m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetRow() < m_numRows - 1 ) { int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); @@ -8515,21 +9127,21 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) // starting in an empty cell: find the next block of // non-empty cells // - while ( row < m_numRows-1 ) + while ( row < m_numRows - 1 ) { - row++ ; + row++; if ( !(m_table->IsEmptyCell(row, col)) ) break; } } - else if ( m_table->IsEmptyCell(row+1, col) ) + else if ( m_table->IsEmptyCell(row + 1, col) ) { // starting at the bottom of a block: find the next block // row++; - while ( row < m_numRows-1 ) + while ( row < m_numRows - 1 ) { - row++ ; + row++; if ( !(m_table->IsEmptyCell(row, col)) ) break; } @@ -8538,12 +9150,12 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) { // starting within a block: find the bottom of the block // - while ( row < m_numRows-1 ) + while ( row < m_numRows - 1 ) { - row++ ; + row++; if ( m_table->IsEmptyCell(row, col) ) { - row-- ; + row--; break; } } @@ -8570,7 +9182,7 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) { if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetCol() > 0 ) { int row = m_currentCellCoords.GetRow(); @@ -8583,19 +9195,19 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) // while ( col > 0 ) { - col-- ; + col--; if ( !(m_table->IsEmptyCell(row, col)) ) break; } } - else if ( m_table->IsEmptyCell(row, col-1) ) + else if ( m_table->IsEmptyCell(row, col - 1) ) { // starting at the left of a block: find the next block // col--; while ( col > 0 ) { - col-- ; + col--; if ( !(m_table->IsEmptyCell(row, col)) ) break; } @@ -8606,10 +9218,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) // while ( col > 0 ) { - col-- ; + col--; if ( m_table->IsEmptyCell(row, col) ) { - col++ ; + col++; break; } } @@ -8636,8 +9248,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) bool wxGrid::MoveCursorRightBlock( bool expandSelection ) { if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() < m_numCols-1 ) + m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetCol() < m_numCols - 1 ) { int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); @@ -8647,21 +9259,21 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) // starting in an empty cell: find the next block of // non-empty cells // - while ( col < m_numCols-1 ) + while ( col < m_numCols - 1 ) { - col++ ; + col++; if ( !(m_table->IsEmptyCell(row, col)) ) break; } } - else if ( m_table->IsEmptyCell(row, col+1) ) + else if ( m_table->IsEmptyCell(row, col + 1) ) { // starting at the right of a block: find the next block // col++; - while ( col < m_numCols-1 ) + while ( col < m_numCols - 1 ) { - col++ ; + col++; if ( !(m_table->IsEmptyCell(row, col)) ) break; } @@ -8670,12 +9282,12 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) { // starting within a block: find the right of the block // - while ( col < m_numCols-1 ) + while ( col < m_numCols - 1 ) { - col++ ; + col++; if ( m_table->IsEmptyCell(row, col) ) { - col-- ; + col--; break; } } @@ -8699,30 +9311,32 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) return false; } - - // // ------ Label values and formatting // -void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) +void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const { - *horiz = m_rowLabelHorizAlign; - *vert = m_rowLabelVertAlign; + if ( horiz ) + *horiz = m_rowLabelHorizAlign; + if ( vert ) + *vert = m_rowLabelVertAlign; } -void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) +void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) const { - *horiz = m_colLabelHorizAlign; - *vert = m_colLabelVertAlign; + if ( horiz ) + *horiz = m_colLabelHorizAlign; + if ( vert ) + *vert = m_colLabelVertAlign; } -int wxGrid::GetColLabelTextOrientation() +int wxGrid::GetColLabelTextOrientation() const { return m_colLabelTextOrientation; } -wxString wxGrid::GetRowLabelValue( int row ) +wxString wxGrid::GetRowLabelValue( int row ) const { if ( m_table ) { @@ -8736,7 +9350,7 @@ wxString wxGrid::GetRowLabelValue( int row ) } } -wxString wxGrid::GetColLabelValue( int col ) +wxString wxGrid::GetColLabelValue( int col ) const { if ( m_table ) { @@ -8750,10 +9364,15 @@ wxString wxGrid::GetColLabelValue( int col ) } } - void wxGrid::SetRowLabelSize( int width ) { - width = wxMax( width, 0 ); + wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE ); + + if ( width == wxGRID_AUTOSIZE ) + { + width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW); + } + if ( width != m_rowLabelWidth ) { if ( width == 0 ) @@ -8764,7 +9383,8 @@ void wxGrid::SetRowLabelSize( int width ) else if ( m_rowLabelWidth == 0 ) { m_rowLabelWin->Show( true ); - if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true ); + if ( m_colLabelHeight > 0 ) + m_cornerLabelWin->Show( true ); } m_rowLabelWidth = width; @@ -8773,10 +9393,15 @@ void wxGrid::SetRowLabelSize( int width ) } } - void wxGrid::SetColLabelSize( int height ) { - height = wxMax( height, 0 ); + wxASSERT( height >=0 || height == wxGRID_AUTOSIZE ); + + if ( height == wxGRID_AUTOSIZE ) + { + height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN); + } + if ( height != m_colLabelHeight ) { if ( height == 0 ) @@ -8787,7 +9412,8 @@ void wxGrid::SetColLabelSize( int height ) else if ( m_colLabelHeight == 0 ) { m_colLabelWin->Show( true ); - if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true ); + if ( m_rowLabelWidth > 0 ) + m_cornerLabelWin->Show( true ); } m_colLabelHeight = height; @@ -8796,7 +9422,6 @@ void wxGrid::SetColLabelSize( int height ) } } - void wxGrid::SetLabelBackgroundColour( const wxColour& colour ) { if ( m_labelBackgroundColour != colour ) @@ -8914,14 +9539,10 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert ) 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 ) @@ -8931,7 +9552,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s ) m_table->SetRowLabelValue( row, s ); if ( !GetBatchCount() ) { - wxRect rect = CellToRect( row, 0); + wxRect rect = CellToRect( row, 0 ); if ( rect.height > 0 ) { CalcScrolledPosition(0, rect.y, &rect.x, &rect.y); @@ -8974,7 +9595,6 @@ void wxGrid::SetGridLineColour( const wxColour& colour ) } } - void wxGrid::SetCellHighlightColour( const wxColour& colour ) { if ( m_cellHighlightColour != colour ) @@ -8999,8 +9619,9 @@ void wxGrid::SetCellHighlightPenWidth(int width) // make any visible change if the the thickness is getting smaller. int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; + wxRect rect = CellToRect(row, col); m_gridWin->Refresh(true, &rect); } @@ -9016,8 +9637,10 @@ void wxGrid::SetCellHighlightROPenWidth(int width) // make any visible change if the the thickness is getting smaller. int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + if ( row == -1 || col == -1 || + GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; + wxRect rect = CellToRect(row, col); m_gridWin->Refresh(true, &rect); } @@ -9045,25 +9668,24 @@ void wxGrid::EnableGridLines( bool enable ) } } - -int wxGrid::GetDefaultRowSize() +int wxGrid::GetDefaultRowSize() const { return m_defaultRowHeight; } -int wxGrid::GetRowSize( int row ) +int wxGrid::GetRowSize( int row ) const { wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") ); return GetRowHeight(row); } -int wxGrid::GetDefaultColSize() +int wxGrid::GetDefaultColSize() const { return m_defaultColWidth; } -int wxGrid::GetColSize( int col ) +int wxGrid::GetColSize( int col ) const { wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") ); @@ -9107,7 +9729,6 @@ void wxGrid::SetDefaultCellFont( const wxFont& font ) m_defaultCellAttr->SetFont(font); } - // For editors and renderers the type registry takes precedence over the // default attr, so we need to register the new editor/renderer for the string // data type in order to make setting a default editor/renderer appear to @@ -9128,30 +9749,30 @@ void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) } // ---------------------------------------------------------------------------- -// access to the default attrbiutes +// access to the default attributes // ---------------------------------------------------------------------------- -wxColour wxGrid::GetDefaultCellBackgroundColour() +wxColour wxGrid::GetDefaultCellBackgroundColour() const { return m_defaultCellAttr->GetBackgroundColour(); } -wxColour wxGrid::GetDefaultCellTextColour() +wxColour wxGrid::GetDefaultCellTextColour() const { return m_defaultCellAttr->GetTextColour(); } -wxFont wxGrid::GetDefaultCellFont() +wxFont wxGrid::GetDefaultCellFont() const { return m_defaultCellAttr->GetFont(); } -void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) +void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const { m_defaultCellAttr->GetAlignment(horiz, vert); } -bool wxGrid::GetDefaultCellOverflow() +bool wxGrid::GetDefaultCellOverflow() const { return m_defaultCellAttr->GetOverflow(); } @@ -9170,38 +9791,41 @@ wxGridCellEditor *wxGrid::GetDefaultEditor() const // access to cell attributes // ---------------------------------------------------------------------------- -wxColour wxGrid::GetCellBackgroundColour(int row, int col) +wxColour wxGrid::GetCellBackgroundColour(int row, int col) const { wxGridCellAttr *attr = GetCellAttr(row, col); wxColour colour = attr->GetBackgroundColour(); attr->DecRef(); + return colour; } -wxColour wxGrid::GetCellTextColour( int row, int col ) +wxColour wxGrid::GetCellTextColour( int row, int col ) const { wxGridCellAttr *attr = GetCellAttr(row, col); wxColour colour = attr->GetTextColour(); attr->DecRef(); + return colour; } -wxFont wxGrid::GetCellFont( int row, int col ) +wxFont wxGrid::GetCellFont( int row, int col ) const { wxGridCellAttr *attr = GetCellAttr(row, col); wxFont font = attr->GetFont(); attr->DecRef(); + return font; } -void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) +void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const { wxGridCellAttr *attr = GetCellAttr(row, col); attr->GetAlignment(horiz, vert); attr->DecRef(); } -bool wxGrid::GetCellOverflow( int row, int col ) +bool wxGrid::GetCellOverflow( int row, int col ) const { wxGridCellAttr *attr = GetCellAttr(row, col); bool allow = attr->GetOverflow(); @@ -9210,14 +9834,14 @@ bool wxGrid::GetCellOverflow( int row, int col ) return allow; } -void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) +void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) const { wxGridCellAttr *attr = GetCellAttr(row, col); attr->GetSize( num_rows, num_cols ); attr->DecRef(); } -wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) +wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) const { wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); @@ -9226,7 +9850,7 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) return renderer; } -wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) +wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const { wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); @@ -9248,7 +9872,7 @@ bool wxGrid::IsReadOnly(int row, int col) const // attribute support: cache, automatic provider creation, ... // ---------------------------------------------------------------------------- -bool wxGrid::CanHaveAttributes() +bool wxGrid::CanHaveAttributes() const { if ( !m_table ) { @@ -9314,7 +9938,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const { if ( !LookupAttr(row, col, &attr) ) { - attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) + attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any) : (wxGridCellAttr *)NULL; CacheAttr(row, col, attr); } @@ -9508,9 +10132,9 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols ) if ((cell_rows > 1) || (cell_rows > 1)) { int i, j; - for (j=row; j 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1)) { int i, j; - for (j=row; jSetSize( row-j, col-i ); + attr_stub->SetSize( row - j, col - i ); attr_stub->DecRef(); } } @@ -9585,28 +10209,24 @@ void wxGrid::RegisterDataType(const wxString& typeName, } -wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const +wxGridCellEditor * wxGrid::GetDefaultEditorForCell(int row, int col) const { wxString typeName = m_table->GetTypeName(row, col); return GetDefaultEditorForType(typeName); } -wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const +wxGridCellRenderer * wxGrid::GetDefaultRendererForCell(int row, int col) const { wxString typeName = m_table->GetTypeName(row, col); return GetDefaultRendererForType(typeName); } -wxGridCellEditor* -wxGrid::GetDefaultEditorForType(const wxString& typeName) const +wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) const { int index = m_typeRegistry->FindOrCloneDataType(typeName); if ( index == wxNOT_FOUND ) { - wxString errStr; - - errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str()); - wxFAIL_MSG(errStr.c_str()); + wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str())); return NULL; } @@ -9614,16 +10234,12 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const return m_typeRegistry->GetEditor(index); } -wxGridCellRenderer* -wxGrid::GetDefaultRendererForType(const wxString& typeName) const +wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName) const { int index = m_typeRegistry->FindOrCloneDataType(typeName); if ( index == wxNOT_FOUND ) { - wxString errStr; - - errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str()); - wxFAIL_MSG(errStr.c_str()); + wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str())); return NULL; } @@ -9690,18 +10306,19 @@ void wxGrid::SetRowSize( int row, int height ) int diff = h - m_rowHeights[row]; m_rowHeights[row] = h; - int i; - for ( i = row; i < m_numRows; i++ ) + for ( int i = row; i < m_numRows; i++ ) { m_rowBottoms[i] += diff; } + if ( !GetBatchCount() ) CalcDimensions(); } void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) { - m_defaultColWidth = wxMax( width, m_minAcceptableColWidth ); + // we dont allow zero default column width + m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 ); if ( resizeExistingCols ) { @@ -9723,8 +10340,8 @@ void wxGrid::SetColSize( int col, int width ) // 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 + // what he is doing. However we should test against the weaker + // constraint of minimalAcceptableWidth, as this breaks rendering // // This test then fixes sf.net bug #645734 @@ -9737,26 +10354,25 @@ void wxGrid::SetColSize( int col, int width ) InitColWidths(); } - // if < 0 calc new width from label + // if < 0 then calculate 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; + 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; - int i; - for ( i = col; i < m_numCols; i++ ) + for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ ) { - m_colRights[i] += diff; + m_colRights[GetColAt(colPos)] += diff; } if ( !GetBatchCount() ) @@ -9827,8 +10443,11 @@ int wxGrid::GetRowMinimalAcceptableHeight() const // auto sizing // ---------------------------------------------------------------------------- -void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) +void +wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction) { + const bool column = direction == wxGRID_COLUMN; + wxClientDC dc(m_gridWin); // cancel editing of cell @@ -9852,16 +10471,14 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) else col = rowOrCol; - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); + wxGridCellAttr *attr = GetCellAttr(row, col); + wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col); if ( renderer ) { wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col); extent = column ? size.x : size.y; if ( extent > extentMax ) - { extentMax = extent; - } renderer->DecRef(); } @@ -9875,23 +10492,21 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) if ( column ) { - dc.GetTextExtent( GetColLabelValue(col), &w, &h ); + dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h ); if ( GetColLabelTextOrientation() == wxVERTICAL ) w = h; } else - dc.GetTextExtent( GetRowLabelValue(row), &w, &h ); + dc.GetMultiLineTextExtent( GetRowLabelValue(row), &w, &h ); extent = column ? w : h; if ( extent > extentMax ) - { extentMax = extent; - } if ( !extentMax ) { // empty column - give default extent (notice that if extentMax is less - // than default extent but != 0, it's ok) + // than default extent but != 0, it's OK) extentMax = column ? m_defaultColWidth : m_defaultRowHeight; } else @@ -9905,6 +10520,12 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) if ( column ) { + // Ensure automatic width is not less than minimal width. See the + // comment in SetColSize() for explanation of why this isn't done + // in SetColSize(). + if ( !setAsMin ) + extentMax = wxMax(extentMax, GetColMinimalWidth(col)); + SetColSize( col, extentMax ); if ( !GetBatchCount() ) { @@ -9920,12 +10541,18 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) } else { + // Ensure automatic width is not less than minimal height. See the + // comment in SetColSize() for explanation of why this isn't done + // in SetRowSize(). + if ( !setAsMin ) + extentMax = wxMax(extentMax, GetRowMinimalHeight(row)); + SetRowSize(row, extentMax); if ( !GetBatchCount() ) { int cw, ch, dummy; m_gridWin->GetClientSize( &cw, &ch ); - wxRect rect ( CellToRect( row, 0 ) ); + wxRect rect( CellToRect( row, 0 ) ); rect.x = 0; CalcScrolledPosition(0, rect.y, &dummy, &rect.y); rect.width = m_rowLabelWidth; @@ -9933,6 +10560,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) m_rowLabelWin->Refresh( true, &rect ); } } + if ( setAsMin ) { if ( column ) @@ -9942,26 +10570,75 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) } } +wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(wxGridDirection direction) +{ + // calculate size for the rows or columns? + const bool calcRows = direction == wxGRID_ROW; + + wxClientDC dc(calcRows ? GetGridRowLabelWindow() + : GetGridColLabelWindow()); + dc.SetFont(GetLabelFont()); + + // which dimension should we take into account for calculations? + // + // for columns, the text can be only horizontal so it's easy but for rows + // we also have to take into account the text orientation + const bool + useWidth = calcRows || (GetColLabelTextOrientation() == wxVERTICAL); + + wxArrayString lines; + wxCoord extentMax = 0; + + const int numRowsOrCols = calcRows ? m_numRows : m_numCols; + for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ ) + { + lines.Clear(); + + wxString label = calcRows ? GetRowLabelValue(rowOrCol) + : GetColLabelValue(rowOrCol); + StringToLines(label, lines); + + long w, h; + GetTextBoxSize(dc, lines, &w, &h); + + const wxCoord extent = useWidth ? w : h; + if ( extent > extentMax ) + extentMax = extent; + } + + if ( !extentMax ) + { + // empty column - give default extent (notice that if extentMax is less + // than default extent but != 0, it's OK) + extentMax = calcRows ? GetDefaultRowLabelSize() + : GetDefaultColLabelSize(); + } + + // leave some space around text (taken from AutoSizeColOrRow) + if ( calcRows ) + extentMax += 10; + else + extentMax += 6; + + return extentMax; +} + int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) { int width = m_rowLabelWidth; - if ( !calcOnly ) - BeginBatch(); + wxGridUpdateLocker locker; + if(!calcOnly) + locker.Create(this); for ( int col = 0; col < m_numCols; col++ ) { if ( !calcOnly ) - { AutoSizeColumn(col, setAsMin); - } width += GetColWidth(col); } - if ( !calcOnly ) - EndBatch(); - return width; } @@ -9969,8 +10646,9 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) { int height = m_colLabelHeight; - if ( !calcOnly ) - BeginBatch(); + wxGridUpdateLocker locker; + if(!calcOnly) + locker.Create(this); for ( int row = 0; row < m_numRows; row++ ) { @@ -9980,30 +10658,24 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) height += GetRowHeight(row); } - if ( !calcOnly ) - EndBatch(); - return height; } void wxGrid::AutoSize() { - BeginBatch(); - - wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false)); + wxGridUpdateLocker locker(this); - // 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 - // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary - // scrollbar steps - wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * m_scrollLineX, - GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY); + // we need to round up the size of the scrollable area to a multiple of + // scroll step to ensure that we don't get the scrollbars when we're sized + // exactly to fit our contents + wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth, + SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight); + wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(), + GetScrollY(size.y) * GetScrollLineY()); // distribute the extra space between the columns/rows to avoid having // extra white space - - // Remove the extra m_extraWidth + 1 added above - wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1); + wxCoord diff = sizeFit.x - size.x; if ( diff && m_numCols ) { // try to resize the columns uniformly @@ -10028,7 +10700,7 @@ void wxGrid::AutoSize() } // same for rows - diff = sizeFit.y - size.y - (m_extraHeight + 1); + diff = sizeFit.y - size.y; if ( diff && m_numRows ) { // try to resize the columns uniformly @@ -10052,9 +10724,11 @@ void wxGrid::AutoSize() } } - EndBatch(); - - SetClientSize(sizeFit); + // we know that we're not going to have scrollbars so disable them now to + // avoid trouble in SetClientSize() which can otherwise set the correct + // client size but also leave space for (not needed any more) scrollbars + SetScrollbars(0, 0, 0, 0, 0, 0, true); + SetClientSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight); } void wxGrid::AutoSizeRowLabelSize( int row ) @@ -10073,7 +10747,7 @@ void wxGrid::AutoSizeRowLabelSize( int row ) // autosize row height depending on label text StringToLines( GetRowLabelValue( row ), lines ); wxClientDC dc( m_rowLabelWin ); - GetTextBoxSize( dc, lines, &w, &h); + GetTextBoxSize( dc, lines, &w, &h ); if ( h < m_defaultRowHeight ) h = m_defaultRowHeight; SetRowSize(row, h); @@ -10086,7 +10760,7 @@ void wxGrid::AutoSizeColLabelSize( int col ) long w, h; // Hide the edit control, so it - // won't interfer with drag-shrinking. + // won't interfere with drag-shrinking. if ( IsCellEditControlShown() ) { HideCellEditControl(); @@ -10097,9 +10771,9 @@ void wxGrid::AutoSizeColLabelSize( int col ) StringToLines( GetColLabelValue( col ), lines ); wxClientDC dc( m_colLabelWin ); if ( GetColLabelTextOrientation() == wxHORIZONTAL ) - GetTextBoxSize( dc, lines, &w, &h); + GetTextBoxSize( dc, lines, &w, &h ); else - GetTextBoxSize( dc, lines, &h, &w); + GetTextBoxSize( dc, lines, &h, &w ); if ( w < m_defaultColWidth ) w = m_defaultColWidth; SetColSize(col, w); @@ -10108,46 +10782,22 @@ void wxGrid::AutoSizeColLabelSize( int col ) wxSize wxGrid::DoGetBestSize() const { - // don't set sizes, only calculate them wxGrid *self = (wxGrid *)this; // const_cast - int width, height; - width = self->SetOrCalcColumnSizes(true); - height = self->SetOrCalcRowSizes(true); - - if (!width) - width = 100; - if (!height) - height = 80; - - // Round up to a multiple the scroll rate - // NOTE: this still doesn't get rid of the scrollbars; - // is there any magic incantation for that? - int xpu, ypu; - GetScrollPixelsPerUnit(&xpu, &ypu); - if (xpu) - width += 1 + xpu - (width % xpu); - if (ypu) - height += 1 + ypu - (height % ypu); - - // limit to 1/4 of the screen size - int maxwidth, maxheight; - wxDisplaySize( &maxwidth, &maxheight ); - maxwidth /= 2; - maxheight /= 2; - if ( width > maxwidth ) - width = maxwidth; - if ( height > maxheight ) - height = maxheight; - - wxSize best(width, height); + // we do the same as in AutoSize() here with the exception that we don't + // change the column/row sizes, only calculate them + wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth, + self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight); + wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(), + GetScrollY(size.y) * GetScrollLineY()); // NOTE: This size should be cached, but first we need to add calls to // InvalidateBestSize everywhere that could change the results of this // calculation. // CacheBestSize(size); - return best; + return wxSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight) + + GetWindowBorderSize(); } void wxGrid::Fit() @@ -10192,9 +10842,8 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) } } - // ---------------------------------------------------------------------------- -// block, row and col selection +// block, row and column selection // ---------------------------------------------------------------------------- void wxGrid::SelectRow( int row, bool addToSelected ) @@ -10231,7 +10880,7 @@ void wxGrid::SelectAll() if ( m_numRows > 0 && m_numCols > 0 ) { if ( m_selection ) - m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); + m_selection->SelectBlock( 0, 0, m_numRows - 1, m_numCols - 1 ); } } @@ -10247,15 +10896,15 @@ void wxGrid::DeselectRow( int row ) if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) { if ( m_selection->IsInSelection(row, 0 ) ) - m_selection->ToggleCellSelection( row, 0); + m_selection->ToggleCellSelection(row, 0); } else { int nCols = GetNumberCols(); - for ( int i = 0; i < nCols ; i++ ) + for ( int i = 0; i < nCols; i++ ) { if ( m_selection->IsInSelection(row, i ) ) - m_selection->ToggleCellSelection( row, i); + m_selection->ToggleCellSelection(row, i); } } } @@ -10268,12 +10917,12 @@ void wxGrid::DeselectCol( int col ) if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) { if ( m_selection->IsInSelection(0, col ) ) - m_selection->ToggleCellSelection( 0, col); + m_selection->ToggleCellSelection(0, col); } else { int nRows = GetNumberRows(); - for ( int i = 0; i < nRows ; i++ ) + for ( int i = 0; i < nRows; i++ ) { if ( m_selection->IsInSelection(i, col ) ) m_selection->ToggleCellSelection(i, col); @@ -10287,7 +10936,7 @@ void wxGrid::DeselectCell( int row, int col ) m_selection->ToggleCellSelection(row, col); } -bool wxGrid::IsSelection() +bool wxGrid::IsSelection() const { return ( m_selection && (m_selection->IsSelection() || ( m_selectingTopLeft != wxGridNoCellCoords && @@ -10360,47 +11009,46 @@ wxArrayInt wxGrid::GetSelectedCols() const void wxGrid::ClearSelection() { - m_selectingTopLeft = wxGridNoCellCoords; - m_selectingBottomRight = wxGridNoCellCoords; + m_selectingTopLeft = + m_selectingBottomRight = + m_selectingKeyboard = wxGridNoCellCoords; if ( m_selection ) m_selection->ClearSelection(); } - // This function returns the rectangle that encloses the given block // in device coords clipped to the client size of the grid window. // -wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, - const wxGridCellCoords &bottomRight ) +wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords& topLeft, + const wxGridCellCoords& bottomRight ) const { - wxRect rect( wxGridNoCellRect ); - wxRect cellRect; - - cellRect = CellToRect( topLeft ); - if ( cellRect != wxGridNoCellRect ) + wxRect resultRect; + wxRect tempCellRect = CellToRect(topLeft); + if ( tempCellRect != wxGridNoCellRect ) { - rect = cellRect; + resultRect = tempCellRect; } else { - rect = wxRect(0, 0, 0, 0); + resultRect = wxRect(0, 0, 0, 0); } - cellRect = CellToRect( bottomRight ); - if ( cellRect != wxGridNoCellRect ) + tempCellRect = CellToRect(bottomRight); + if ( tempCellRect != wxGridNoCellRect ) { - rect += cellRect; + resultRect += tempCellRect; } else { + // If both inputs were "wxGridNoCellRect," then there's nothing to do. return wxGridNoCellRect; } - int i, j; - int left = rect.GetLeft(); - int top = rect.GetTop(); - int right = rect.GetRight(); - int bottom = rect.GetBottom(); + // Ensure that left/right and top/bottom pairs are in order. + int left = resultRect.GetLeft(); + int top = resultRect.GetTop(); + int right = resultRect.GetRight(); + int bottom = resultRect.GetBottom(); int leftCol = topLeft.GetCol(); int topRow = topLeft.GetRow(); @@ -10409,67 +11057,105 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, if (left > right) { - i = left; + int tmp = left; left = right; - right = i; - i = leftCol; + right = tmp; + + tmp = leftCol; leftCol = rightCol; - rightCol = i; + rightCol = tmp; } if (top > bottom) { - i = top; + int tmp = top; top = bottom; - bottom = i; - i = topRow; + bottom = tmp; + + tmp = topRow; topRow = bottomRow; - bottomRow = i; + bottomRow = tmp; } - for ( j = topRow; j <= bottomRow; j++ ) + // The following loop is ONLY necessary to detect and handle merged cells. + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); + + // Get the origin coordinates: notice that they will be negative if the + // grid is scrolled downwards/to the right. + int gridOriginX = 0; + int gridOriginY = 0; + CalcScrolledPosition(gridOriginX, gridOriginY, &gridOriginX, &gridOriginY); + + int onScreenLeftmostCol = internalXToCol(-gridOriginX); + int onScreenUppermostRow = internalYToRow(-gridOriginY); + + int onScreenRightmostCol = internalXToCol(-gridOriginX + cw); + int onScreenBottommostRow = internalYToRow(-gridOriginY + ch); + + // Bound our loop so that we only examine the portion of the selected block + // that is shown on screen. Therefore, we compare the Top-Left block values + // to the Top-Left screen values, and the Bottom-Right block values to the + // Bottom-Right screen values, choosing appropriately. + const int visibleTopRow = wxMax(topRow, onScreenUppermostRow); + const int visibleBottomRow = wxMin(bottomRow, onScreenBottommostRow); + const int visibleLeftCol = wxMax(leftCol, onScreenLeftmostCol); + const int visibleRightCol = wxMin(rightCol, onScreenRightmostCol); + + for ( int j = visibleTopRow; j <= visibleBottomRow; j++ ) { - for ( i = leftCol; i <= rightCol; i++ ) + for ( int i = visibleLeftCol; i <= visibleRightCol; i++ ) { - if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol)) + if ( (j == visibleTopRow) || (j == visibleBottomRow) || + (i == visibleLeftCol) || (i == visibleRightCol) ) { - cellRect = CellToRect( j, i ); - - if (cellRect.x < left) - left = cellRect.x; - if (cellRect.y < top) - top = cellRect.y; - if (cellRect.x + cellRect.width > right) - right = cellRect.x + cellRect.width; - if (cellRect.y + cellRect.height > bottom) - bottom = cellRect.y + cellRect.height; + tempCellRect = CellToRect( j, i ); + + if (tempCellRect.x < left) + left = tempCellRect.x; + if (tempCellRect.y < top) + top = tempCellRect.y; + if (tempCellRect.x + tempCellRect.width > right) + right = tempCellRect.x + tempCellRect.width; + if (tempCellRect.y + tempCellRect.height > bottom) + bottom = tempCellRect.y + tempCellRect.height; } else { - i = rightCol; // jump over inner cells. + i = visibleRightCol; // jump over inner cells. } } } - // convert to scrolled coords - // + // Convert to scrolled coords CalcScrolledPosition( left, top, &left, &top ); CalcScrolledPosition( right, bottom, &right, &bottom ); - 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) ); - rect.SetBottom( wxMin(ch, bottom) ); + resultRect.SetLeft( wxMax(0, left) ); + resultRect.SetTop( wxMax(0, top) ); + resultRect.SetRight( wxMin(cw, right) ); + resultRect.SetBottom( wxMin(ch, bottom) ); - return rect; + return resultRect; +} + +// ---------------------------------------------------------------------------- +// drop target +// ---------------------------------------------------------------------------- + +#if wxUSE_DRAG_AND_DROP + +// this allow setting drop target directly on wxGrid +void wxGrid::SetDropTarget(wxDropTarget *dropTarget) +{ + GetGridWindow()->SetDropTarget(dropTarget); } +#endif // wxUSE_DRAG_AND_DROP + // ---------------------------------------------------------------------------- // grid event classes // ---------------------------------------------------------------------------- @@ -10523,13 +11209,13 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec bool shift, bool alt, bool meta ) : wxNotifyEvent( type, id ) { - m_topLeft = topLeft; + m_topLeft = topLeft; m_bottomRight = bottomRight; - m_selecting = sel; - m_control = control; - m_shift = shift; - m_alt = alt; - m_meta = meta; + m_selecting = sel; + m_control = control; + m_shift = shift; + m_alt = alt; + m_meta = meta; SetEventObject(obj); } @@ -10549,4 +11235,3 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type, } #endif // wxUSE_GRID -