X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..5429cf245532d124c1309ea956a2845eed195485:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index f689374935..3a3ba4e0ba 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "grid.h" -#endif - // For compilers that support precompilatixon, includes "wx/wx.h". #include "wx/wxprec.h" @@ -41,11 +37,14 @@ #include "wx/checkbox.h" #include "wx/combobox.h" #include "wx/valtext.h" + #include "wx/intl.h" + #include "wx/math.h" #endif #include "wx/textfile.h" #include "wx/spinctrl.h" #include "wx/tokenzr.h" +#include "wx/renderer.h" #include "wx/grid.h" #include "wx/generic/gridsel.h" @@ -69,7 +68,8 @@ // array classes // ---------------------------------------------------------------------------- -WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs); +WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridCellAttr *, wxArrayAttrs, + class WXDLLIMPEXP_ADV); struct wxGridCellWithAttr { @@ -91,7 +91,8 @@ struct wxGridCellWithAttr // without rewriting the macros, which require a public copy constructor. }; -WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); +WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray, + class WXDLLIMPEXP_ADV); #include "wx/arrimpl.cpp" @@ -106,6 +107,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_BEGIN_DRAG) DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK) DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK) @@ -123,7 +125,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED) // private classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow { public: wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -138,6 +140,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) DECLARE_EVENT_TABLE() @@ -145,7 +148,7 @@ private: }; -class WXDLLEXPORT wxGridColLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow { public: wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -160,6 +163,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) DECLARE_EVENT_TABLE() @@ -167,7 +171,7 @@ private: }; -class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow { public: wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -181,6 +185,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) @@ -188,7 +193,7 @@ private: DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow) }; -class WXDLLEXPORT wxGridWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow { public: wxGridWindow() @@ -202,7 +207,7 @@ public: wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ); - ~wxGridWindow(); + ~wxGridWindow() {} void ScrollWindow( int dx, int dy, const wxRect *rect ); @@ -218,8 +223,9 @@ private: void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); void OnEraseBackground( wxEraseEvent& ); - + void OnFocus( wxFocusEvent& ); DECLARE_DYNAMIC_CLASS(wxGridWindow) DECLARE_EVENT_TABLE() @@ -227,31 +233,40 @@ private: }; - class wxGridCellEditorEvtHandler : public wxEvtHandler { public: - wxGridCellEditorEvtHandler() - : m_grid(0), m_editor(0) - { } wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor) - : m_grid(grid), m_editor(editor) - { } + : m_grid(grid), + m_editor(editor), + m_inSetFocus(false) + { + } + void OnKillFocus(wxFocusEvent& event); void OnKeyDown(wxKeyEvent& event); void OnChar(wxKeyEvent& event); + void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; } + private: wxGrid* m_grid; wxGridCellEditor* m_editor; - DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler) + + // Work around the fact that a focus kill event can be sent to + // a combobox within a set focus event. + bool m_inSetFocus; + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler) DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler) }; -IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler ) +IMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler) + BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) + EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus ) EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown ) EVT_CHAR( wxGridCellEditorEvtHandler::OnChar ) END_EVENT_TABLE() @@ -263,7 +278,7 @@ END_EVENT_TABLE() // ---------------------------------------------------------------------------- // this class stores attributes set for cells -class WXDLLEXPORT wxGridCellAttrData +class WXDLLIMPEXP_ADV wxGridCellAttrData { public: void SetAttr(wxGridCellAttr *attr, int row, int col); @@ -279,7 +294,7 @@ private: }; // this class stores attributes set for rows or columns -class WXDLLEXPORT wxGridRowOrColAttrData +class WXDLLIMPEXP_ADV wxGridRowOrColAttrData { public: // empty ctor to suppress warnings @@ -297,7 +312,7 @@ private: // NB: this is just a wrapper around 3 objects: one which stores cell // attributes, and 2 others for row/col ones -class WXDLLEXPORT wxGridCellAttrProviderData +class WXDLLIMPEXP_ADV wxGridCellAttrProviderData { public: wxGridCellAttrData m_cellAttrs; @@ -332,10 +347,11 @@ struct wxGridDataTypeInfo }; -WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray); +WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray, + class WXDLLIMPEXP_ADV); -class WXDLLEXPORT wxGridTypeRegistry +class WXDLLIMPEXP_ADV wxGridTypeRegistry { public: wxGridTypeRegistry() {} @@ -408,6 +424,7 @@ static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X; // in these hash tables is the number of rows/columns) static const int GRID_HASH_SIZE = 100; +#if 0 // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -421,6 +438,7 @@ static inline int GetScrollY(int y) { return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y; } +#endif // ============================================================================ // implementation @@ -471,7 +489,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; @@ -495,9 +513,11 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) m_colBgOld = m_control->GetBackgroundColour(); m_control->SetBackgroundColour(attr->GetBackgroundColour()); +// Workaround for GTK+1 font setting problem on some platforms +#if !defined(__WXGTK__) || defined(__WXGTK20__) 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 } @@ -516,12 +536,14 @@ 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() ) { m_control->SetFont(m_fontOld); m_fontOld = wxNullFont; } +#endif } } @@ -539,8 +561,40 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event) bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) { - // accept the simple key presses, not anything with Ctrl/Alt/Meta - return !(event.ControlDown() || event.AltDown()); + 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. + alt = event.MetaDown(); +#endif + + // Assume it's not a valid char if ctrl or alt is down, but if both are + // down then it may be because of an AltGr key combination, so let them + // through in that case. + if ((ctrl || alt) && !(ctrl && alt)) + return false; + +#if wxUSE_UNICODE + int key = event.GetUnicodeKey(); + bool keyOk = true; + + // 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 + // don't do anything for function keys or etc. + if (key <= 127) + { + key = event.GetKeyCode(); + keyOk = (key <= 127); + } + 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) @@ -570,8 +624,7 @@ void wxGridCellTextEditor::Create(wxWindow* parent, m_control = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize #if defined(__WXMSW__) - , wxTE_PROCESS_TAB | wxTE_MULTILINE | - wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL + , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL #endif ); @@ -657,16 +710,17 @@ bool wxGridCellTextEditor::EndEdit(int row, int col, wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); - bool changed = FALSE; + bool changed = false; wxString value = Text()->GetValue(); if (value != m_startValue) - changed = TRUE; + changed = true; if (changed) grid->GetTable()->SetValue(row, col, value); m_startValue = wxEmptyString; - Text()->SetValue(m_startValue); + // No point in setting the text of the hidden control + //Text()->SetValue(m_startValue); return changed; } @@ -688,48 +742,46 @@ void wxGridCellTextEditor::DoReset(const wxString& startValue) bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event) { - if ( wxGridCellEditor::IsAcceptedKey(event) ) - { - int keycode = event.GetKeyCode(); - switch ( keycode ) - { - case WXK_NUMPAD0: - case WXK_NUMPAD1: - case WXK_NUMPAD2: - case WXK_NUMPAD3: - case WXK_NUMPAD4: - case WXK_NUMPAD5: - case WXK_NUMPAD6: - case WXK_NUMPAD7: - case WXK_NUMPAD8: - case WXK_NUMPAD9: - case WXK_MULTIPLY: - case WXK_NUMPAD_MULTIPLY: - case WXK_ADD: - case WXK_NUMPAD_ADD: - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: - case WXK_DECIMAL: - case WXK_NUMPAD_DECIMAL: - case WXK_DIVIDE: - case WXK_NUMPAD_DIVIDE: - return TRUE; - - default: - // accept 8 bit chars too if isprint() agrees - if ( (keycode < 255) && (wxIsprint(keycode)) ) - return TRUE; - } - } - - return FALSE; + return wxGridCellEditor::IsAcceptedKey(event); } void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) { - if ( !Text()->EmulateKeyPress(event) ) + // Since this is now happening in the EVT_CHAR event EmulateKeyPress is no + // longer an appropriate way to get the character into the text control. + // Do it ourselves instead. We know that if we get this far that we have + // a valid character, so not a whole lot of testing needs to be done. + + wxTextCtrl* tc = Text(); + wxChar ch; + long pos; + +#if wxUSE_UNICODE + ch = event.GetUnicodeKey(); + if (ch <= 127) + ch = (wxChar)event.GetKeyCode(); +#else + ch = (wxChar)event.GetKeyCode(); +#endif + switch (ch) { - event.Skip(); + case WXK_DELETE: + // delete the character at the cursor + pos = tc->GetInsertionPoint(); + if (pos < tc->GetLastPosition()) + 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); + break; + + default: + tc->WriteText(ch); + break; } } @@ -791,10 +843,11 @@ void wxGridCellNumberEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { +#if wxUSE_SPINCTRL if ( HasRange() ) { // create a spin ctrl - m_control = new wxSpinCtrl(parent, -1, wxEmptyString, + m_control = new wxSpinCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, m_min, m_max); @@ -802,6 +855,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent, wxGridCellEditor::Create(parent, id, evtHandler); } else +#endif { // just a text control wxGridCellTextEditor::Create(parent, id, evtHandler); @@ -824,19 +878,21 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid) { m_valueOld = 0; wxString sValue = table->GetValue(row, col); - if (! sValue.ToLong(&m_valueOld) && ! sValue.IsEmpty()) + if (! sValue.ToLong(&m_valueOld) && ! sValue.empty()) { wxFAIL_MSG( _T("this cell doesn't have numeric value") ); return; } } +#if wxUSE_SPINCTRL if ( HasRange() ) { Spin()->SetValue((int)m_valueOld); Spin()->SetFocus(); } else +#endif { DoBeginEdit(GetString()); } @@ -849,6 +905,7 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, long value = 0; wxString text; +#if wxUSE_SPINCTRL if ( HasRange() ) { value = Spin()->GetValue(); @@ -857,9 +914,10 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, text = wxString::Format(wxT("%ld"), value); } else +#endif { text = Text()->GetValue(); - changed = (text.IsEmpty() || text.ToLong(&value)) && (value != m_valueOld); + changed = (text.empty() || text.ToLong(&value)) && (value != m_valueOld); } if ( changed ) @@ -875,11 +933,13 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, void wxGridCellNumberEditor::Reset() { +#if wxUSE_SPINCTRL if ( HasRange() ) { Spin()->SetValue((int)m_valueOld); } else +#endif { DoReset(GetString()); } @@ -890,55 +950,22 @@ bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event) if ( wxGridCellEditor::IsAcceptedKey(event) ) { int keycode = event.GetKeyCode(); - switch ( keycode ) + if ( (keycode < 128) && + (wxIsdigit(keycode) || keycode == '+' || keycode == '-')) { - case WXK_NUMPAD0: - case WXK_NUMPAD1: - case WXK_NUMPAD2: - case WXK_NUMPAD3: - case WXK_NUMPAD4: - case WXK_NUMPAD5: - case WXK_NUMPAD6: - case WXK_NUMPAD7: - case WXK_NUMPAD8: - case WXK_NUMPAD9: - case WXK_ADD: - case WXK_NUMPAD_ADD: - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: - case WXK_UP: - case WXK_DOWN: - return TRUE; - - default: - if ( (keycode < 128) && wxIsdigit(keycode) ) - return TRUE; + return true; } } - return FALSE; + return false; } void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) { + int keycode = event.GetKeyCode(); if ( !HasRange() ) { - int keycode = event.GetKeyCode(); - if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' - || keycode == WXK_NUMPAD0 - || keycode == WXK_NUMPAD1 - || keycode == WXK_NUMPAD2 - || keycode == WXK_NUMPAD3 - || keycode == WXK_NUMPAD4 - || keycode == WXK_NUMPAD5 - || keycode == WXK_NUMPAD6 - || keycode == WXK_NUMPAD7 - || keycode == WXK_NUMPAD8 - || keycode == WXK_NUMPAD9 - || keycode == WXK_ADD - || keycode == WXK_NUMPAD_ADD - || keycode == WXK_SUBTRACT - || keycode == WXK_NUMPAD_SUBTRACT) + if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-') { wxGridCellTextEditor::StartingKey(event); @@ -946,7 +973,18 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) return; } } - +#if wxUSE_SPINCTRL + else + { + if ( wxIsdigit(keycode) ) + { + wxSpinCtrl* spin = (wxSpinCtrl*)m_control; + spin->SetValue(keycode - '0'); + spin->SetSelection(1,1); + return; + } + } +#endif event.Skip(); } @@ -981,18 +1019,21 @@ void wxGridCellNumberEditor::SetParameters(const wxString& params) // return the value in the spin control if it is there (the text control otherwise) wxString wxGridCellNumberEditor::GetValue() const { - wxString s; + wxString s; - if( HasRange() ) - { - long value = Spin()->GetValue(); - s.Printf(wxT("%ld"), value); - } - else - { - s = Text()->GetValue(); - } - return s; +#if wxUSE_SPINCTRL + if ( HasRange() ) + { + long value = Spin()->GetValue(); + s.Printf(wxT("%ld"), value); + } + else +#endif + { + s = Text()->GetValue(); + } + + return s; } // ---------------------------------------------------------------------------- @@ -1028,7 +1069,7 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) { m_valueOld = 0.0; wxString sValue = table->GetValue(row, col); - if (! sValue.ToDouble(&m_valueOld) && ! sValue.IsEmpty()) + if (! sValue.ToDouble(&m_valueOld) && ! sValue.empty()) { wxFAIL_MSG( _T("this cell doesn't have float value") ); return; @@ -1044,16 +1085,17 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col, double value = 0.0; wxString text(Text()->GetValue()); - if ( (text.IsEmpty() || text.ToDouble(&value)) && (value != m_valueOld) ) + if ( (text.empty() || text.ToDouble(&value)) && + !wxIsSameDouble(value, m_valueOld) ) { if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT)) grid->GetTable()->SetValueAsDouble(row, col, value); else grid->GetTable()->SetValue(row, col, text); - return TRUE; + return true; } - return FALSE; + return false; } void wxGridCellFloatEditor::Reset() @@ -1064,21 +1106,18 @@ void wxGridCellFloatEditor::Reset() void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) { int keycode = event.GetKeyCode(); - if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.' - || keycode == WXK_NUMPAD0 - || keycode == WXK_NUMPAD1 - || keycode == WXK_NUMPAD2 - || keycode == WXK_NUMPAD3 - || keycode == WXK_NUMPAD4 - || keycode == WXK_NUMPAD5 - || keycode == WXK_NUMPAD6 - || keycode == WXK_NUMPAD7 - || keycode == WXK_NUMPAD8 - || keycode == WXK_NUMPAD9 - || keycode == WXK_ADD - || keycode == WXK_NUMPAD_ADD - || keycode == WXK_SUBTRACT - || keycode == WXK_NUMPAD_SUBTRACT) + 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) ); +#else + bool is_decimal_point = ( strbuf == _T(".") ); +#endif + if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' + || is_decimal_point ) { wxGridCellTextEditor::StartingKey(event); @@ -1120,20 +1159,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); } @@ -1143,35 +1187,26 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) if ( wxGridCellEditor::IsAcceptedKey(event) ) { int keycode = event.GetKeyCode(); - switch ( keycode ) - { - case WXK_NUMPAD0: - case WXK_NUMPAD1: - case WXK_NUMPAD2: - case WXK_NUMPAD3: - case WXK_NUMPAD4: - case WXK_NUMPAD5: - case WXK_NUMPAD6: - case WXK_NUMPAD7: - case WXK_NUMPAD8: - case WXK_NUMPAD9: - case WXK_ADD: - case WXK_NUMPAD_ADD: - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: - case WXK_DECIMAL: - case WXK_NUMPAD_DECIMAL: - return TRUE; - - default: - // additionally accept 'e' as in '1e+6' - if ( (keycode < 128) && - (wxIsdigit(keycode) || tolower(keycode) == 'e') ) - return TRUE; - } + 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); +#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 ( (keycode < 128) && + (wxIsdigit(keycode) || tolower(keycode) == 'e' || + is_decimal_point || keycode == '+' || keycode == '-') ) + return true; } - return FALSE; + return false; } #endif // wxUSE_TEXTCTRL @@ -1195,7 +1230,7 @@ void wxGridCellBoolEditor::Create(wxWindow* parent, void wxGridCellBoolEditor::SetSize(const wxRect& r) { - bool resize = FALSE; + bool resize = false; wxSize size = m_control->GetSize(); wxCoord minSize = wxMin(r.width, r.height); @@ -1206,7 +1241,7 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) // reset to default size if it had been made smaller size = sizeBest; - resize = TRUE; + resize = true; } if ( size.x >= minSize || size.y >= minSize ) @@ -1214,7 +1249,7 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) // leave 1 pixel margin size.x = size.y = minSize - 2; - resize = TRUE; + resize = true; } if ( resize ) @@ -1295,10 +1330,10 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col, wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); - bool changed = FALSE; + bool changed = false; bool value = CBox()->GetValue(); if ( value != m_startValue ) - changed = TRUE; + changed = true; if ( changed ) { @@ -1331,22 +1366,36 @@ bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event) int keycode = event.GetKeyCode(); switch ( keycode ) { - case WXK_MULTIPLY: - case WXK_NUMPAD_MULTIPLY: - case WXK_ADD: - case WXK_NUMPAD_ADD: - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: case WXK_SPACE: case '+': case '-': - return TRUE; + return true; } } - return FALSE; + return false; } +void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event) +{ + int keycode = event.GetKeyCode(); + switch ( keycode ) + { + case WXK_SPACE: + CBox()->SetValue(!CBox()->GetValue()); + break; + + case '+': + CBox()->SetValue(true); + break; + + case '-': + CBox()->SetValue(false); + break; + } +} + + // return the value as "1" for true and the empty string for false wxString wxGridCellBoolEditor::GetValue() const { @@ -1362,6 +1411,11 @@ wxString wxGridCellBoolEditor::GetValue() const // wxGridCellChoiceEditor // ---------------------------------------------------------------------------- +wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices, + bool allowOthers) + : m_choices(choices), + m_allowOthers(allowOthers) { } + wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count, const wxString choices[], bool allowOthers) @@ -1390,20 +1444,11 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { - size_t count = m_choices.GetCount(); - wxString *choices = new wxString[count]; - for ( size_t n = 0; n < count; n++ ) - { - choices[n] = m_choices[n]; - } - m_control = new wxComboBox(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, - count, choices, + m_choices, m_allowOthers ? 0 : wxCB_READONLY); - delete [] choices; - wxGridCellEditor::Create(parent, id, evtHandler); } @@ -1424,6 +1469,14 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); + wxGridCellEditorEvtHandler* evtHandler = NULL; + if (m_control) + evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler); + + // Don't immediately end if we get a kill focus event within BeginEdit + if (evtHandler) + evtHandler->SetInSetFocus(true); + m_startValue = grid->GetTable()->GetValue(row, col); if (m_allowOthers) @@ -1432,30 +1485,33 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) { // find the right position, or default to the first if not found int pos = Combo()->FindString(m_startValue); - if (pos == -1) + if (pos == wxNOT_FOUND) pos = 0; Combo()->SetSelection(pos); } Combo()->SetInsertionPointEnd(); Combo()->SetFocus(); + + if (evtHandler) + { + // When dropping down the menu, a kill focus event + // happens after this point, so we can't reset the flag yet. +#if !defined(__WXGTK20__) + evtHandler->SetInSetFocus(false); +#endif + } } bool wxGridCellChoiceEditor::EndEdit(int row, int col, wxGrid* grid) { wxString value = Combo()->GetValue(); - bool changed = value != m_startValue; + if ( value == m_startValue ) + return false; - if ( changed ) - grid->GetTable()->SetValue(row, col, value); - - m_startValue = wxEmptyString; - if (m_allowOthers) - Combo()->SetValue(m_startValue); - else - Combo()->SetSelection(0); + grid->GetTable()->SetValue(row, col, value); - return changed; + return true; } void wxGridCellChoiceEditor::Reset() @@ -1493,6 +1549,18 @@ wxString wxGridCellChoiceEditor::GetValue() const // wxGridCellEditorEvtHandler // ---------------------------------------------------------------------------- +void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event) +{ + // Don't disable the cell if we're just starting to edit it + if (m_inSetFocus) + return; + + // accept changes + m_grid->DisableCellEditControl(); + + event.Skip(); +} + void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) { switch ( event.GetKeyCode() ) @@ -1512,7 +1580,6 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) m_editor->HandleReturn(event); break; - default: event.Skip(); } @@ -1520,6 +1587,14 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) 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: @@ -1528,6 +1603,85 @@ 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(); } @@ -1565,20 +1719,20 @@ void wxGridCellRenderer::Draw(wxGrid& grid, dc.SetBackgroundMode( wxSOLID ); // grey out fields if the grid is disabled - if( grid.IsEnabled() ) + if ( grid.IsEnabled() ) { - if ( isSelected ) - { - dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); - } - else - { - dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); - } + if ( isSelected ) + { + dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + } + else + { + dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + } } else { - dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID)); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID)); } dc.SetPen( *wxTRANSPARENT_PEN ); @@ -1589,8 +1743,8 @@ void wxGridCellRenderer::Draw(wxGrid& grid, // wxGridCellStringRenderer // ---------------------------------------------------------------------------- -void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid, - wxGridCellAttr& attr, +void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid, + const wxGridCellAttr& attr, wxDC& dc, bool isSelected) { @@ -1599,7 +1753,7 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid, // TODO some special colours for attr.IsReadOnly() case? // different coloured text when the grid is disabled - if( grid.IsEnabled() ) + if ( grid.IsEnabled() ) { if ( isSelected ) { @@ -1614,14 +1768,14 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid, } else { - dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)); - dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT)); + dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); } dc.SetFont( attr.GetFont() ); } -wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr, +wxSize wxGridCellStringRenderer::DoGetBestSize(const wxGridCellAttr& attr, wxDC& dc, const wxString& text) { @@ -1676,7 +1830,7 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, int i, c_cols, c_rows; for (i = col+cell_cols; i < cols; i++) { - bool is_empty = TRUE; + bool is_empty = true; for (int j=row; j 0) c_rows = 0; if (!grid.GetTable()->IsEmptyCell(j+c_rows, i)) { - is_empty = FALSE; + is_empty = false; break; } } @@ -1695,10 +1849,12 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, i--; break; } - if (rect.width >= best_width) break; + if (rect.width >= best_width) + break; } overflowCols = i - col - cell_cols + 1; - if (overflowCols >= cols) overflowCols = cols - 1; + if (overflowCols >= cols) + overflowCols = cols - 1; } if (overflowCols > 0) // redraw overflow cells w/ proper hilight @@ -1742,7 +1898,7 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, // wxGridCellNumberRenderer // ---------------------------------------------------------------------------- -wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col) +wxString wxGridCellNumberRenderer::GetString(const wxGrid& grid, int row, int col) { wxGridTableBase *table = grid.GetTable(); wxString text; @@ -1808,7 +1964,7 @@ wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const return renderer; } -wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) +wxString wxGridCellFloatRenderer::GetString(const wxGrid& grid, int row, int col) { wxGridTableBase *table = grid.GetTable(); @@ -1818,7 +1974,7 @@ wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) ) { val = table->GetValueAsDouble(row, col); - hasDouble = TRUE; + hasDouble = true; } else { @@ -1902,7 +2058,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) else { wxString tmp = params.BeforeFirst(_T(',')); - if ( !!tmp ) + if ( !tmp.empty() ) { long width; if ( tmp.ToLong(&width) ) @@ -1913,21 +2069,19 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) { wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); } - } - tmp = params.AfterFirst(_T(',')); - if ( !!tmp ) - { - long precision; + tmp = params.AfterFirst(_T(',')); + if ( !tmp.empty() ) + { + long precision; if ( tmp.ToLong(&precision) ) - { + { SetPrecision((int)precision); - } - else - { + } + else + { wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str()); - } - + } } } } @@ -1954,10 +2108,9 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, if ( !ms_sizeCheckMark.x ) { // get checkbox size - wxCoord checkSize = 0; - wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString); + wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString); wxSize size = checkbox->GetBestSize(); - 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__) @@ -2112,13 +2265,14 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) SetBackgroundColour(mergefrom->GetBackgroundColour()); if ( !HasFont() && mergefrom->HasFont() ) SetFont(mergefrom->GetFont()); - if ( !HasAlignment() && mergefrom->HasAlignment() ){ + if ( !HasAlignment() && mergefrom->HasAlignment() ) + { int hAlign, vAlign; mergefrom->GetAlignment( &hAlign, &vAlign); SetAlignment(hAlign, vAlign); } - - mergefrom->GetSize( &m_sizeRows, &m_sizeCols ); + if ( !HasSize() && mergefrom->HasSize() ) + mergefrom->GetSize( &m_sizeRows, &m_sizeCols ); // Directly access member functions as GetRender/Editor don't just return // m_renderer/m_editor @@ -2214,8 +2368,10 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const { if (HasAlignment()) { - if ( hAlign ) *hAlign = m_hAlign; - if ( vAlign ) *vAlign = m_vAlign; + if ( hAlign ) + *hAlign = m_hAlign; + if ( vAlign ) + *vAlign = m_vAlign; } else if (m_defGridAttr && m_defGridAttr != this) m_defGridAttr->GetAlignment(hAlign, vAlign); @@ -2227,8 +2383,10 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const { - if ( num_rows ) *num_rows = m_sizeRows; - if ( num_cols ) *num_cols = m_sizeCols; + if ( num_rows ) + *num_rows = m_sizeRows; + if ( num_cols ) + *num_cols = m_sizeCols; } // GetRenderer and GetEditor use a slightly different decision path about @@ -2402,8 +2560,11 @@ void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) else { // ...or remove the attribute - m_attrs.RemoveAt((size_t)n); - n--; count--; + // No need to DecRef the attribute itself since this is + // done be wxGridCellWithAttr's destructor! + m_attrs.RemoveAt(n); + n--; + count--; } } } @@ -2435,7 +2596,9 @@ void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols ) else { // ...or remove the attribute - m_attrs.RemoveAt((size_t)n); + // No need to DecRef the attribute itself since this is + // done be wxGridCellWithAttr's destructor! + m_attrs.RemoveAt(n); n--; count--; } } @@ -2533,9 +2696,11 @@ void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols rowOrCol += numRowsOrCols; else { - m_rowsOrCols.RemoveAt((size_t)n); - m_attrs.RemoveAt((size_t)n); - n--; count--; + m_rowsOrCols.RemoveAt(n); + m_attrs[n]->DecRef(); + m_attrs.RemoveAt(n); + n--; + count--; } } } @@ -2567,64 +2732,80 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, wxGridCellAttr *attr = (wxGridCellAttr *)NULL; if ( m_data ) { - switch(kind) + switch (kind) { case (wxGridCellAttr::Any): - //Get cached merge attributes. - // Currenlty not used as no cache implemented as not mutiable + // Get cached merge attributes. + // Currently not used as no cache implemented as not mutable // attr = m_data->m_mergeAttr.GetAttr(row, col); - if(!attr) + if (!attr) { - //Basicaly implement old version. - //Also check merge cache, so we don't have to re-merge every time.. - wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL, - *attrrow = (wxGridCellAttr *)NULL, - *attrcol = (wxGridCellAttr *)NULL; - - attrcell = m_data->m_cellAttrs.GetAttr(row, col); - attrcol = m_data->m_colAttrs.GetAttr(col); - attrrow = m_data->m_rowAttrs.GetAttr(row); - - if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){ - // Two or move are non NULL + // Basically implement old version. + // Also check merge cache, so we don't have to re-merge every time.. + wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col); + wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row); + wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col); + + if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)) + { + // Two or more are non NULL attr = new wxGridCellAttr; attr->SetKind(wxGridCellAttr::Merged); - //Order important.. - if(attrcell){ + // Order is important.. + if (attrcell) + { attr->MergeWith(attrcell); attrcell->DecRef(); } - if(attrcol){ + if (attrcol) + { attr->MergeWith(attrcol); attrcol->DecRef(); } - if(attrrow){ + if (attrrow) + { attr->MergeWith(attrrow); attrrow->DecRef(); } - //store merge attr if cache implemented + + // store merge attr if cache implemented //attr->IncRef(); //m_data->m_mergeAttr.SetAttr(attr, row, col); } else - { + { // one or none is non null return it or null. - if(attrrow) attr = attrrow; - if(attrcol) attr = attrcol; - if(attrcell) attr = attrcell; + if (attrrow) + attr = attrrow; + if (attrcol) + { + if (attr) + attr->DecRef(); + attr = attrcol; + } + if (attrcell) + { + if (attr) + attr->DecRef(); + attr = attrcell; + } } } break; + case (wxGridCellAttr::Cell): attr = m_data->m_cellAttrs.GetAttr(row, col); break; + case (wxGridCellAttr::Col): - attr = m_data->m_colAttrs.GetAttr(col); + attr = m_data->m_colAttrs.GetAttr(col); break; + case (wxGridCellAttr::Row): - attr = m_data->m_rowAttrs.GetAttr(row); + attr = m_data->m_rowAttrs.GetAttr(row); break; + default: // unused as yet... // (wxGridCellAttr::Default): @@ -2738,7 +2919,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_STRING, new wxGridCellStringRenderer, new wxGridCellTextEditor); - } else + } + else #endif // wxUSE_TEXTCTRL #if wxUSE_CHECKBOX if ( typeName == wxGRID_VALUE_BOOL ) @@ -2746,7 +2928,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_BOOL, new wxGridCellBoolRenderer, new wxGridCellBoolEditor); - } else + } + else #endif // wxUSE_CHECKBOX #if wxUSE_TEXTCTRL if ( typeName == wxGRID_VALUE_NUMBER ) @@ -2760,7 +2943,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_FLOAT, new wxGridCellFloatRenderer, new wxGridCellFloatEditor); - } else + } + else #endif // wxUSE_TEXTCTRL #if wxUSE_COMBOBOX if ( typeName == wxGRID_VALUE_CHOICE ) @@ -2768,7 +2952,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_CHOICE, new wxGridCellStringRenderer, new wxGridCellChoiceEditor); - } else + } + else #endif // wxUSE_COMBOBOX { return wxNOT_FOUND; @@ -2867,7 +3052,7 @@ bool wxGridTableBase::CanHaveAttributes() // use the default attr provider by default SetAttrProvider(new wxGridCellAttrProvider); } - return TRUE; + return true; } wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) @@ -2878,6 +3063,7 @@ wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAtt return (wxGridCellAttr *)NULL; } + void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) { if ( m_attrProvider ) @@ -2928,14 +3114,14 @@ bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos), { wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") ); - return FALSE; + return false; } bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) ) { wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function")); - return FALSE; + return false; } bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos), @@ -2943,7 +3129,7 @@ bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos), { wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function")); - return FALSE; + return false; } bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos), @@ -2951,14 +3137,14 @@ bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos), { wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function")); - return FALSE; + return false; } bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) ) { wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function")); - return FALSE; + return false; } bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), @@ -2966,10 +3152,9 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), { wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function")); - return FALSE; + return false; } - wxString wxGridTableBase::GetRowLabelValue( int row ) { wxString s; @@ -2989,9 +3174,10 @@ wxString wxGridTableBase::GetColLabelValue( int col ) unsigned int i, n; for ( n = 1; ; n++ ) { - s += (_T('A') + (wxChar)( col%26 )); + s += (wxChar) (_T('A') + (wxChar)( col%26 )); col = col/26 - 1; - if ( col < 0 ) break; + if ( col < 0 ) + break; } // reverse the string... @@ -3004,7 +3190,6 @@ wxString wxGridTableBase::GetColLabelValue( int col ) return s2; } - wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) ) { return wxGRID_VALUE_STRING; @@ -3033,7 +3218,7 @@ double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) ) bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) ) { - return FALSE; + return false; } void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col), @@ -3135,23 +3320,25 @@ int wxGridStringTable::GetNumberCols() wxString wxGridStringTable::GetValue( int row, int col ) { - wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), - _T("invalid row or column index in wxGridStringTable") ); + wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), + wxEmptyString, + _T("invalid row or column index in wxGridStringTable") ); return m_data[row][col]; } void wxGridStringTable::SetValue( int row, int col, const wxString& value ) { - wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), - _T("invalid row or column index in wxGridStringTable") ); + wxCHECK_RET( (row < GetNumberRows()) && (col < GetNumberCols()), + _T("invalid row or column index in wxGridStringTable") ); m_data[row][col] = value; } bool wxGridStringTable::IsEmptyCell( int row, int col ) { - wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), + wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), + true, _T("invalid row or column index in wxGridStringTable") ); return (m_data[row][col] == wxEmptyString); @@ -3203,14 +3390,15 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::AppendRows( size_t numRows ) { size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : - ( GetView() ? GetView()->GetNumberCols() : 0 ) ); + size_t curNumCols = ( curNumRows > 0 + ? m_data[0].GetCount() + : ( GetView() ? GetView()->GetNumberCols() : 0 ) ); wxArrayString sa; if ( curNumCols > 0 ) @@ -3230,7 +3418,7 @@ bool wxGridStringTable::AppendRows( size_t numRows ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) @@ -3247,7 +3435,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) (unsigned long)curNumRows ) ); - return FALSE; + return false; } if ( numRows > curNumRows - pos ) @@ -3263,6 +3451,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) { m_data.RemoveAt( pos, numRows ); } + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3273,7 +3462,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) @@ -3281,8 +3470,9 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) size_t row, col; size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : - ( GetView() ? GetView()->GetNumberCols() : 0 ) ); + size_t curNumCols = ( curNumRows > 0 + ? m_data[0].GetCount() + : ( GetView() ? GetView()->GetNumberCols() : 0 ) ); if ( pos >= curNumCols ) { @@ -3296,6 +3486,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3306,7 +3497,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::AppendCols( size_t numCols ) @@ -3320,7 +3511,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) // TODO: something better than this ? // wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") ); - return FALSE; + return false; } #endif @@ -3338,7 +3529,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) @@ -3358,7 +3549,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) (unsigned long)numCols, (unsigned long)curNumCols ) ); - return FALSE; + return false; } if ( numCols > curNumCols - pos ) @@ -3377,6 +3568,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) m_data[row].RemoveAt( pos, numCols ); } } + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3387,7 +3579,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } wxString wxGridStringTable::GetRowLabelValue( int row ) @@ -3449,7 +3641,6 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) } - ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// @@ -3461,12 +3652,13 @@ BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow ) 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 ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) { m_owner = parent; } @@ -3489,19 +3681,16 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) m_owner->DrawRowLabels( dc , rows ); } - void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) { m_owner->ProcessRowLabelMouseEvent( 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 // @@ -3515,6 +3704,10 @@ 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(); +} ////////////////////////////////////////////////////////////////////// @@ -3527,12 +3720,13 @@ BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow ) 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 ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) { m_owner = parent; } @@ -3555,7 +3749,6 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) m_owner->DrawColLabels( dc , cols ); } - void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) { m_owner->ProcessColLabelMouseEvent( event ); @@ -3566,20 +3759,26 @@ 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(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } +void wxGridColLabelWindow::OnChar( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); +} ////////////////////////////////////////////////////////////////////// @@ -3592,12 +3791,13 @@ BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow ) EVT_PAINT( wxGridCornerLabelWindow::OnPaint) EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown ) EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp ) + EVT_CHAR ( wxGridCornerLabelWindow::OnChar ) END_EVENT_TABLE() wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) { m_owner = parent; } @@ -3610,6 +3810,16 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) int client_width = 0; GetClientSize( &client_width, &client_height ); + // VZ: any reason for this ifdef? (FIXME) +#ifdef __WXGTK__ + wxRect rect; + rect.SetX( 1 ); + rect.SetY( 1 ); + rect.SetWidth( client_width - 2 ); + rect.SetHeight( client_height - 2 ); + + 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 ); @@ -3619,15 +3829,14 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) dc.SetPen( *wxWHITE_PEN ); dc.DrawLine( 1, 1, client_width-1, 1 ); dc.DrawLine( 1, 1, 1, client_height-1 ); +#endif // __WXGTK__/!__WXGTK__ } - void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) { m_owner->ProcessCornerLabelMouseEvent( event ); } - void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event ) { m_owner->GetEventHandler()->ProcessEvent(event); @@ -3646,6 +3855,10 @@ 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(); +} ////////////////////////////////////////////////////////////////////// @@ -3658,6 +3871,9 @@ BEGIN_EVENT_TABLE( wxGridWindow, wxWindow ) EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) EVT_KEY_UP( wxGridWindow::OnKeyUp ) + EVT_CHAR ( wxGridWindow::OnChar ) + EVT_SET_FOCUS( wxGridWindow::OnFocus ) + EVT_KILL_FOCUS( wxGridWindow::OnFocus ) EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground ) END_EVENT_TABLE() @@ -3667,22 +3883,14 @@ wxGridWindow::wxGridWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN, + : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE, wxT("grid window") ) - { m_owner = parent; m_rowLabelWin = rowLblWin; m_colLabelWin = colLblWin; - SetBackgroundColour(_T("WHITE")); -} - - -wxGridWindow::~wxGridWindow() -{ } - void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); @@ -3697,7 +3905,6 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) m_owner->DrawHighlight( dc , DirtyCells ); } - void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { wxWindow::ScrollWindow( dx, dy, rect ); @@ -3705,9 +3912,11 @@ void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) m_colLabelWin->ScrollWindow( dx, 0, rect ); } - void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) { + if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this) + SetFocus(); + m_owner->ProcessGridCellMouseEvent( event ); } @@ -3721,18 +3930,31 @@ void wxGridWindow::OnMouseWheel( wxMouseEvent& event ) // void wxGridWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); +} + +void wxGridWindow::OnChar( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) { } +void wxGridWindow::OnFocus(wxFocusEvent& event) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); +} ////////////////////////////////////////////////////////////////////// @@ -3749,22 +3971,83 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \ m_minAcceptableColWidth, \ - m_colRights, m_numCols, TRUE) + m_colRights, m_numCols, true) #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \ m_minAcceptableRowHeight, \ - m_rowBottoms, m_numRows, TRUE) + m_rowBottoms, m_numRows, true) ///////////////////////////////////////////////////////////////////// +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxGridStyle ) + +wxBEGIN_FLAGS( wxGridStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + +wxEND_FLAGS( wxGridStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow,"wx/grid.h") + +wxBEGIN_PROPERTIES_TABLE(wxGrid) + wxHIDE_PROPERTY( Children ) + wxPROPERTY_FLAGS( WindowStyle , wxGridStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxGrid) +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) +*/ +#else IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) +#endif BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) EVT_PAINT( wxGrid::OnPaint ) EVT_SIZE( wxGrid::OnSize ) EVT_KEY_DOWN( wxGrid::OnKeyDown ) EVT_KEY_UP( wxGrid::OnKeyUp ) + EVT_CHAR ( wxGrid::OnChar ) EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground ) 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 ; +} + wxGrid::wxGrid( wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -3776,6 +4059,24 @@ wxGrid::wxGrid( wxWindow *parent, m_rowMinHeights(GRID_HASH_SIZE) { Create(); + SetBestFittingSize(size); +} + +bool wxGrid::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + long style, const wxString& name) +{ + if (!wxScrolledWindow::Create(parent, id, pos, size, + style | wxWANTS_CHARS , name)) + return false; + + m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ; + m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ; + + Create() ; + SetBestFittingSize(size); + + return true; } @@ -3806,14 +4107,22 @@ wxGrid::~wxGrid() // ----- internal init and update functions // +// NOTE: If using the default visual attributes works everywhere then this can +// 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_created = false; // set to true by CreateGrid m_table = (wxGridTableBase *) NULL; - m_ownTable = FALSE; + m_ownTable = false; - m_cellEditCtrlEnabled = FALSE; + m_cellEditCtrlEnabled = false; m_defaultCellAttr = new wxGridCellAttr(); @@ -3822,13 +4131,22 @@ void wxGrid::Create() m_defaultCellAttr->SetKind(wxGridCellAttr::Default); m_defaultCellAttr->SetFont(GetFont()); m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP); + m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); + m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); + +#if _USE_VISATTR + wxVisualAttributes gva = wxListBox::GetClassDefaultAttributes(); + wxVisualAttributes lva = wxPanel::GetClassDefaultAttributes(); + + m_defaultCellAttr->SetTextColour(gva.colFg); + m_defaultCellAttr->SetBackgroundColour(gva.colBg); + +#else m_defaultCellAttr->SetTextColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); m_defaultCellAttr->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); - m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); - +#endif m_numRows = 0; m_numCols = 0; @@ -3843,29 +4161,50 @@ void wxGrid::Create() // subwindow components that make up the wxGrid m_cornerLabelWin = new wxGridCornerLabelWindow( this, - -1, + wxID_ANY, wxDefaultPosition, wxDefaultSize ); m_rowLabelWin = new wxGridRowLabelWindow( this, - -1, + wxID_ANY, wxDefaultPosition, wxDefaultSize ); m_colLabelWin = new wxGridColLabelWindow( this, - -1, + wxID_ANY, wxDefaultPosition, wxDefaultSize ); m_gridWin = new wxGridWindow( this, m_rowLabelWin, m_colLabelWin, - -1, + wxID_ANY, wxDefaultPosition, wxDefaultSize ); SetTargetWindow( m_gridWin ); +#if _USE_VISATTR + wxColour gfg = gva.colFg; + wxColour gbg = gva.colBg; + wxColour lfg = lva.colFg; + wxColour lbg = lva.colBg; +#else + wxColour gfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); + wxColour gbg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ); + 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); + m_rowLabelWin->SetOwnBackgroundColour(lbg); + m_colLabelWin->SetOwnForegroundColour(lfg); + m_colLabelWin->SetOwnBackgroundColour(lbg); + + m_gridWin->SetOwnForegroundColour(gfg); + m_gridWin->SetOwnBackgroundColour(gbg); + Init(); } @@ -3874,7 +4213,7 @@ bool wxGrid::CreateGrid( int numRows, int numCols, wxGrid::wxGridSelectionModes selmode ) { wxCHECK_MSG( !m_created, - FALSE, + false, wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); m_numRows = numRows; @@ -3882,12 +4221,12 @@ bool wxGrid::CreateGrid( int numRows, int numCols, m_table = new wxGridStringTable( m_numRows, m_numCols ); m_table->SetView( this ); - m_ownTable = TRUE; + m_ownTable = true; m_selection = new wxGridSelection( this, selmode ); CalcDimensions(); - m_created = TRUE; + m_created = true; return m_created; } @@ -3913,21 +4252,21 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, { if ( m_created ) { - // stop all processing - m_created = FALSE; + // stop all processing + m_created = false; if (m_ownTable) { wxGridTableBase *t=m_table; m_table=0; - delete t; + delete t; } - delete m_selection; - - m_table=0; - m_selection=0; - m_numRows=0; - m_numCols=0; + delete m_selection; + + m_table=0; + m_selection=0; + m_numRows=0; + m_numCols=0; } if (table) { @@ -3936,13 +4275,12 @@ 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 ); CalcDimensions(); - m_created = TRUE; + m_created = true; } return m_created; @@ -3995,22 +4333,23 @@ void wxGrid::Init() #endif m_gridLineColour = wxColour( 192,192,192 ); - m_gridLinesEnabled = TRUE; + m_gridLinesEnabled = true; m_cellHighlightColour = *wxBLACK; m_cellHighlightPenWidth = 2; m_cellHighlightROPenWidth = 1; m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_winCapture = (wxWindow *)NULL; - m_canDragRowSize = TRUE; - m_canDragColSize = TRUE; - m_canDragGridSize = TRUE; + m_canDragRowSize = true; + m_canDragColSize = true; + m_canDragGridSize = true; + m_canDragCell = false; m_dragLastPos = -1; m_dragRowOrCol = -1; - m_isDragging = FALSE; + m_isDragging = false; m_startDragPos = wxDefaultPosition; - m_waitForSlowClick = FALSE; + m_waitForSlowClick = false; m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); @@ -4022,13 +4361,16 @@ void wxGrid::Init() m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - m_editable = TRUE; // default for whole grid + m_editable = true; // default for whole grid - m_inOnKeyDown = FALSE; + m_inOnKeyDown = false; m_batchCount = 0; m_extraWidth = m_extraHeight = 0; + + m_scrollLineX = GRID_SCROLL_LINE_X; + m_scrollLineY = GRID_SCROLL_LINE_Y; } // ---------------------------------------------------------------------------- @@ -4127,7 +4469,7 @@ void wxGrid::CalcDimensions() int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0; // take into account editor if shown - if( IsCellEditControlShown() ) + if ( IsCellEditControlShown() ) { int w2, h2; int r = m_currentCellCoords.GetRow(); @@ -4141,8 +4483,10 @@ void wxGrid::CalcDimensions() editor->GetControl()->GetSize(&w2, &h2); w2 += x; h2 += y; - if( w2 > w ) w = w2; - if( h2 > h ) h = h2; + if ( w2 > w ) + w = w2; + if ( h2 > h ) + h = h2; editor->DecRef(); attr->DecRef(); } @@ -4151,31 +4495,14 @@ void wxGrid::CalcDimensions() int x, y; GetViewStart( &x, &y ); - // maybe we don't need scrollbars at all? - // - // also adjust the position to be valid for the new scroll rangs - if ( w <= cw ) - { - w = x = 0; - } - else - { - if ( x >= w ) - x = w - 1; - } - - if ( h <= ch ) - { - h = y = 0; - } - else - { - if ( y >= h ) - y = h - 1; - } + // ensure the position is valid for the new scroll ranges + if ( x >= w ) + x = wxMax( w - 1, 0 ); + if ( y >= h ) + y = wxMax( h - 1, 0 ); // do set scrollbar parameters - SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y, + SetScrollbars( m_scrollLineX, m_scrollLineY, GetScrollX(w), GetScrollY(h), x, y, GetBatchCount() != 0); @@ -4187,19 +4514,24 @@ void wxGrid::CalcDimensions() void wxGrid::CalcWindowSizes() { + // escape if the window is has not been fully created yet + + if ( m_cornerLabelWin == NULL ) + return ; + int cw, ch; GetClientSize( &cw, &ch ); - if ( m_cornerLabelWin->IsShown() ) + if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() ) m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight ); - if ( m_colLabelWin->IsShown() ) + if ( m_colLabelWin && m_colLabelWin->IsShown() ) m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight); - if ( m_rowLabelWin->IsShown() ) + if ( m_rowLabelWin && m_rowLabelWin->IsShown() ) m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight); - if ( m_gridWin->IsShown() ) + if ( m_gridWin && m_gridWin->IsShown() ) m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight); } @@ -4210,7 +4542,7 @@ void wxGrid::CalcWindowSizes() bool wxGrid::Redimension( wxGridTableMessage& msg ) { int i; - bool result = FALSE; + bool result = false; // Clear the attribute cache as the attribute might refer to a different // cell than stored in the cache after adding/removing rows/columns. @@ -4278,7 +4610,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: @@ -4314,7 +4646,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_ROWS_DELETED: @@ -4348,7 +4680,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( m_selection ) m_selection->UpdateRows( pos, -((int)numRows) ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) { + if (attrProvider) + { attrProvider->UpdateAttrRows( pos, -((int)numRows) ); // ifdef'd out following patch from Paul Gammans #if 0 @@ -4367,7 +4700,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_INSERTED: @@ -4410,7 +4743,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_APPENDED: @@ -4445,7 +4778,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_DELETED: @@ -4479,7 +4812,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( m_selection ) m_selection->UpdateCols( pos, -((int)numCols) ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) { + if (attrProvider) + { attrProvider->UpdateAttrCols( pos, -((int)numCols) ); // ifdef'd out following patch from Paul Gammans #if 0 @@ -4498,7 +4832,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colLabelWin->Refresh(); } } - result = TRUE; + result = true; break; } @@ -4552,7 +4886,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) rowlabels.Add( row ); } - iter++ ; + ++iter; } return rowlabels; @@ -4603,7 +4937,7 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) colLabels.Add( col ); } - iter++ ; + ++iter; } return colLabels; } @@ -4663,7 +4997,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) } } - iter++; + ++iter; } return cellsExposed; @@ -4680,13 +5014,13 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if (!m_isDragging) { - m_isDragging = TRUE; + m_isDragging = true; m_rowLabelWin->CaptureMouse(); } if ( event.LeftIsDown() ) { - switch( m_cursorMode ) + switch ( m_cursorMode ) { case WXGRID_CURSOR_RESIZE_ROW: { @@ -4710,6 +5044,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_ROW: + { if ( (row = YToRow( y )) >= 0 ) { if ( m_selection ) @@ -4721,6 +5056,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } + } + break; // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch @@ -4737,7 +5074,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if (m_isDragging) { if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse(); - m_isDragging = FALSE; + m_isDragging = false; } // ------------ Entering or leaving the window @@ -4804,15 +5141,15 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) // else if (event.LeftDClick() ) { - int row = YToEdgeOfRow(y); + row = YToEdgeOfRow(y); if ( row < 0 ) { row = YToRow(y); if ( row >=0 && - !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) ) - { + !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) ) + { // no default action at the moment - } + } } else { @@ -4850,7 +5187,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { row = YToRow(y); if ( row >=0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) + !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) { // no default action at the moment } @@ -4863,7 +5200,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { row = YToRow(y); if ( row >= 0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) + !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) { // no default action at the moment } @@ -4881,12 +5218,12 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { // don't capture the mouse yet if ( CanDragRowSize() ) - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE); + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, false); } } else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE); + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, false); } } } @@ -4902,13 +5239,13 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if (!m_isDragging) { - m_isDragging = TRUE; + m_isDragging = true; m_colLabelWin->CaptureMouse(); } if ( event.LeftIsDown() ) { - switch( m_cursorMode ) + switch ( m_cursorMode ) { case WXGRID_CURSOR_RESIZE_COL: { @@ -4932,6 +5269,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_COL: + { if ( (col = XToCol( x )) >= 0 ) { if ( m_selection ) @@ -4943,6 +5281,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } + } + break; // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch @@ -4959,7 +5299,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if (m_isDragging) { if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse(); - m_isDragging = FALSE; + m_isDragging = false; } // ------------ Entering or leaving the window @@ -5025,14 +5365,14 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // if ( event.LeftDClick() ) { - int col = XToEdgeOfCol(x); + col = XToEdgeOfCol(x); if ( col < 0 ) { col = XToCol(x); if ( col >= 0 && ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) ) { - // no default action at the moment + // no default action at the moment } } else @@ -5071,7 +5411,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { col = XToCol(x); if ( col >= 0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) + !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) { // no default action at the moment } @@ -5084,7 +5424,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { col = XToCol(x); if ( col >= 0 && - !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) + !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) { // no default action at the moment } @@ -5102,12 +5442,12 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { // don't capture the cursor yet if ( CanDragColSize() ) - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE); + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, false); } } else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE); + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, false); } } } @@ -5224,6 +5564,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) XYToCell( x, y, coords ); int cell_rows, cell_cols; + bool isFirstDrag = !m_isDragging; GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols ); if ((cell_rows < 0) || (cell_cols < 0)) { @@ -5235,7 +5576,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol()); - // Don't start doing anything until the mouse has been drug at + // Don't start doing anything until the mouse has been dragged at // least 3 pixels in any direction... if (! m_isDragging) { @@ -5248,11 +5589,11 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) return; } - m_isDragging = TRUE; + m_isDragging = true; if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { // Hide the edit control, so it - // won't interfer with drag-shrinking. + // won't interfere with drag-shrinking. if ( IsCellEditControlShown() ) { HideCellEditControl(); @@ -5274,6 +5615,19 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) m_selectingKeyboard = coords; HighlightBlock ( m_selectingKeyboard, coords ); } + else if ( CanDragCell() ) + { + if ( isFirstDrag ) + { + if ( m_selectingKeyboard == wxGridNoCellCoords) + m_selectingKeyboard = coords; + + SendEvent( wxEVT_GRID_CELL_BEGIN_DRAG, + coords.GetRow(), + coords.GetCol(), + event ); + } + } else { if ( !IsSelection() ) @@ -5334,7 +5688,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) return; } - m_isDragging = FALSE; + m_isDragging = false; m_startDragPos = wxDefaultPosition; // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL @@ -5421,11 +5775,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) { - SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK, - coords.GetRow(), - coords.GetCol(), - event ); + if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) + { + // we want double click to select a cell and start editing + // (i.e. to behave in same way as sequence of two slow clicks): + m_waitForSlowClick = true; + } } + } @@ -5452,7 +5812,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) editor->DecRef(); attr->DecRef(); - m_waitForSlowClick = FALSE; + m_waitForSlowClick = false; } else if ( m_selectingTopLeft != wxGridNoCellCoords && m_selectingBottomRight != wxGridNoCellCoords ) @@ -5535,7 +5895,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.Moving() && !event.IsButton() ) { - if( coords.GetRow() < 0 || coords.GetCol() < 0 ) + if ( coords.GetRow() < 0 || coords.GetCol() < 0 ) { // out of grid cell area ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); @@ -5548,7 +5908,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; @@ -5562,17 +5922,9 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( CanDragRowSize() && CanDragGridSize() ) ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW); - } - - if ( dragCol >= 0 ) - { - m_dragRowOrCol = dragCol; - } - - return; + } } - - if ( dragCol >= 0 ) + else if ( dragCol >= 0 ) { m_dragRowOrCol = dragCol; @@ -5581,15 +5933,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( CanDragColSize() && CanDragGridSize() ) ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL); } - - 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); + } } } } @@ -5624,7 +5974,7 @@ void wxGrid::DoEndDragResizeRow() CalcScrolledPosition(0, rect.y, &dummy, &rect.y); rect.width = m_rowLabelWidth; rect.height = ch - rect.y; - m_rowLabelWin->Refresh( TRUE, &rect ); + m_rowLabelWin->Refresh( true, &rect ); rect.width = cw; // if there is a multicell block, paint all of it if (m_table) @@ -5645,7 +5995,7 @@ void wxGrid::DoEndDragResizeRow() rect.height = ch - rect.y; } } - m_gridWin->Refresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } ShowCellEditControl(); @@ -5683,7 +6033,7 @@ void wxGrid::DoEndDragResizeCol() CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); rect.width = cw - rect.x; rect.height = m_colLabelHeight; - m_colLabelWin->Refresh( TRUE, &rect ); + m_colLabelWin->Refresh( true, &rect ); rect.height = ch; // if there is a multicell block, paint all of it if (m_table) @@ -5704,7 +6054,7 @@ void wxGrid::DoEndDragResizeCol() rect.width = cw - rect.x; } } - m_gridWin->Refresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } ShowCellEditControl(); @@ -5735,7 +6085,7 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) return Redimension( msg ); default: - return FALSE; + return false; } } @@ -5766,7 +6116,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); - return FALSE; + return false; } if ( m_table ) @@ -5780,7 +6130,7 @@ 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; + return false; } @@ -5791,7 +6141,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); - return FALSE; + return false; } if ( m_table ) @@ -5801,7 +6151,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the append row // operation to this view object as a grid table message } - return FALSE; + return false; } @@ -5812,7 +6162,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); - return FALSE; + return false; } if ( m_table ) @@ -5825,7 +6175,7 @@ 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; + return false; } @@ -5836,7 +6186,7 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); - return FALSE; + return false; } if ( m_table ) @@ -5849,7 +6199,7 @@ 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; + return false; } @@ -5860,7 +6210,7 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); - return FALSE; + return false; } if ( m_table ) @@ -5870,7 +6220,7 @@ 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; + return false; } @@ -5881,7 +6231,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); - return FALSE; + return false; } if ( m_table ) @@ -5894,7 +6244,7 @@ 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; + return false; } @@ -5911,7 +6261,7 @@ int wxGrid::SendEvent( const wxEventType type, wxMouseEvent& mouseEv ) { bool claimed; - bool vetoed= FALSE; + bool vetoed; if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { @@ -5939,7 +6289,7 @@ int wxGrid::SendEvent( const wxEventType type, this, m_selectingTopLeft, m_selectingBottomRight, - TRUE, + true, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -5956,7 +6306,7 @@ int wxGrid::SendEvent( const wxEventType type, row, col, mouseEv.GetX() + GetRowLabelSize(), mouseEv.GetY() + GetColLabelSize(), - FALSE, + false, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -5966,7 +6316,9 @@ int wxGrid::SendEvent( const wxEventType type, } // A Veto'd event may not be `claimed' so test this first - if (vetoed) return -1; + if (vetoed) + return -1; + return claimed ? 1 : 0; } @@ -5978,7 +6330,7 @@ int wxGrid::SendEvent( const wxEventType type, int row, int col ) { bool claimed; - bool vetoed= FALSE; + bool vetoed; if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { @@ -6004,11 +6356,12 @@ int wxGrid::SendEvent( const wxEventType type, } // A Veto'd event may not be `claimed' so test this first - if (vetoed) return -1; + if (vetoed) + return -1; + return claimed ? 1 : 0; } - void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW @@ -6021,7 +6374,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) if (! GetBatchCount()) { // Refresh to get correct scrolled position: - wxScrolledWindow::Refresh(eraseb,rect); + wxScrolledWindow::Refresh(eraseb, rect); if (rect) { @@ -6036,7 +6389,8 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) rectHeight = rect->GetHeight(); width_label = m_rowLabelWidth - rect_x; - if (width_label > rectWidth) width_label = rectWidth; + if (width_label > rectWidth) + width_label = rectWidth; height_label = m_colLabelHeight - rect_y; if (height_label > rectHeight) height_label = rectHeight; @@ -6121,7 +6475,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") ); } - m_inOnKeyDown = TRUE; + m_inOnKeyDown = true; // propagate the event up and see if it gets processed // @@ -6195,8 +6549,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) else { // at the bottom of a column - HideCellEditControl(); - SaveEditControlValue(); + DisableCellEditControl(); } } break; @@ -6210,26 +6563,24 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) { if ( GetGridCursorCol() > 0 ) { - MoveCursorLeft( FALSE ); + MoveCursorLeft( false ); } else { // at left of grid - HideCellEditControl(); - SaveEditControlValue(); + DisableCellEditControl(); } } else { if ( GetGridCursorCol() < GetNumberCols()-1 ) { - MoveCursorRight( FALSE ); + MoveCursorRight( false ); } else { // at right of grid - HideCellEditControl(); - SaveEditControlValue(); + DisableCellEditControl(); } } break; @@ -6282,55 +6633,18 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } if ( !IsEditable() ) { - MoveCursorRight( FALSE ); + MoveCursorRight( false ); break; } // Otherwise fall through to default default: - // is it possible to edit the current cell at all? - if ( !IsCellEditControlEnabled() && CanEnableCellControl() ) - { - // yes, now check whether the cells editor accepts the key - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellEditor *editor = attr->GetEditor(this, row, col); - - // is special and will always start editing, for - // other keys - ask the editor itself - if ( (event.GetKeyCode() == WXK_F2 && !event.HasModifiers()) - || editor->IsAcceptedKey(event) ) - { - // ensure cell is visble - MakeCellVisible(row, col); - EnableCellEditControl(); - - // a problem can arise if the cell is not completely - // visible (even after calling MakeCellVisible the - // control is not created and calling StartingKey will - // crash the app - if( editor->IsCreated() && m_cellEditCtrlEnabled ) editor->StartingKey(event); - } - else - { - event.Skip(); - } - - editor->DecRef(); - attr->DecRef(); - } - else - { - // let others process char events with modifiers or all - // char events for readonly cells - event.Skip(); - } + event.Skip(); break; } } - m_inOnKeyDown = FALSE; + m_inOnKeyDown = false; } void wxGrid::OnKeyUp( wxKeyEvent& event ) @@ -6349,7 +6663,7 @@ void wxGrid::OnKeyUp( wxKeyEvent& event ) m_selectingBottomRight.GetRow(), m_selectingBottomRight.GetCol(), event.ControlDown(), - TRUE, + true, event.AltDown(), event.MetaDown() ); } @@ -6361,6 +6675,48 @@ void wxGrid::OnKeyUp( wxKeyEvent& event ) } } +void wxGrid::OnChar( wxKeyEvent& event ) +{ + // is it possible to edit the current cell at all? + if ( !IsCellEditControlEnabled() && CanEnableCellControl() ) + { + // yes, now check whether the cells editor accepts the key + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + + // is special and will always start editing, for + // other keys - ask the editor itself + if ( (event.GetKeyCode() == WXK_F2 && !event.HasModifiers()) + || editor->IsAcceptedKey(event) ) + { + // ensure cell is visble + MakeCellVisible(row, col); + EnableCellEditControl(); + + // a problem can arise if the cell is not completely + // visible (even after calling MakeCellVisible the + // control is not created and calling StartingKey will + // crash the app + if ( event.GetKeyCode() != WXK_F2 && editor->IsCreated() && m_cellEditCtrlEnabled ) + editor->StartingKey(event); + } + else + { + event.Skip(); + } + + editor->DecRef(); + attr->DecRef(); + } + else + { + event.Skip(); + } +} + + void wxGrid::OnEraseBackground(wxEraseEvent&) { } @@ -6378,10 +6734,9 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) if ( m_currentCellCoords != wxGridNoCellCoords ) { - HideCellEditControl(); DisableCellEditControl(); - if ( IsVisible( m_currentCellCoords, FALSE ) ) + if ( IsVisible( m_currentCellCoords, false ) ) { wxRect r; r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); @@ -6454,7 +6809,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo wxRect rect; rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ), wxGridCellCoords ( bottomRow, rightCol ) ); - m_gridWin->Refresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } // Now handle changing an existing selection area. else if ( m_selectingTopLeft != updateTopLeft || @@ -6468,7 +6823,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo need_refresh[0] = need_refresh[1] = need_refresh[2] = - need_refresh[3] = FALSE; + need_refresh[3] = false; int i; // Store intermediate values @@ -6511,7 +6866,7 @@ 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; + need_refresh[0] = true; rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, oldLeft ), wxGridCellCoords ( oldBottom, @@ -6522,7 +6877,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo { // Refresh the newly selected or deselected // area above the old or new selection. - need_refresh[1] = TRUE; + need_refresh[1] = true; rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, leftCol ), wxGridCellCoords ( topRow - 1, @@ -6533,7 +6888,7 @@ 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; + need_refresh[2] = true; rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, rightCol + 1 ), wxGridCellCoords ( oldBottom, @@ -6544,7 +6899,7 @@ 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; + need_refresh[3] = true; rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, leftCol ), wxGridCellCoords ( oldBottom, @@ -6554,7 +6909,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo // various Refresh() calls for (i = 0; i < 4; i++ ) if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( FALSE, &(rect[i]) ); + m_gridWin->Refresh( false, &(rect[i]) ); } // Change Selection m_selectingTopLeft = updateTopLeft; @@ -6575,10 +6930,10 @@ bool wxGrid::GetModelValues() // all we need to do is repaint the grid // m_gridWin->Refresh(); - return TRUE; + return true; } - return FALSE; + return false; } @@ -6601,10 +6956,10 @@ bool wxGrid::SetModelValues() } } - return TRUE; + return true; } - return FALSE; + return false; } @@ -6615,7 +6970,8 @@ bool wxGrid::SetModelValues() // void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { - if ( !m_numRows || !m_numCols ) return; + if ( !m_numRows || !m_numCols ) + return; int i, numCells = cells.GetCount(); int row, col, cell_rows, cell_cols; @@ -6631,12 +6987,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) if ( cell_rows <= 0 || cell_cols <= 0 ) { wxGridCellCoords cell(row+cell_rows, col+cell_cols); - bool marked = FALSE; + bool marked = false; for ( int j = 0; j < numCells; j++ ) { if ( cell == cells[j] ) { - marked = TRUE; + marked = true; break; } } @@ -6647,11 +7003,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( cell == redrawCells[j] ) { - marked = TRUE; + marked = true; break; } } - if (!marked) redrawCells.Add( cell ); + if (!marked) + redrawCells.Add( cell ); } continue; // don't bother drawing this cell } @@ -6666,9 +7023,10 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) for (int k = 0; k < int(redrawCells.GetCount()); k++) if ((redrawCells[k].GetCol() < left) && (redrawCells[k].GetRow() == row)) - left=redrawCells[k].GetCol(); + left = redrawCells[k].GetCol(); - if (left == col) left = 0; // oh well + if (left == col) + left = 0; // oh well for (int j = col-1; j >= left; j--) { @@ -6677,16 +7035,17 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) if (GetCellOverflow(row+l, j)) { wxGridCellCoords cell(row+l, j); - bool marked = FALSE; + bool marked = false; for (int k = 0; k < numCells; k++) { if ( cell == cells[k] ) { - marked = TRUE; + marked = true; break; } } + if (!marked) { int count = redrawCells.GetCount(); @@ -6694,11 +7053,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( cell == redrawCells[k] ) { - marked = TRUE; + marked = true; break; } } - if (!marked) redrawCells.Add( cell ); + if (!marked) + redrawCells.Add( cell ); } } break; @@ -6706,6 +7066,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) } } } + DrawCell( dc, cells[i] ); } @@ -6774,9 +7135,15 @@ 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 + // 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 wxGridCellEditor *editor = attr->GetEditor(this, row, col); editor->PaintBackground(rect, attr); editor->DecRef(); +#endif } else { @@ -6813,16 +7180,16 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) // reduce the size of the rectangle 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; + 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, wxSOLID)); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRectangle(rect); } @@ -6833,8 +7200,8 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) // how to properly set colours for arbitrary bg? wxCoord x1 = rect.x, y1 = rect.y, - x2 = rect.x + rect.width -1, - y2 = rect.y + rect.height -1; + x2 = rect.x + rect.width - 1, + y2 = rect.y + rect.height - 1; dc.SetPen(*wxWHITE_PEN); dc.DrawLine(x1, y1, x2, y1); @@ -6917,7 +7284,8 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) if ( !m_gridLinesEnabled || !m_numRows || - !m_numCols ) return; + !m_numCols ) + return; int top, bottom, left, right; @@ -6956,8 +7324,10 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) int topRow = internalYToRow(top); int rightCol = internalXToCol(right); int bottomRow = internalYToRow(bottom); - wxRegion clippedcells(0, 0, cw, ch); +#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; @@ -6981,6 +7351,30 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) } } } +#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.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); @@ -7003,7 +7397,6 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) } } - // vertical grid lines // for ( i = internalXToCol(left); i < m_numCols; i++ ) @@ -7022,10 +7415,10 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) dc.DestroyClippingRegion(); } - void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) { - if ( !m_numRows ) return; + if ( !m_numRows ) + return; size_t i; size_t numLabels = rows.GetCount(); @@ -7036,12 +7429,24 @@ void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) } } - void wxGrid::DrawRowLabel( wxDC& dc, int row ) { - if ( GetRowHeight(row) <= 0 ) + if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 ) 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; @@ -7056,7 +7461,7 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) dc.SetPen( *wxWHITE_PEN ); dc.DrawLine( 1, rowTop, 1, rowBottom ); dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop ); - +#endif dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); dc.SetFont( GetLabelFont() ); @@ -7064,7 +7469,6 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) int hAlign, vAlign; GetRowLabelAlignment( &hAlign, &vAlign ); - wxRect rect; rect.SetX( 2 ); rect.SetY( GetRowTop(row) + 2 ); rect.SetWidth( m_rowLabelWidth - 4 ); @@ -7072,10 +7476,10 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign ); } - void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) { - if ( !m_numCols ) return; + if ( !m_numCols ) + return; size_t i; size_t numLabels = cols.GetCount(); @@ -7086,14 +7490,25 @@ void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) } } - void wxGrid::DrawColLabel( wxDC& dc, int col ) { - if ( GetColWidth(col) <= 0 ) + if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 ) return; - int colLeft = GetColLeft(col), - colRight = GetColRight(col) - 1; + 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; dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) ); dc.DrawLine( colRight, 0, @@ -7107,7 +7522,7 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) dc.SetPen( *wxWHITE_PEN ); dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 ); dc.DrawLine( colLeft, 1, colRight, 1 ); - +#endif dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); dc.SetFont( GetLabelFont() ); @@ -7116,7 +7531,6 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) GetColLabelAlignment( &hAlign, &vAlign ); orient = GetColLabelTextOrientation(); - wxRect rect; rect.SetX( colLeft + 2 ); rect.SetY( 2 ); rect.SetWidth( GetColWidth(col) - 4 ); @@ -7135,7 +7549,6 @@ void wxGrid::DrawTextRectangle( wxDC& dc, StringToLines( value, lines ); - //Forward to new API. DrawTextRectangle( dc, lines, @@ -7153,34 +7566,34 @@ void wxGrid::DrawTextRectangle( wxDC& dc, int vertAlign, int textOrientation ) { - long textWidth, textHeight; - long lineWidth, lineHeight; + long textWidth = 0, textHeight = 0; + long lineWidth = 0, lineHeight = 0; int nLines; dc.SetClippingRegion( rect ); nLines = lines.GetCount(); - if( nLines > 0 ) + if ( nLines > 0 ) { int l; float x = 0.0, y = 0.0; - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) GetTextBoxSize(dc, lines, &textWidth, &textHeight); else GetTextBoxSize( dc, lines, &textHeight, &textWidth ); - switch( vertAlign ) + switch ( vertAlign ) { case wxALIGN_BOTTOM: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) y = rect.y + (rect.height - textHeight - 1); else x = rect.x + rect.width - textWidth; break; case wxALIGN_CENTRE: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) y = rect.y + ((rect.height - textHeight)/2); else x = rect.x + ((rect.width - textWidth)/2); @@ -7188,7 +7601,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc, case wxALIGN_TOP: default: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) y = rect.y + 1; else x = rect.x + 1; @@ -7196,21 +7609,21 @@ void wxGrid::DrawTextRectangle( wxDC& dc, } // Align each line of a multi-line label - for( l = 0; l < nLines; l++ ) + for ( l = 0; l < nLines; l++ ) { dc.GetTextExtent(lines[l], &lineWidth, &lineHeight); - switch( horizAlign ) + switch ( horizAlign ) { case wxALIGN_RIGHT: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) x = rect.x + (rect.width - lineWidth - 1); else y = rect.y + lineWidth + 1; break; case wxALIGN_CENTRE: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) x = rect.x + ((rect.width - lineWidth)/2); else y = rect.y + rect.height - ((rect.height - lineWidth)/2); @@ -7218,14 +7631,14 @@ void wxGrid::DrawTextRectangle( wxDC& dc, case wxALIGN_LEFT: default: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) x = rect.x + 1; else y = rect.y + rect.height - 1; break; } - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) { dc.DrawText( lines[l], (int)x, (int)y ); y += lineHeight; @@ -7237,6 +7650,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc, } } } + dc.DestroyClippingRegion(); } @@ -7266,8 +7680,9 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) { lines.Add( value.Mid(startPos, pos) ); } - startPos += pos+1; + startPos += pos + 1; } + if ( startPos < (int)value.Length() ) { lines.Add( value.Mid( startPos ) ); @@ -7275,13 +7690,13 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) } -void wxGrid::GetTextBoxSize( wxDC& dc, +void wxGrid::GetTextBoxSize( const wxDC& dc, const wxArrayString& lines, long *width, long *height ) { long w = 0; long h = 0; - long lineW, lineH; + long lineW = 0, lineH = 0; size_t i; for ( i = 0; i < lines.GetCount(); i++ ) @@ -7324,32 +7739,39 @@ void wxGrid::ForceRefresh() EndBatch(); } +bool wxGrid::Enable(bool enable) +{ + if ( !wxScrolledWindow::Enable(enable) ) + return false; + + // redraw in the new state + m_gridWin->Refresh(); + + return true; +} + // // ------ Edit control functions // - void wxGrid::EnableEditing( bool edit ) { // TODO: improve this ? // if ( edit != m_editable ) { - if(!edit) EnableCellEditControl(edit); + if (!edit) + EnableCellEditControl(edit); m_editable = edit; } } - void wxGrid::EnableCellEditControl( bool enable ) { if (! m_editable) return; - if ( m_currentCellCoords == wxGridNoCellCoords ) - SetCurrentCell( 0, 0 ); - if ( enable != m_cellEditCtrlEnabled ) { if ( enable ) @@ -7392,19 +7814,21 @@ bool wxGrid::IsCurrentCellReadOnly() const bool wxGrid::CanEnableCellControl() const { - return m_editable && !IsCurrentCellReadOnly(); + return m_editable && (m_currentCellCoords != wxGridNoCellCoords) && + !IsCurrentCellReadOnly(); + } bool wxGrid::IsCellEditControlEnabled() const { // the cell edit control might be disable for all cells or just for the // current one if it's read only - return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE; + return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : false; } bool wxGrid::IsCellEditControlShown() const { - bool isShown = FALSE; + bool isShown = false; if ( m_cellEditCtrlEnabled ) { @@ -7432,9 +7856,9 @@ void wxGrid::ShowCellEditControl() { if ( IsCellEditControlEnabled() ) { - if ( !IsVisible( m_currentCellCoords ) ) + if ( !IsVisible( m_currentCellCoords, false ) ) { - m_cellEditCtrlEnabled = FALSE; + m_cellEditCtrlEnabled = false; return; } else @@ -7458,6 +7882,10 @@ void wxGrid::ShowCellEditControl() // CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + int nXMove = 0; + if(rect.x < 0) + nXMove = rect.x; + // done in PaintBackground() #if 0 // erase the highlight and the cell contents because the editor @@ -7482,7 +7910,7 @@ void wxGrid::ShowCellEditControl() wxGridCellEditor* editor = attr->GetEditor(this, row, col); if ( !editor->IsCreated() ) { - editor->Create(m_gridWin, -1, + editor->Create(m_gridWin, wxID_ANY, new wxGridCellEditorEvtHandler(this, editor)); wxGridEditorCreatedEvent evt(GetId(), @@ -7505,6 +7933,7 @@ void wxGrid::ShowCellEditControl() NULL, NULL, &attr->GetFont()); if (maxWidth < rect.width) maxWidth = rect.width; } + int client_right = m_gridWin->GetClientSize().GetWidth(); if (rect.x+maxWidth > client_right) maxWidth = client_right - rect.x; @@ -7524,13 +7953,27 @@ void wxGrid::ShowCellEditControl() else break; } + if (rect.GetRight() > client_right) - rect.SetRight(client_right-1); + rect.SetRight(client_right - 1); } editor->SetCellAttr(attr); editor->SetSize( rect ); - editor->Show( TRUE, attr ); + editor->GetControl()->Move(editor->GetControl()->GetPosition().x + nXMove, editor->GetControl()->GetPosition().y); + editor->Show( true, attr ); + + int colXPos = 0; + for (int i = 0; i < m_currentCellCoords.GetCol(); i++) + { + colXPos += GetColSize(i); + } + int xUnit=1, yUnit=1; + GetScrollPixelsPerUnit(&xUnit, &yUnit); + if (m_currentCellCoords.GetCol() != 0) + Scroll(colXPos/xUnit-1, GetScrollPos(wxVERTICAL)); + else + Scroll(colXPos/xUnit, GetScrollPos(wxVERTICAL)); // recalc dimensions in case we need to // expand the scrolled window to account for editor @@ -7545,7 +7988,6 @@ void wxGrid::ShowCellEditControl() } } - void wxGrid::HideCellEditControl() { if ( IsCellEditControlEnabled() ) @@ -7555,19 +7997,24 @@ void wxGrid::HideCellEditControl() wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor *editor = attr->GetEditor(this, row, col); - editor->Show( FALSE ); + editor->Show( false ); editor->DecRef(); attr->DecRef(); + m_gridWin->SetFocus(); + // refresh whole row to the right wxRect rect( CellToRect(row, col) ); CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y ); rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x; - m_gridWin->Refresh( FALSE, &rect ); +#ifdef __WXMAC__ + // ensure that the pixels under the focus ring get refreshed as well + rect.Inflate(10, 10); +#endif + m_gridWin->Refresh( false, &rect ); } } - void wxGrid::SaveEditControlValue() { if ( IsCellEditControlEnabled() ) @@ -7575,7 +8022,7 @@ void wxGrid::SaveEditControlValue() int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - wxString oldval = GetCellValue(row,col); + wxString oldval = GetCellValue(row, col); wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); @@ -7588,10 +8035,10 @@ void wxGrid::SaveEditControlValue() { if ( SendEvent( wxEVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() ) < 0 ) { - + m_currentCellCoords.GetCol() ) < 0 ) + { // Event has been vetoed, set the data back. - SetCellValue(row,col,oldval); + SetCellValue(row, col, oldval); } } } @@ -7630,11 +8077,9 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, const wxArrayInt& BorderArray, int nMax, bool clipToMinMax) { - if (coord < 0) return clipToMinMax && (nMax > 0) ? 0 : -1; - if (!defaultDist) defaultDist = 1; @@ -7643,7 +8088,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, if (BorderArray.IsEmpty()) { - if((int) i_max < nMax) + if ((int) i_max < nMax) return i_max; return clipToMinMax ? nMax - 1 : -1; } @@ -7655,11 +8100,16 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, if ( coord >= BorderArray[i_max]) { i_min = i_max; - i_max = coord / minDist; + if (minDist) + i_max = coord / minDist; + else + i_max = BorderArray.GetCount() - 1; } + if ( i_max >= BorderArray.GetCount()) i_max = BorderArray.GetCount() - 1; } + if ( coord >= BorderArray[i_max]) return clipToMinMax ? (int)i_max : -1; if ( coord < BorderArray[0] ) @@ -7679,23 +8129,22 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, else i_min = median; } + return i_max; } int wxGrid::YToRow( int y ) { return CoordToRowOrCol(y, m_defaultRowHeight, - m_minAcceptableRowHeight, m_rowBottoms, m_numRows, FALSE); + m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false); } - int wxGrid::XToCol( int x ) { return CoordToRowOrCol(x, m_defaultColWidth, - m_minAcceptableColWidth, m_colRights, m_numCols, FALSE); + m_minAcceptableColWidth, m_colRights, m_numCols, false); } - // return the row number that that the y coord is near the edge of, or // -1 if not near an edge // @@ -7710,14 +8159,13 @@ int wxGrid::YToEdgeOfRow( int y ) // close enough to lower or upper border, respectively. if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE ) return i; - else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE ) + else if ( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE ) return i - 1; } return -1; } - // return the col number that that the x coord is near the edge of, or // -1 if not near an edge // @@ -7732,14 +8180,13 @@ int wxGrid::XToEdgeOfCol( int x ) // close enough to right or left border, respectively. if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE ) return i; - else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE ) + else if ( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE ) return i - 1; } return -1; } - wxRect wxGrid::CellToRect( int row, int col ) { wxRect rect( -1, -1, -1, -1 ); @@ -7764,14 +8211,15 @@ wxRect wxGrid::CellToRect( int row, int col ) } // if grid lines are enabled, then the area of the cell is a bit smaller - if (m_gridLinesEnabled) { + if (m_gridLinesEnabled) + { rect.width -= 1; rect.height -= 1; } + return rect; } - bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) { // get the cell rectangle in logical coords @@ -7805,13 +8253,11 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) } } - // make the specified cell location visible by doing a minimal amount // of scrolling // void wxGrid::MakeCellVisible( int row, int col ) { - int i; int xpos = -1, ypos = -1; @@ -7855,10 +8301,14 @@ void wxGrid::MakeCellVisible( int row, int col ) // // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full // scroll unit... - ypos += GRID_SCROLL_LINE_Y; + 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(); } @@ -7870,15 +8320,15 @@ void wxGrid::MakeCellVisible( int row, int col ) xpos = x0 + (right - cw); // see comment for ypos above - xpos += GRID_SCROLL_LINE_X; + xpos += m_scrollLineX; } if ( xpos != -1 || ypos != -1 ) { if ( xpos != -1 ) - xpos /= GRID_SCROLL_LINE_X; + xpos /= m_scrollLineX; if ( ypos != -1 ) - ypos /= GRID_SCROLL_LINE_Y; + ypos /= m_scrollLineY; Scroll( xpos, ypos ); AdjustScrollbars(); } @@ -7909,18 +8359,19 @@ bool wxGrid::MoveCursorUp( bool expandSelection ) } else if ( m_currentCellCoords.GetRow() > 0 ) { + int row = m_currentCellCoords.GetRow() - 1; + int col = m_currentCellCoords.GetCol(); ClearSelection(); - MakeCellVisible( m_currentCellCoords.GetRow() - 1, - m_currentCellCoords.GetCol() ); - SetCurrentCell( m_currentCellCoords.GetRow() - 1, - m_currentCellCoords.GetCol() ); + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); } else - return FALSE; - return TRUE; + return false; + + return true; } - return FALSE; + return false; } @@ -7943,21 +8394,21 @@ bool wxGrid::MoveCursorDown( bool expandSelection ) } else if ( m_currentCellCoords.GetRow() < m_numRows - 1 ) { + int row = m_currentCellCoords.GetRow() + 1; + int col = m_currentCellCoords.GetCol(); ClearSelection(); - MakeCellVisible( m_currentCellCoords.GetRow() + 1, - m_currentCellCoords.GetCol() ); - SetCurrentCell( m_currentCellCoords.GetRow() + 1, - m_currentCellCoords.GetCol() ); + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); } else - return FALSE; - return TRUE; + return false; + + return true; } - return FALSE; + return false; } - bool wxGrid::MoveCursorLeft( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && @@ -7977,21 +8428,21 @@ bool wxGrid::MoveCursorLeft( bool expandSelection ) } else if ( m_currentCellCoords.GetCol() > 0 ) { + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol() - 1; ClearSelection(); - MakeCellVisible( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() - 1 ); - SetCurrentCell( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() - 1 ); + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); } else - return FALSE; - return TRUE; + return false; + + return true; } - return FALSE; + return false; } - bool wxGrid::MoveCursorRight( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && @@ -8011,24 +8462,25 @@ bool wxGrid::MoveCursorRight( bool expandSelection ) } else if ( m_currentCellCoords.GetCol() < m_numCols - 1 ) { + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol() + 1; ClearSelection(); - MakeCellVisible( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() + 1 ); - SetCurrentCell( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() + 1 ); + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); } else - return FALSE; - return TRUE; + return false; + + return true; } - return FALSE; + return false; } - bool wxGrid::MovePageUp() { - if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE; + if ( m_currentCellCoords == wxGridNoCellCoords ) + return false; int row = m_currentCellCoords.GetRow(); if ( row > 0 ) @@ -8041,22 +8493,23 @@ 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; } MakeCellVisible( newRow, m_currentCellCoords.GetCol() ); SetCurrentCell( newRow, m_currentCellCoords.GetCol() ); - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MovePageDown() { - if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE; + if ( m_currentCellCoords == wxGridNoCellCoords ) + return false; int row = m_currentCellCoords.GetRow(); if ( (row+1) < m_numRows ) @@ -8069,16 +8522,16 @@ bool wxGrid::MovePageDown() if ( newRow == row ) { // row < m_numRows , so newrow can't overflow here. - newRow = row + 1; + newRow = row + 1; } MakeCellVisible( newRow, m_currentCellCoords.GetCol() ); SetCurrentCell( newRow, m_currentCellCoords.GetCol() ); - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorUpBlock( bool expandSelection ) @@ -8098,7 +8551,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) while ( row > 0 ) { row-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row-1, col) ) @@ -8109,7 +8563,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) while ( row > 0 ) { row-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8138,10 +8593,11 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) ClearSelection(); SetCurrentCell( row, col ); } - return TRUE; + + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorDownBlock( bool expandSelection ) @@ -8161,7 +8617,8 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) while ( row < m_numRows-1 ) { row++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row+1, col) ) @@ -8172,7 +8629,8 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) while ( row < m_numRows-1 ) { row++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8202,10 +8660,10 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) @@ -8225,7 +8683,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) while ( col > 0 ) { col-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row, col-1) ) @@ -8236,7 +8695,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) while ( col > 0 ) { col-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8266,10 +8726,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorRightBlock( bool expandSelection ) @@ -8289,7 +8749,8 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) while ( col < m_numCols-1 ) { col++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row, col+1) ) @@ -8300,7 +8761,8 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) while ( col < m_numCols-1 ) { col++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8330,10 +8792,10 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } @@ -8395,18 +8857,18 @@ void wxGrid::SetRowLabelSize( int width ) { if ( width == 0 ) { - m_rowLabelWin->Show( FALSE ); - m_cornerLabelWin->Show( FALSE ); + m_rowLabelWin->Show( false ); + m_cornerLabelWin->Show( false ); } else if ( m_rowLabelWidth == 0 ) { - m_rowLabelWin->Show( TRUE ); - if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE ); + m_rowLabelWin->Show( true ); + if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true ); } m_rowLabelWidth = width; CalcWindowSizes(); - wxScrolledWindow::Refresh( TRUE ); + wxScrolledWindow::Refresh( true ); } } @@ -8418,18 +8880,18 @@ void wxGrid::SetColLabelSize( int height ) { if ( height == 0 ) { - m_colLabelWin->Show( FALSE ); - m_cornerLabelWin->Show( FALSE ); + m_colLabelWin->Show( false ); + m_cornerLabelWin->Show( false ); } else if ( m_colLabelHeight == 0 ) { - m_colLabelWin->Show( TRUE ); - if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE ); + m_colLabelWin->Show( true ); + if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true ); } m_colLabelHeight = height; CalcWindowSizes(); - wxScrolledWindow::Refresh( TRUE ); + wxScrolledWindow::Refresh( true ); } } @@ -8541,16 +9003,16 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert ) } } -// Note: under MSW, the default column label font must be changed because it -// does not support vertical printing +// Note: under MSW, the default column label font must be changed because it +// does not support vertical printing // // Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD); -// pGrid->SetLabelFont(font); -// pGrid->SetColLabelTextOrientation(wxVERTICAL); +// pGrid->SetLabelFont(font); +// pGrid->SetColLabelTextOrientation(wxVERTICAL); // void wxGrid::SetColLabelTextOrientation( int textOrientation ) { - if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL ) + if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL ) { m_colLabelTextOrientation = textOrientation; } @@ -8574,7 +9036,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s ) CalcScrolledPosition(0, rect.y, &rect.x, &rect.y); rect.x = 0; rect.width = m_rowLabelWidth; - m_rowLabelWin->Refresh( TRUE, &rect ); + m_rowLabelWin->Refresh( true, &rect ); } } } @@ -8593,7 +9055,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s ) CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y); rect.y = 0; rect.height = m_colLabelHeight; - m_colLabelWin->Refresh( TRUE, &rect ); + m_colLabelWin->Refresh( true, &rect ); } } } @@ -8628,7 +9090,8 @@ void wxGrid::SetCellHighlightColour( const wxColour& colour ) void wxGrid::SetCellHighlightPenWidth(int width) { - if (m_cellHighlightPenWidth != width) { + if (m_cellHighlightPenWidth != width) + { m_cellHighlightPenWidth = width; // Just redrawing the cell highlight is not enough since that won't @@ -8638,13 +9101,14 @@ void wxGrid::SetCellHighlightPenWidth(int width) if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; wxRect rect = CellToRect(row, col); - m_gridWin->Refresh(TRUE, &rect); + m_gridWin->Refresh(true, &rect); } } void wxGrid::SetCellHighlightROPenWidth(int width) { - if (m_cellHighlightROPenWidth != width) { + if (m_cellHighlightROPenWidth != width) + { m_cellHighlightROPenWidth = width; // Just redrawing the cell highlight is not enough since that won't @@ -8654,7 +9118,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width) if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; wxRect rect = CellToRect(row, col); - m_gridWin->Refresh(TRUE, &rect); + m_gridWin->Refresh(true, &rect); } } @@ -8742,14 +9206,24 @@ 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 +// work correctly. + void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) { - m_defaultCellAttr->SetRenderer(renderer); + RegisterDataType(wxGRID_VALUE_STRING, + renderer, + GetDefaultEditorForType(wxGRID_VALUE_STRING)); } void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) { - m_defaultCellAttr->SetEditor(editor); + RegisterDataType(wxGRID_VALUE_STRING, + GetDefaultRendererForType(wxGRID_VALUE_STRING), + editor); } // ---------------------------------------------------------------------------- @@ -8788,7 +9262,7 @@ wxGridCellRenderer *wxGrid::GetDefaultRenderer() const wxGridCellEditor *wxGrid::GetDefaultEditor() const { - return m_defaultCellAttr->GetEditor(NULL,0,0); + return m_defaultCellAttr->GetEditor(NULL, 0, 0); } // ---------------------------------------------------------------------------- @@ -8831,6 +9305,7 @@ bool wxGrid::GetCellOverflow( int row, int col ) wxGridCellAttr *attr = GetCellAttr(row, col); bool allow = attr->GetOverflow(); attr->DecRef(); + return allow; } @@ -8864,6 +9339,7 @@ bool wxGrid::IsReadOnly(int row, int col) const wxGridCellAttr* attr = GetCellAttr(row, col); bool isReadOnly = attr->IsReadOnly(); attr->DecRef(); + return isReadOnly; } @@ -8875,7 +9351,7 @@ bool wxGrid::CanHaveAttributes() { if ( !m_table ) { - return FALSE; + return false; } return m_table->CanHaveAttributes(); @@ -8916,14 +9392,15 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const gs_nAttrCacheHits++; #endif - return TRUE; + return true; } else { #ifdef DEBUG_ATTR_CACHE gs_nAttrCacheMisses++; #endif - return FALSE; + + return false; } } @@ -8941,6 +9418,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const CacheAttr(row, col, attr); } } + if (attr) { attr->SetDefAttr(m_defaultCellAttr); @@ -8957,9 +9435,10 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const { wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + bool canHave = ((wxGrid*)this)->CanHaveAttributes(); - wxCHECK_MSG( m_table, attr, - _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") ); + wxCHECK_MSG( canHave, attr, _T("Cell attributes not allowed")); + wxCHECK_MSG( m_table, attr, _T("must have a table") ); attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell); if ( !attr ) @@ -9001,10 +9480,8 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision) void wxGrid::SetColFormatCustom(int col, const wxString& typeName) { - wxGridCellAttr *attr = (wxGridCellAttr *)NULL; - - attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); - if(!attr) + wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); + if (!attr) attr = new wxGridCellAttr; wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); attr->SetRenderer(renderer); @@ -9225,7 +9702,10 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const int index = m_typeRegistry->FindOrCloneDataType(typeName); if ( index == wxNOT_FOUND ) { - wxFAIL_MSG(wxT("Unknown data type name")); + wxString errStr; + + errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str()); + wxFAIL_MSG(errStr.c_str()); return NULL; } @@ -9239,7 +9719,10 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const int index = m_typeRegistry->FindOrCloneDataType(typeName); if ( index == wxNOT_FOUND ) { - wxFAIL_MSG(wxT("Unknown data type name")); + wxString errStr; + + errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str()); + wxFAIL_MSG(errStr.c_str()); return NULL; } @@ -9247,7 +9730,6 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const return m_typeRegistry->GetRenderer(index); } - // ---------------------------------------------------------------------------- // row/col size // ---------------------------------------------------------------------------- @@ -9257,7 +9739,6 @@ void wxGrid::EnableDragRowSize( bool enable ) m_canDragRowSize = enable; } - void wxGrid::EnableDragColSize( bool enable ) { m_canDragColSize = enable; @@ -9268,6 +9749,10 @@ void wxGrid::EnableDragGridSize( bool enable ) m_canDragGridSize = enable; } +void wxGrid::EnableDragCell( bool enable ) +{ + m_canDragCell = enable; +} void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) { @@ -9291,7 +9776,8 @@ void wxGrid::SetRowSize( int row, int height ) wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") ); // See comment in SetColSize - if ( height < GetRowMinimalAcceptableHeight()) { return; } + if ( height < GetRowMinimalAcceptableHeight()) + return; if ( m_rowHeights.IsEmpty() ) { @@ -9336,13 +9822,14 @@ 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 + // what he is doing. However whe should test against the weaker // constariant of minimalAcceptableWidth, as this breaks rendering - // + // // This test then fixes sf.net bug #645734 - - if ( width < GetColMinimalAcceptableWidth()) { return; } - + + if ( width < GetColMinimalAcceptableWidth() ) + return; + if ( m_colWidths.IsEmpty() ) { // need to really create the array @@ -9350,7 +9837,7 @@ void wxGrid::SetColSize( int col, int width ) } // if < 0 calc new width from label - if( width < 0 ) + if ( width < 0 ) { long w, h; wxArrayString lines; @@ -9360,6 +9847,7 @@ void wxGrid::SetColSize( int col, int width ) GetTextBoxSize(dc, lines, &w, &h); width = w + 6; } + int w = wxMax( 0, width ); int diff = w - m_colWidths[col]; m_colWidths[col] = w; @@ -9369,50 +9857,60 @@ void wxGrid::SetColSize( int col, int width ) { m_colRights[i] += diff; } + if ( !GetBatchCount() ) CalcDimensions(); } - void wxGrid::SetColMinimalWidth( int col, int width ) { - if (width > GetColMinimalAcceptableWidth()) { - m_colMinWidths[col] = width; + if (width > GetColMinimalAcceptableWidth()) + { + wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col; + m_colMinWidths[key] = width; } } void wxGrid::SetRowMinimalHeight( int row, int width ) { - if (width > GetRowMinimalAcceptableHeight()) { - m_rowMinHeights[row] = width; + if (width > GetRowMinimalAcceptableHeight()) + { + wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row; + m_rowMinHeights[key] = width; } } int wxGrid::GetColMinimalWidth(int col) const { - wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(col); + wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col; + wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key); + return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth; } int wxGrid::GetRowMinimalHeight(int row) const { - wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(row); + wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row; + wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key); + return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight; } void wxGrid::SetColMinimalAcceptableWidth( int width ) { - if ( width<1 ) - return; - m_minAcceptableColWidth = width; + // We do allow a width of 0 since this gives us + // an easy way to temporarily hiding columns. + if ( width >= 0 ) + m_minAcceptableColWidth = width; } void wxGrid::SetRowMinimalAcceptableHeight( int height ) { - if ( height<1 ) - return; - m_minAcceptableRowHeight = height; -}; + // We do allow a height of 0 since this gives us + // an easy way to temporarily hiding rows. + if ( height >= 0 ) + m_minAcceptableRowHeight = height; +} int wxGrid::GetColMinimalAcceptableWidth() const { @@ -9432,7 +9930,11 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) { wxClientDC dc(m_gridWin); - // init both of them to avoid compiler warnings, even if weo nly need one + // cancel editing of cell + HideCellEditControl(); + SaveEditControlValue(); + + // init both of them to avoid compiler warnings, even if we only need one int row = -1, col = -1; if ( column ) @@ -9473,7 +9975,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) if ( column ) { dc.GetTextExtent( GetColLabelValue(col), &w, &h ); - if( GetColLabelTextOrientation() == wxVERTICAL ) + if ( GetColLabelTextOrientation() == wxVERTICAL ) w = h; } else @@ -9494,19 +9996,15 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) else { if ( column ) - { // leave some space around text extentMax += 10; - } else - { extentMax += 6; - } } if ( column ) { - SetColSize(col, extentMax); + SetColSize( col, extentMax ); if ( !GetBatchCount() ) { int cw, ch, dummy; @@ -9516,7 +10014,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); rect.width = cw - rect.x; rect.height = m_colLabelHeight; - m_colLabelWin->Refresh( TRUE, &rect ); + m_colLabelWin->Refresh( true, &rect ); } } else @@ -9531,7 +10029,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) CalcScrolledPosition(0, rect.y, &dummy, &rect.y); rect.width = m_rowLabelWidth; rect.height = ch - rect.y; - m_rowLabelWin->Refresh( TRUE, &rect ); + m_rowLabelWin->Refresh( true, &rect ); } } if ( setAsMin ) @@ -9576,9 +10074,7 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) for ( int row = 0; row < m_numRows; row++ ) { if ( !calcOnly ) - { AutoSizeRow(row, setAsMin); - } height += GetRowHeight(row); } @@ -9593,14 +10089,14 @@ void wxGrid::AutoSize() { BeginBatch(); - wxSize size(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); + wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false)); // 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) * GRID_SCROLL_LINE_X, - GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y); + wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * m_scrollLineX, + GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY); // distribute the extra space between the columns/rows to avoid having // extra white space @@ -9666,8 +10162,8 @@ void wxGrid::AutoSizeRowLabelSize( int row ) long w, h; // Hide the edit control, so it - // won't interfer with drag-shrinking. - if( IsCellEditControlShown() ) + // won't interfere with drag-shrinking. + if ( IsCellEditControlShown() ) { HideCellEditControl(); SaveEditControlValue(); @@ -9677,7 +10173,7 @@ void wxGrid::AutoSizeRowLabelSize( int row ) StringToLines( GetRowLabelValue( row ), lines ); wxClientDC dc( m_rowLabelWin ); GetTextBoxSize( dc, lines, &w, &h); - if( h < m_defaultRowHeight ) + if ( h < m_defaultRowHeight ) h = m_defaultRowHeight; SetRowSize(row, h); ForceRefresh(); @@ -9690,7 +10186,7 @@ void wxGrid::AutoSizeColLabelSize( int col ) // Hide the edit control, so it // won't interfer with drag-shrinking. - if( IsCellEditControlShown() ) + if ( IsCellEditControlShown() ) { HideCellEditControl(); SaveEditControlValue(); @@ -9699,11 +10195,11 @@ void wxGrid::AutoSizeColLabelSize( int col ) // autosize column width depending on label text StringToLines( GetColLabelValue( col ), lines ); wxClientDC dc( m_colLabelWin ); - if( GetColLabelTextOrientation() == wxHORIZONTAL ) + if ( GetColLabelTextOrientation() == wxHORIZONTAL ) GetTextBoxSize( dc, lines, &w, &h); else GetTextBoxSize( dc, lines, &h, &w); - if( w < m_defaultColWidth ) + if ( w < m_defaultColWidth ) w = m_defaultColWidth; SetColSize(col, w); ForceRefresh(); @@ -9715,16 +10211,42 @@ wxSize wxGrid::DoGetBestSize() const wxGrid *self = (wxGrid *)this; // const_cast int width, height; - width = self->SetOrCalcColumnSizes(TRUE); - height = self->SetOrCalcRowSizes(TRUE); - + 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 ); + wxDisplaySize( &maxwidth, &maxheight ); + maxwidth /= 2; + maxheight /= 2; + if ( width > maxwidth ) + width = maxwidth; + if ( height > maxheight ) + height = maxheight; - if ( width > maxwidth ) width = maxwidth; - if ( height > maxheight ) height = maxheight; + wxSize best(width, height); - return wxSize( width, height ); + // 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; } void wxGrid::Fit() @@ -9732,7 +10254,6 @@ void wxGrid::Fit() AutoSize(); } - wxPen& wxGrid::GetDividerPen() const { return wxNullPen; @@ -9754,7 +10275,7 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) rect.x = 0; rect.width = m_gridWin->GetClientSize().GetWidth(); CalcScrolledPosition(0, rect.y, &dummy, &rect.y); - m_gridWin->Refresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } if ( m_currentCellCoords.GetRow() == row && @@ -9771,9 +10292,9 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) } -// -// ------ Block, row and col selection -// +// ---------------------------------------------------------------------------- +// block, row and col selection +// ---------------------------------------------------------------------------- void wxGrid::SelectRow( int row, bool addToSelected ) { @@ -9781,20 +10302,18 @@ void wxGrid::SelectRow( int row, bool addToSelected ) ClearSelection(); if ( m_selection ) - m_selection->SelectRow( row, FALSE, addToSelected ); + m_selection->SelectRow( row, false, addToSelected ); } - void wxGrid::SelectCol( int col, bool addToSelected ) { if ( IsSelection() && !addToSelected ) ClearSelection(); if ( m_selection ) - m_selection->SelectCol( col, FALSE, addToSelected ); + m_selection->SelectCol( col, false, addToSelected ); } - void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, bool addToSelected ) { @@ -9803,10 +10322,9 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, if ( m_selection ) m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, - FALSE, addToSelected ); + false, addToSelected ); } - void wxGrid::SelectAll() { if ( m_numRows > 0 && m_numCols > 0 ) @@ -9816,9 +10334,9 @@ void wxGrid::SelectAll() } } -// -// ------ Cell, row and col deselection -// +// ---------------------------------------------------------------------------- +// cell, row and col deselection +// ---------------------------------------------------------------------------- void wxGrid::DeselectRow( int row ) { @@ -9886,31 +10404,59 @@ bool wxGrid::IsInSelection( int row, int col ) const wxGridCellCoordsArray wxGrid::GetSelectedCells() const { - if (!m_selection) { wxGridCellCoordsArray a; return a; } + if (!m_selection) + { + wxGridCellCoordsArray a; + return a; + } + return m_selection->m_cellSelection; } + wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const { - if (!m_selection) { wxGridCellCoordsArray a; return a; } + if (!m_selection) + { + wxGridCellCoordsArray a; + return a; + } + return m_selection->m_blockSelectionTopLeft; } + wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const { - if (!m_selection) { wxGridCellCoordsArray a; return a; } + if (!m_selection) + { + wxGridCellCoordsArray a; + return a; + } + return m_selection->m_blockSelectionBottomRight; } + wxArrayInt wxGrid::GetSelectedRows() const { - if (!m_selection) { wxArrayInt a; return a; } + if (!m_selection) + { + wxArrayInt a; + return a; + } + return m_selection->m_rowSelection; } + wxArrayInt wxGrid::GetSelectedCols() const { - if (!m_selection) { wxArrayInt a; return a; } + if (!m_selection) + { + wxArrayInt a; + return a; + } + return m_selection->m_colSelection; } - void wxGrid::ClearSelection() { m_selectingTopLeft = wxGridNoCellCoords; @@ -9936,7 +10482,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, } else { - rect = wxRect( 0, 0, 0, 0 ); + rect = wxRect(0, 0, 0, 0); } cellRect = CellToRect( bottomRight ); @@ -9966,7 +10512,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, left = right; right = i; i = leftCol; - leftCol=rightCol; + leftCol = rightCol; rightCol = i; } @@ -9980,12 +10526,11 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, bottomRow = i; } - for ( j = topRow; j <= bottomRow; j++ ) { for ( i = leftCol; i <= rightCol; i++ ) { - if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol)) + if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol)) { cellRect = CellToRect( j, i ); @@ -9998,7 +10543,10 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, if (cellRect.y + cellRect.height > bottom) bottom = cellRect.y + cellRect.height; } - else i = rightCol; // jump over inner cells. + else + { + i = rightCol; // jump over inner cells. + } } } @@ -10011,7 +10559,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, m_gridWin->GetClientSize( &cw, &ch ); if (right < 0 || bottom < 0 || left > cw || top > ch) - return wxRect( 0, 0, 0, 0); + return wxRect(0,0,0,0); rect.SetLeft( wxMax(0, left) ); rect.SetTop( wxMax(0, top) ); @@ -10021,9 +10569,9 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, return rect; } -// -// ------ Grid event classes -// +// ---------------------------------------------------------------------------- +// grid event classes +// ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )