X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fe737557344dcf31299aea827e4b87c998ec940..2296fe5018d42d4e0bf9df07c37d31f60d972b32:/src/generic/grid.cpp?ds=sidebyside diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 74de24b9f7..3e558a168a 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -47,6 +47,7 @@ #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" @@ -109,6 +110,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) @@ -141,6 +143,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) DECLARE_EVENT_TABLE() @@ -163,6 +166,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) DECLARE_EVENT_TABLE() @@ -184,6 +188,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) @@ -205,7 +210,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 ); @@ -221,6 +226,7 @@ private: void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); void OnEraseBackground( wxEraseEvent& ); void OnFocus( wxFocusEvent& ); @@ -234,27 +240,37 @@ 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() @@ -412,6 +428,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 // ---------------------------------------------------------------------------- @@ -425,6 +442,7 @@ static inline int GetScrollY(int y) { return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y; } +#endif // ============================================================================ // implementation @@ -475,7 +493,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; @@ -499,9 +517,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 } @@ -520,12 +540,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 } } @@ -543,8 +565,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) @@ -660,10 +714,10 @@ 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); @@ -692,48 +746,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; } } @@ -795,10 +847,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); @@ -806,6 +859,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent, wxGridCellEditor::Create(parent, id, evtHandler); } else +#endif { // just a text control wxGridCellTextEditor::Create(parent, id, evtHandler); @@ -828,19 +882,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()); } @@ -853,6 +909,7 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, long value = 0; wxString text; +#if wxUSE_SPINCTRL if ( HasRange() ) { value = Spin()->GetValue(); @@ -861,9 +918,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 ) @@ -879,11 +937,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()); } @@ -894,55 +954,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); @@ -950,7 +977,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(); } @@ -985,18 +1023,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; } // ---------------------------------------------------------------------------- @@ -1032,7 +1073,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; @@ -1048,16 +1089,16 @@ 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)) && (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() @@ -1071,24 +1112,15 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) char tmpbuf[2]; tmpbuf[0] = (char) keycode; tmpbuf[1] = '\0'; - bool is_decimal_point = ( wxString(tmpbuf, *wxConvCurrent) == - wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) ); - if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-' - || is_decimal_point - || 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) + 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); @@ -1153,45 +1185,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', also '-', '+', and '.' - char tmpbuf[2]; - tmpbuf[0] = (char) keycode; - tmpbuf[1] = '\0'; - bool is_decimal_point = - ( wxString(tmpbuf, *wxConvCurrent) == - wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, - wxLOCALE_CAT_NUMBER) ); - if ( (keycode < 128) && - (wxIsdigit(keycode) || tolower(keycode) == 'e' || - is_decimal_point || keycode == '+' || keycode == '-') ) - 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 @@ -1215,7 +1228,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); @@ -1226,7 +1239,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 ) @@ -1234,7 +1247,7 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) // leave 1 pixel margin size.x = size.y = minSize - 2; - resize = TRUE; + resize = true; } if ( resize ) @@ -1315,10 +1328,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 ) { @@ -1351,22 +1364,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 { @@ -1440,6 +1467,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) @@ -1448,30 +1483,27 @@ 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) + evtHandler->SetInSetFocus(false); } bool wxGridCellChoiceEditor::EndEdit(int row, int col, wxGrid* grid) { wxString value = Combo()->GetValue(); - bool changed = value != m_startValue; - - if ( changed ) - grid->GetTable()->SetValue(row, col, value); + if ( value == m_startValue ) + return false; - 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() @@ -1509,6 +1541,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() ) @@ -1528,7 +1572,6 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) m_editor->HandleReturn(event); break; - default: event.Skip(); } @@ -1583,18 +1626,18 @@ void wxGridCellRenderer::Draw(wxGrid& grid, // grey out fields if the grid is disabled 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 ); @@ -1630,8 +1673,8 @@ 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() ); @@ -1692,7 +1735,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; } } @@ -1834,7 +1877,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 { @@ -1918,7 +1961,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) else { wxString tmp = params.BeforeFirst(_T(',')); - if ( !!tmp ) + if ( !tmp.empty() ) { long width; if ( tmp.ToLong(&width) ) @@ -1929,21 +1972,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()); - } - + } } } } @@ -1970,7 +2011,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, if ( !ms_sizeCheckMark.x ) { // get checkbox size - wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString); + wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString); wxSize size = checkbox->GetBestSize(); wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN; @@ -2132,8 +2173,8 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) 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 @@ -2417,7 +2458,9 @@ void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) 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--; } } @@ -2450,7 +2493,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--; } } @@ -2548,8 +2593,9 @@ void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols rowOrCol += numRowsOrCols; else { - m_rowsOrCols.RemoveAt((size_t)n); - m_attrs.RemoveAt((size_t)n); + m_rowsOrCols.RemoveAt(n); + m_attrs[n]->DecRef(); + m_attrs.RemoveAt(n); n--; count--; } } @@ -2596,8 +2642,8 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int 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 move are non NULL + if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){ + // Two or more are non NULL attr = new wxGridCellAttr; attr->SetKind(wxGridCellAttr::Merged); @@ -2619,11 +2665,21 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, //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(attrcol) + { + if(attr) + attr->DecRef(); + attr = attrcol; + } + if(attrcell) + { + if(attr) + attr->DecRef(); + attr = attrcell; + } } } break; @@ -2631,10 +2687,10 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, 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... @@ -2878,7 +2934,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) @@ -2889,6 +2945,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 ) @@ -2939,14 +2996,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), @@ -2954,7 +3011,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), @@ -2962,14 +3019,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), @@ -2977,7 +3034,7 @@ 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; } @@ -3044,7 +3101,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), @@ -3216,7 +3273,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::AppendRows( size_t numRows ) @@ -3243,7 +3300,7 @@ bool wxGridStringTable::AppendRows( size_t numRows ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) @@ -3260,7 +3317,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) (unsigned long)curNumRows ) ); - return FALSE; + return false; } if ( numRows > curNumRows - pos ) @@ -3286,7 +3343,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 ) @@ -3319,7 +3376,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::AppendCols( size_t numCols ) @@ -3333,7 +3390,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 @@ -3351,7 +3408,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) @@ -3371,7 +3428,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) (unsigned long)numCols, (unsigned long)curNumCols ) ); - return FALSE; + return false; } if ( numCols > curNumCols - pos ) @@ -3400,7 +3457,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } wxString wxGridStringTable::GetRowLabelValue( int row ) @@ -3474,12 +3531,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; } @@ -3528,6 +3586,11 @@ 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(); +} + ////////////////////////////////////////////////////////////////////// @@ -3540,12 +3603,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; } @@ -3593,6 +3657,10 @@ void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } +void wxGridColLabelWindow::OnChar( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); +} ////////////////////////////////////////////////////////////////////// @@ -3605,12 +3673,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; } @@ -3623,6 +3692,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 ); @@ -3632,6 +3711,7 @@ 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__ } @@ -3659,6 +3739,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(); +} ////////////////////////////////////////////////////////////////////// @@ -3671,6 +3755,7 @@ 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 ) @@ -3682,19 +3767,13 @@ 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() -{ } @@ -3723,6 +3802,9 @@ void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) { + if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this) + SetFocus(); + m_owner->ProcessGridCellMouseEvent( event ); } @@ -3744,6 +3826,11 @@ void wxGridWindow::OnKeyUp( wxKeyEvent& event ) 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) ) { } @@ -3769,10 +3856,10 @@ 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 @@ -3787,7 +3874,7 @@ wxBEGIN_FLAGS( wxGridStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -3812,16 +3899,16 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow,"wx/grid.h") wxBEGIN_PROPERTIES_TABLE(wxGrid) wxHIDE_PROPERTY( Children ) - wxPROPERTY_FLAGS( WindowStyle , wxGridStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + 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 ) +wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* - TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) + TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) @@ -3832,6 +3919,7 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) 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() @@ -3856,6 +3944,7 @@ wxGrid::wxGrid( wxWindow *parent, m_rowMinHeights(GRID_HASH_SIZE) { Create(); + SetBestFittingSize(size); } bool wxGrid::Create(wxWindow *parent, wxWindowID id, @@ -3864,15 +3953,15 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id, { if (!wxScrolledWindow::Create(parent, id, pos, size, style | wxWANTS_CHARS , name)) - return FALSE; + return false; m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ; m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ; Create() ; + SetBestFittingSize(size); - - return TRUE; + return true; } @@ -3903,14 +3992,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(); @@ -3919,13 +4016,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; @@ -3940,29 +4046,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(); } @@ -3971,7 +4098,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; @@ -3979,12 +4106,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; } @@ -4011,7 +4138,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, if ( m_created ) { // stop all processing - m_created = FALSE; + m_created = false; if (m_ownTable) { @@ -4034,12 +4161,12 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, m_table = table; m_table->SetView( this ); if (takeOwnership) - m_ownTable = TRUE; + m_ownTable = true; m_selection = new wxGridSelection( this, selmode ); CalcDimensions(); - m_created = TRUE; + m_created = true; } return m_created; @@ -4092,22 +4219,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 ); @@ -4119,13 +4247,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; } // ---------------------------------------------------------------------------- @@ -4255,7 +4386,7 @@ void wxGrid::CalcDimensions() 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); @@ -4275,16 +4406,16 @@ void wxGrid::CalcWindowSizes() 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); } @@ -4295,7 +4426,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. @@ -4363,7 +4494,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: @@ -4399,7 +4530,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_ROWS_DELETED: @@ -4452,7 +4583,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_INSERTED: @@ -4495,7 +4626,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_APPENDED: @@ -4530,7 +4661,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_DELETED: @@ -4583,7 +4714,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colLabelWin->Refresh(); } } - result = TRUE; + result = true; break; } @@ -4637,7 +4768,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) rowlabels.Add( row ); } - iter++ ; + ++iter; } return rowlabels; @@ -4688,7 +4819,7 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) colLabels.Add( col ); } - iter++ ; + ++iter; } return colLabels; } @@ -4748,7 +4879,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) } } - iter++; + ++iter; } return cellsExposed; @@ -4765,7 +4896,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if (!m_isDragging) { - m_isDragging = TRUE; + m_isDragging = true; m_rowLabelWin->CaptureMouse(); } @@ -4795,6 +4926,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_ROW: + { if ( (row = YToRow( y )) >= 0 ) { if ( m_selection ) @@ -4806,6 +4938,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } + } + break; // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch @@ -4822,7 +4956,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 @@ -4894,10 +5028,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { 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 { @@ -4935,7 +5069,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 } @@ -4948,7 +5082,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 } @@ -4966,12 +5100,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); } } } @@ -4987,7 +5121,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if (!m_isDragging) { - m_isDragging = TRUE; + m_isDragging = true; m_colLabelWin->CaptureMouse(); } @@ -5017,6 +5151,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_COL: + { if ( (col = XToCol( x )) >= 0 ) { if ( m_selection ) @@ -5028,6 +5163,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } + } + break; // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch @@ -5044,7 +5181,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 @@ -5117,7 +5254,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) 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 @@ -5156,7 +5293,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 } @@ -5169,7 +5306,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 } @@ -5187,12 +5324,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); } } } @@ -5309,6 +5446,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)) { @@ -5333,7 +5471,7 @@ 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 @@ -5359,6 +5497,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() ) @@ -5419,7 +5570,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 @@ -5506,11 +5657,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; + } } + } @@ -5537,7 +5694,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) editor->DecRef(); attr->DecRef(); - m_waitForSlowClick = FALSE; + m_waitForSlowClick = false; } else if ( m_selectingTopLeft != wxGridNoCellCoords && m_selectingBottomRight != wxGridNoCellCoords ) @@ -5709,7 +5866,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) @@ -5730,7 +5887,7 @@ void wxGrid::DoEndDragResizeRow() rect.height = ch - rect.y; } } - m_gridWin->Refresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } ShowCellEditControl(); @@ -5768,7 +5925,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) @@ -5789,7 +5946,7 @@ void wxGrid::DoEndDragResizeCol() rect.width = cw - rect.x; } } - m_gridWin->Refresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } ShowCellEditControl(); @@ -5820,7 +5977,7 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) return Redimension( msg ); default: - return FALSE; + return false; } } @@ -5851,7 +6008,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 ) @@ -5865,7 +6022,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; } @@ -5876,7 +6033,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 ) @@ -5886,7 +6043,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; } @@ -5897,7 +6054,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 ) @@ -5910,7 +6067,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; } @@ -5921,7 +6078,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 ) @@ -5934,7 +6091,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; } @@ -5945,7 +6102,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 ) @@ -5955,7 +6112,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; } @@ -5966,7 +6123,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 ) @@ -5979,7 +6136,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; } @@ -6024,7 +6181,7 @@ int wxGrid::SendEvent( const wxEventType type, this, m_selectingTopLeft, m_selectingBottomRight, - TRUE, + true, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -6041,7 +6198,7 @@ int wxGrid::SendEvent( const wxEventType type, row, col, mouseEv.GetX() + GetRowLabelSize(), mouseEv.GetY() + GetColLabelSize(), - FALSE, + false, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -6206,7 +6363,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 // @@ -6280,8 +6437,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) else { // at the bottom of a column - HideCellEditControl(); - SaveEditControlValue(); + DisableCellEditControl(); } } break; @@ -6295,26 +6451,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; @@ -6367,55 +6521,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 ) @@ -6434,7 +6551,7 @@ void wxGrid::OnKeyUp( wxKeyEvent& event ) m_selectingBottomRight.GetRow(), m_selectingBottomRight.GetCol(), event.ControlDown(), - TRUE, + true, event.AltDown(), event.MetaDown() ); } @@ -6446,6 +6563,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&) { } @@ -6463,10 +6622,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); @@ -6539,7 +6697,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 || @@ -6553,7 +6711,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 @@ -6596,7 +6754,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, @@ -6607,7 +6765,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, @@ -6618,7 +6776,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, @@ -6629,7 +6787,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, @@ -6639,7 +6797,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; @@ -6660,10 +6818,10 @@ bool wxGrid::GetModelValues() // all we need to do is repaint the grid // m_gridWin->Refresh(); - return TRUE; + return true; } - return FALSE; + return false; } @@ -6686,10 +6844,10 @@ bool wxGrid::SetModelValues() } } - return TRUE; + return true; } - return FALSE; + return false; } @@ -6716,12 +6874,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; } } @@ -6732,7 +6890,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( cell == redrawCells[j] ) { - marked = TRUE; + marked = true; break; } } @@ -6762,13 +6920,13 @@ 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; } } @@ -6779,7 +6937,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( cell == redrawCells[k] ) { - marked = TRUE; + marked = true; break; } } @@ -7041,8 +7199,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; @@ -7066,6 +7226,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) ); @@ -7124,9 +7308,22 @@ 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; @@ -7141,7 +7338,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() ); @@ -7149,7 +7346,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 ); @@ -7174,11 +7370,23 @@ 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, @@ -7192,7 +7400,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() ); @@ -7201,7 +7409,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 ); @@ -7409,6 +7616,16 @@ 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 @@ -7479,19 +7696,19 @@ bool wxGrid::CanEnableCellControl() const { 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 ) { @@ -7521,7 +7738,7 @@ void wxGrid::ShowCellEditControl() { if ( !IsVisible( m_currentCellCoords ) ) { - m_cellEditCtrlEnabled = FALSE; + m_cellEditCtrlEnabled = false; return; } else @@ -7569,7 +7786,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(), @@ -7617,7 +7834,7 @@ void wxGrid::ShowCellEditControl() editor->SetCellAttr(attr); editor->SetSize( rect ); - editor->Show( TRUE, attr ); + editor->Show( true, attr ); // recalc dimensions in case we need to // expand the scrolled window to account for editor @@ -7642,15 +7859,21 @@ 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 ); } } @@ -7775,14 +7998,14 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, 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); } @@ -7945,7 +8168,7 @@ 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 ) @@ -7960,15 +8183,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(); } @@ -8006,11 +8229,11 @@ bool wxGrid::MoveCursorUp( bool expandSelection ) m_currentCellCoords.GetCol() ); } else - return FALSE; - return TRUE; + return false; + return true; } - return FALSE; + return false; } @@ -8040,11 +8263,11 @@ bool wxGrid::MoveCursorDown( bool expandSelection ) m_currentCellCoords.GetCol() ); } else - return FALSE; - return TRUE; + return false; + return true; } - return FALSE; + return false; } @@ -8074,11 +8297,11 @@ bool wxGrid::MoveCursorLeft( bool expandSelection ) m_currentCellCoords.GetCol() - 1 ); } else - return FALSE; - return TRUE; + return false; + return true; } - return FALSE; + return false; } @@ -8108,17 +8331,17 @@ bool wxGrid::MoveCursorRight( bool expandSelection ) m_currentCellCoords.GetCol() + 1 ); } 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 ) @@ -8131,22 +8354,22 @@ 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 ) @@ -8159,16 +8382,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 ) @@ -8228,10 +8451,10 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) ClearSelection(); SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorDownBlock( bool expandSelection ) @@ -8292,10 +8515,10 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) @@ -8356,10 +8579,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorRightBlock( bool expandSelection ) @@ -8420,10 +8643,10 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } @@ -8485,18 +8708,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 ); } } @@ -8508,18 +8731,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 ); } } @@ -8631,12 +8854,12 @@ 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 ) { @@ -8664,7 +8887,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 ); } } } @@ -8683,7 +8906,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 ); } } } @@ -8728,7 +8951,7 @@ 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); } } @@ -8744,7 +8967,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); } } @@ -8832,14 +9055,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); } // ---------------------------------------------------------------------------- @@ -8965,7 +9198,7 @@ bool wxGrid::CanHaveAttributes() { if ( !m_table ) { - return FALSE; + return false; } return m_table->CanHaveAttributes(); @@ -9006,14 +9239,14 @@ 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; } } @@ -9047,9 +9280,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 ) @@ -9356,6 +9590,10 @@ void wxGrid::EnableDragGridSize( bool enable ) m_canDragGridSize = enable; } +void wxGrid::EnableDragCell( bool enable ) +{ + m_canDragCell = enable; +} void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) { @@ -9465,26 +9703,30 @@ void wxGrid::SetColSize( int col, int width ) void wxGrid::SetColMinimalWidth( int col, int width ) { if (width > GetColMinimalAcceptableWidth()) { - m_colMinWidths[col] = width; + 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; + 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; } @@ -9524,6 +9766,10 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) { wxClientDC dc(m_gridWin); + //Cancel editting of cell + HideCellEditControl(); + SaveEditControlValue(); + // init both of them to avoid compiler warnings, even if weo nly need one int row = -1, col = -1; @@ -9608,7 +9854,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 @@ -9623,7 +9869,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 ) @@ -9685,14 +9931,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 @@ -9807,16 +10053,36 @@ 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 incantaion for that? + int xpu, ypu; + GetScrollPixelsPerUnit(&xpu, &ypu); + if (xpu) + width += 1 + xpu - (width % xpu); + if (ypu) + height += 1 + ypu - (height % ypu); + + // limit to 1/4 of the screen size int maxwidth, maxheight; wxDisplaySize( & maxwidth, & maxheight ); - + maxwidth /= 2; + maxheight /= 2; if ( width > maxwidth ) width = maxwidth; if ( height > maxheight ) height = maxheight; - return wxSize( width, height ); + + wxSize best(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() @@ -9846,7 +10112,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 && @@ -9873,7 +10139,7 @@ void wxGrid::SelectRow( int row, bool addToSelected ) ClearSelection(); if ( m_selection ) - m_selection->SelectRow( row, FALSE, addToSelected ); + m_selection->SelectRow( row, false, addToSelected ); } @@ -9883,7 +10149,7 @@ void wxGrid::SelectCol( int col, bool addToSelected ) ClearSelection(); if ( m_selection ) - m_selection->SelectCol( col, FALSE, addToSelected ); + m_selection->SelectCol( col, false, addToSelected ); } @@ -9895,7 +10161,7 @@ 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 ); } @@ -10028,7 +10294,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, } else { - rect = wxRect( 0, 0, 0, 0 ); + rect = wxRect(0,0,0,0); } cellRect = CellToRect( bottomRight ); @@ -10103,7 +10369,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) );