X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b819b854ddebd81e71ac9cdfa8feffe8bb0c745e..2296fe5018d42d4e0bf9df07c37d31f60d972b32:/src/generic/grid.cpp?ds=inline diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 2f12b4028e..3e558a168a 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "grid.h" #endif @@ -32,10 +32,6 @@ #if wxUSE_GRID -#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID) - #include "gridg.cpp" -#else // wxUSE_NEW_GRID - #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dcclient.h" @@ -45,11 +41,13 @@ #include "wx/checkbox.h" #include "wx/combobox.h" #include "wx/valtext.h" + #include "wx/intl.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" @@ -73,7 +71,8 @@ // array classes // ---------------------------------------------------------------------------- -WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs); +WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridCellAttr *, wxArrayAttrs, + class WXDLLIMPEXP_ADV); struct wxGridCellWithAttr { @@ -89,9 +88,14 @@ struct wxGridCellWithAttr wxGridCellCoords coords; wxGridCellAttr *attr; + +// Cannot do this: +// DECLARE_NO_COPY_CLASS(wxGridCellWithAttr) +// without rewriting the macros, which require a public copy constructor. }; -WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); +WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray, + class WXDLLIMPEXP_ADV); #include "wx/arrimpl.cpp" @@ -106,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) @@ -123,7 +128,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,13 +143,15 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow) }; -class WXDLLEXPORT wxGridColLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow { public: wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -159,13 +166,15 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxGridColLabelWindow) }; -class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow { public: wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -179,13 +188,15 @@ private: void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); + void OnChar( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow) }; -class WXDLLEXPORT wxGridWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow { public: wxGridWindow() @@ -199,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 ); @@ -215,11 +226,13 @@ 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() + DECLARE_NO_COPY_CLASS(wxGridWindow) }; @@ -227,26 +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() @@ -258,7 +282,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); @@ -274,7 +298,7 @@ private: }; // this class stores attributes set for rows or columns -class WXDLLEXPORT wxGridRowOrColAttrData +class WXDLLIMPEXP_ADV wxGridRowOrColAttrData { public: // empty ctor to suppress warnings @@ -292,7 +316,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; @@ -322,13 +346,16 @@ struct wxGridDataTypeInfo wxString m_typeName; wxGridCellRenderer* m_renderer; wxGridCellEditor* m_editor; + + DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo) }; -WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray); +WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray, + class WXDLLIMPEXP_ADV); -class WXDLLEXPORT wxGridTypeRegistry +class WXDLLIMPEXP_ADV wxGridTypeRegistry { public: wxGridTypeRegistry() {} @@ -401,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 // ---------------------------------------------------------------------------- @@ -414,6 +442,7 @@ static inline int GetScrollY(int y) { return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y; } +#endif // ============================================================================ // implementation @@ -451,7 +480,7 @@ void wxGridCellEditor::PaintBackground(const wxRect& rectCell, wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow); if (gridWindow) gridWindow->GetOwner()->PrepareDC(dc); - + dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); dc.DrawRectangle(rectCell); @@ -464,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; @@ -488,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 } @@ -509,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 } } @@ -532,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) @@ -563,12 +628,15 @@ 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 ); - // TODO: use m_maxChars + // set max length allowed in the textctrl, if the parameter was set + if (m_maxChars != 0) + { + ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars); + } wxGridCellEditor::Create(parent, id, evtHandler); } @@ -646,16 +714,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; } @@ -677,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) && (isprint(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; } } @@ -780,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); @@ -791,6 +859,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent, wxGridCellEditor::Create(parent, id, evtHandler); } else +#endif { // just a text control wxGridCellTextEditor::Create(parent, id, evtHandler); @@ -813,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()); } @@ -838,6 +909,7 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, long value = 0; wxString text; +#if wxUSE_SPINCTRL if ( HasRange() ) { value = Spin()->GetValue(); @@ -846,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 ) @@ -864,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()); } @@ -879,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) && isdigit(keycode) ) - return TRUE; + return true; } } - return FALSE; + return false; } void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) { + int keycode = event.GetKeyCode(); if ( !HasRange() ) { - int keycode = (int) event.KeyCode(); - if ( isdigit(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); @@ -935,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(); } @@ -970,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; } // ---------------------------------------------------------------------------- @@ -1017,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; @@ -1033,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() @@ -1052,22 +1108,19 @@ void wxGridCellFloatEditor::Reset() void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) { - int keycode = (int)event.KeyCode(); - if ( isdigit(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) + int keycode = event.GetKeyCode(); + 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); @@ -1132,35 +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' - if ( (keycode < 128) && - (isdigit(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 @@ -1184,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); @@ -1195,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 ) @@ -1203,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 ) @@ -1227,14 +1271,14 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) int vAlign = wxALIGN_CENTRE; if (GetCellAttr()) GetCellAttr()->GetAlignment(& hAlign, & vAlign); - + int x = 0, y = 0; if (hAlign == wxALIGN_LEFT) { x = r.x + 2; #ifdef __WXMSW__ x += 2; -#endif +#endif y = r.y + r.height/2 - size.y/2; } else if (hAlign == wxALIGN_RIGHT) @@ -1247,7 +1291,7 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) x = r.x + r.width/2 - size.x/2; y = r.y + r.height/2 - size.y/2; } - + m_control->Move(x, y); } @@ -1284,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 ) { @@ -1320,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 { @@ -1351,6 +1409,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) @@ -1379,20 +1442,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); } @@ -1413,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) @@ -1421,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() @@ -1482,9 +1541,21 @@ 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.KeyCode() ) + switch ( event.GetKeyCode() ) { case WXK_ESCAPE: m_editor->Reset(); @@ -1501,7 +1572,6 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) m_editor->HandleReturn(event); break; - default: event.Skip(); } @@ -1509,7 +1579,7 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) { - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case WXK_ESCAPE: case WXK_TAB: @@ -1556,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 ); @@ -1603,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() ); @@ -1665,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; } } @@ -1807,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 { @@ -1891,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) ) @@ -1902,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()); - } - + } } } } @@ -1943,10 +2011,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__) @@ -1984,7 +2051,7 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, // draw a border around checkmark int vAlign, hAlign; attr.GetAlignment(& hAlign, &vAlign); - + wxRect rectBorder; if (hAlign == wxALIGN_CENTRE) { @@ -1998,14 +2065,14 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, rectBorder.x = rect.x + 2; rectBorder.y = rect.y + rect.height/2 - size.y/2; rectBorder.width = size.x; - rectBorder.height = size.y; + rectBorder.height = size.y; } else if (hAlign == wxALIGN_RIGHT) { rectBorder.x = rect.x + rect.width - size.x - 2; rectBorder.y = rect.y + rect.height/2 - size.y/2; rectBorder.width = size.x; - rectBorder.height = size.y; + rectBorder.height = size.y; } bool value; @@ -2054,7 +2121,7 @@ void wxGridCellAttr::Init(wxGridCellAttr *attrDefault) m_attrkind = wxGridCellAttr::Cell; m_sizeRows = m_sizeCols = 1; - m_overflow = TRUE; + m_overflow = UnsetOverflow; SetDefAttr(attrDefault); } @@ -2106,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 @@ -2126,6 +2193,9 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) SetReadOnly(mergefrom->IsReadOnly()); + if (!HasOverflowMode() && mergefrom->HasOverflowMode() ) + SetOverflow(mergefrom->GetOverflow()); + SetDefAttr(mergefrom->m_defGridAttr); } @@ -2388,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--; } } @@ -2421,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--; } } @@ -2519,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--; } } @@ -2563,16 +2638,12 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, { //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); + 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 move are non NULL + if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){ + // Two or more are non NULL attr = new wxGridCellAttr; attr->SetKind(wxGridCellAttr::Merged); @@ -2594,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; @@ -2606,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... @@ -2853,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) @@ -2864,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 ) @@ -2914,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), @@ -2929,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), @@ -2937,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), @@ -2952,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; } @@ -2975,7 +3057,7 @@ 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; } @@ -3019,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), @@ -3121,23 +3203,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); @@ -3189,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 ) @@ -3216,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 ) @@ -3233,7 +3317,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) (unsigned long)curNumRows ) ); - return FALSE; + return false; } if ( numRows > curNumRows - pos ) @@ -3259,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 ) @@ -3292,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 ) @@ -3306,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 @@ -3324,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 ) @@ -3344,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 ) @@ -3373,7 +3457,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) GetView()->ProcessTableMessage( msg ); } - return TRUE; + return true; } wxString wxGridStringTable::GetRowLabelValue( int row ) @@ -3447,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 ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) { m_owner = parent; } @@ -3501,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(); +} + ////////////////////////////////////////////////////////////////////// @@ -3513,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 ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) { m_owner = parent; } @@ -3566,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(); +} ////////////////////////////////////////////////////////////////////// @@ -3578,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 ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) { m_owner = parent; } @@ -3596,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 ); @@ -3605,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__ } @@ -3632,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(); +} ////////////////////////////////////////////////////////////////////// @@ -3644,6 +3755,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() @@ -3653,19 +3767,13 @@ wxGridWindow::wxGridWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS | 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() -{ } @@ -3694,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 ); } @@ -3715,10 +3826,20 @@ 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) ) { } +void wxGridWindow::OnFocus(wxFocusEvent& event) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); +} ////////////////////////////////////////////////////////////////////// @@ -3731,26 +3852,87 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) static int CoordToRowOrCol(int coord, int defaultDist, int minDist, const wxArrayInt& BorderArray, int nMax, - bool maxOnOverflow); + bool clipToMinMax); #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \ - WXGRID_MIN_COL_WIDTH, \ - m_colRights, m_numCols, TRUE) + m_minAcceptableColWidth, \ + m_colRights, m_numCols, true) #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \ - WXGRID_MIN_ROW_HEIGHT, \ - m_rowBottoms, m_numRows, TRUE) + m_minAcceptableRowHeight, \ + 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, @@ -3762,6 +3944,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; } @@ -3792,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(); @@ -3808,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; @@ -3829,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(); } @@ -3860,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; @@ -3868,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; } @@ -3899,16 +4137,23 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, { if ( m_created ) { - // RD: Actually, this should probably be allowed. I think it would be - // nice to be able to switch multiple Tables in and out of a single - // View at runtime. Is there anything in the implementation that - // would prevent this? + // stop all processing + m_created = false; - // At least, you now have to cope with m_selection - wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); - return FALSE; + if (m_ownTable) + { + wxGridTableBase *t=m_table; + m_table=0; + delete t; + } + delete m_selection; + + m_table=0; + m_selection=0; + m_numRows=0; + m_numCols=0; } - else + if (table) { m_numRows = table->GetNumberRows(); m_numCols = table->GetNumberCols(); @@ -3916,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; @@ -3952,18 +4197,21 @@ void wxGrid::Init() // TODO: something better than this ? // m_labelFont = this->GetFont(); -// m_labelFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); -// m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 ); + m_labelFont.SetWeight( wxBOLD ); m_rowLabelHorizAlign = wxALIGN_CENTRE; m_rowLabelVertAlign = wxALIGN_CENTRE; m_colLabelHorizAlign = wxALIGN_CENTRE; m_colLabelVertAlign = wxALIGN_CENTRE; + m_colLabelTextOrientation = wxHORIZONTAL; m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; m_defaultRowHeight = m_gridWin->GetCharHeight(); + m_minAcceptableColWidth = WXGRID_MIN_COL_WIDTH; + m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT; + #if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl() m_defaultRowHeight += 8; #else @@ -3971,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 ); @@ -3995,18 +4244,19 @@ void wxGrid::Init() m_selectingTopLeft = wxGridNoCellCoords; m_selectingBottomRight = wxGridNoCellCoords; -// m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); -// m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - m_selectionBackground = *wxBLACK; - m_selectionForeground = *wxWHITE; + 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; } // ---------------------------------------------------------------------------- @@ -4129,31 +4379,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); @@ -4165,19 +4398,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); } @@ -4188,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. @@ -4256,7 +4494,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: @@ -4292,7 +4530,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_ROWS_DELETED: @@ -4345,7 +4583,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_INSERTED: @@ -4388,7 +4626,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_APPENDED: @@ -4423,7 +4661,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colLabelWin->Refresh(); } } - result = TRUE; + result = true; break; case wxGRIDTABLE_NOTIFY_COLS_DELETED: @@ -4476,7 +4714,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colLabelWin->Refresh(); } } - result = TRUE; + result = true; break; } @@ -4530,7 +4768,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) rowlabels.Add( row ); } - iter++ ; + ++iter; } return rowlabels; @@ -4581,7 +4819,7 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) colLabels.Add( col ); } - iter++ ; + ++iter; } return colLabels; } @@ -4641,7 +4879,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) } } - iter++; + ++iter; } return cellsExposed; @@ -4658,7 +4896,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if (!m_isDragging) { - m_isDragging = TRUE; + m_isDragging = true; m_rowLabelWin->CaptureMouse(); } @@ -4688,6 +4926,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_ROW: + { if ( (row = YToRow( y )) >= 0 ) { if ( m_selection ) @@ -4699,6 +4938,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } + } + break; // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch @@ -4715,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 @@ -4782,10 +5023,23 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) // else if (event.LeftDClick() ) { - if ( YToEdgeOfRow(y) < 0 ) + int row = YToEdgeOfRow(y); + if ( row < 0 ) { row = YToRow(y); - SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); + if ( row >=0 && + !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) ) + { + // no default action at the moment + } + } + else + { + // adjust row height depending on label text + AutoSizeRowLabelSize( row ); + + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); + m_dragLastPos = -1; } } @@ -4814,7 +5068,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDown() ) { row = YToRow(y); - if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) + if ( row >=0 && + !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) { // no default action at the moment } @@ -4826,7 +5081,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { row = YToRow(y); - if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) + if ( row >= 0 && + !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) { // no default action at the moment } @@ -4844,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); } } } @@ -4865,7 +5121,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if (!m_isDragging) { - m_isDragging = TRUE; + m_isDragging = true; m_colLabelWin->CaptureMouse(); } @@ -4895,6 +5151,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_COL: + { if ( (col = XToCol( x )) >= 0 ) { if ( m_selection ) @@ -4906,6 +5163,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) event.MetaDown() ); } } + } + break; // default label to suppress warnings about "enumeration value // 'xxx' not handled in switch @@ -4922,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 @@ -4988,10 +5247,23 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // if ( event.LeftDClick() ) { - if ( XToEdgeOfCol(x) < 0 ) + int col = XToEdgeOfCol(x); + if ( col < 0 ) { col = XToCol(x); - SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); + if ( col >= 0 && + ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) ) + { + // no default action at the moment + } + } + else + { + // adjust column width depending on label text + AutoSizeColLabelSize( col ); + + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); + m_dragLastPos = -1; } } @@ -5020,7 +5292,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDown() ) { col = XToCol(x); - if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) + if ( col >= 0 && + !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) { // no default action at the moment } @@ -5032,7 +5305,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { col = XToCol(x); - if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) + if ( col >= 0 && + !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) { // no default action at the moment } @@ -5050,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); } } } @@ -5172,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)) { @@ -5196,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 @@ -5222,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() ) @@ -5282,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 @@ -5369,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; + } } + } @@ -5383,15 +5677,28 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - if ( m_selectingTopLeft != wxGridNoCellCoords && - m_selectingBottomRight != wxGridNoCellCoords ) + if (m_winCapture) { - if (m_winCapture) - { - if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse(); - m_winCapture = NULL; - } + if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse(); + m_winCapture = NULL; + } + + if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl()) + { + ClearSelection(); + EnableCellEditControl(); + + wxGridCellAttr* attr = GetCellAttr(coords); + wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol()); + editor->StartingClick(); + editor->DecRef(); + attr->DecRef(); + m_waitForSlowClick = false; + } + else if ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) + { if ( m_selection ) { m_selection->SelectBlock( m_selectingTopLeft.GetRow(), @@ -5411,21 +5718,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // drag-shrinking. ShowCellEditControl(); } - else - { - if( m_waitForSlowClick && CanEnableCellControl()) - { - EnableCellEditControl(); - - wxGridCellAttr* attr = GetCellAttr(coords); - wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol()); - editor->StartingClick(); - editor->DecRef(); - attr->DecRef(); - - m_waitForSlowClick = FALSE; - } - } } else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { @@ -5564,7 +5856,7 @@ void wxGrid::DoEndDragResizeRow() int rowTop = GetRowTop(m_dragRowOrCol); SetRowSize( m_dragRowOrCol, - wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); + wxMax( m_dragLastPos - rowTop, m_minAcceptableRowHeight ) ); if ( !GetBatchCount() ) { @@ -5574,17 +5866,16 @@ 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) { int i, cell_rows, cell_cols, subtract_rows = 0; int leftCol = XToCol(left); - int rightCol = XToCol(left+cw); + int rightCol = internalXToCol(left+cw); if (leftCol >= 0) { - if (rightCol < 0) rightCol = m_numCols; for (i=leftCol; iRefresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } ShowCellEditControl(); @@ -5634,17 +5925,16 @@ 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) { int i, cell_rows, cell_cols, subtract_cols = 0; int topRow = YToRow(top); - int bottomRow = YToRow(top+cw); + int bottomRow = internalYToRow(top+cw); if (topRow >= 0) { - if (bottomRow < 0) bottomRow = m_numRows; for (i=topRow; iRefresh( FALSE, &rect ); + m_gridWin->Refresh( false, &rect ); } ShowCellEditControl(); @@ -5687,7 +5977,7 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) return Redimension( msg ); default: - return FALSE; + return false; } } @@ -5718,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 ) @@ -5726,12 +6016,13 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if (IsCellEditControlEnabled()) DisableCellEditControl(); - return m_table->InsertRows( pos, numRows ); + bool done = m_table->InsertRows( pos, numRows ); + return done; // the table will have sent the results of the insert row // operation to this view object as a grid table message } - return FALSE; + return false; } @@ -5742,12 +6033,17 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); - return FALSE; + return false; } - return ( m_table && m_table->AppendRows( numRows ) ); - // the table will have sent the results of the append row - // operation to this view object as a grid table message + if ( m_table ) + { + bool done = m_table && m_table->AppendRows( numRows ); + return done; + // the table will have sent the results of the append row + // operation to this view object as a grid table message + } + return false; } @@ -5758,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 ) @@ -5766,11 +6062,12 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if (IsCellEditControlEnabled()) DisableCellEditControl(); - return (m_table->DeleteRows( pos, numRows )); + bool done = m_table->DeleteRows( pos, numRows ); + return done; // the table will have sent the results of the delete row // operation to this view object as a grid table message } - return FALSE; + return false; } @@ -5781,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 ) @@ -5789,11 +6086,12 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if (IsCellEditControlEnabled()) DisableCellEditControl(); - return m_table->InsertCols( pos, numCols ); + bool done = m_table->InsertCols( pos, numCols ); + return done; // the table will have sent the results of the insert col // operation to this view object as a grid table message } - return FALSE; + return false; } @@ -5804,12 +6102,17 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); - return FALSE; + return false; } - return ( m_table && m_table->AppendCols( numCols ) ); - // the table will have sent the results of the append col - // operation to this view object as a grid table message + if ( m_table ) + { + bool done = m_table->AppendCols( numCols ); + return done; + // the table will have sent the results of the append col + // operation to this view object as a grid table message + } + return false; } @@ -5820,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 ) @@ -5828,11 +6131,12 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if (IsCellEditControlEnabled()) DisableCellEditControl(); - return ( m_table->DeleteCols( pos, numCols ) ); + bool done = m_table->DeleteCols( pos, numCols ); + return done; // the table will have sent the results of the delete col // operation to this view object as a grid table message } - return FALSE; + return false; } @@ -5849,7 +6153,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 ) { @@ -5877,7 +6181,7 @@ int wxGrid::SendEvent( const wxEventType type, this, m_selectingTopLeft, m_selectingBottomRight, - TRUE, + true, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -5894,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(), @@ -5916,7 +6220,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 ) { @@ -6059,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 // @@ -6072,7 +6376,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) // try local handlers // - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case WXK_UP: if ( event.ControlDown() ) @@ -6133,8 +6437,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) else { // at the bottom of a column - HideCellEditControl(); - SaveEditControlValue(); + DisableCellEditControl(); } } break; @@ -6148,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; @@ -6220,62 +6521,25 @@ 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.KeyCode() == 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 ) { // try local handlers // - if ( event.KeyCode() == WXK_SHIFT ) + if ( event.GetKeyCode() == WXK_SHIFT ) { if ( m_selectingTopLeft != wxGridNoCellCoords && m_selectingBottomRight != wxGridNoCellCoords ) @@ -6287,7 +6551,7 @@ void wxGrid::OnKeyUp( wxKeyEvent& event ) m_selectingBottomRight.GetRow(), m_selectingBottomRight.GetCol(), event.ControlDown(), - TRUE, + true, event.AltDown(), event.MetaDown() ); } @@ -6299,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&) { } @@ -6316,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); @@ -6392,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 || @@ -6406,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 @@ -6449,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, @@ -6460,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, @@ -6471,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, @@ -6482,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, @@ -6492,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; @@ -6513,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; } @@ -6539,10 +6844,10 @@ bool wxGrid::SetModelValues() } } - return TRUE; + return true; } - return FALSE; + return false; } @@ -6569,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; } } @@ -6585,7 +6890,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( cell == redrawCells[j] ) { - marked = TRUE; + marked = true; break; } } @@ -6615,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; } } @@ -6632,7 +6937,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( cell == redrawCells[k] ) { - marked = TRUE; + marked = true; break; } } @@ -6890,47 +7195,68 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) ); // no gridlines inside multicells, clip them out - int leftCol = XToCol(left); - int topRow = YToRow(top); - int rightCol = XToCol(right); - int bottomRow = YToRow(bottom); + int leftCol = internalXToCol(left); + int topRow = internalYToRow(top); + int rightCol = internalXToCol(right); + int bottomRow = internalYToRow(bottom); + +#ifndef __WXMAC__ + // CS: I don't know why suddenly unscrolled coordinates are used for clipping wxRegion clippedcells(0, 0, cw, ch); - if ((leftCol >= 0) && (topRow >= 0)) + int i, j, cell_rows, cell_cols; + wxRect rect; + + for (j=topRow; j 1) || (cell_cols > 1)) + { + rect = CellToRect(j,i); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + clippedcells.Subtract(rect); + } + else if ((cell_rows < 0) || (cell_cols < 0)) + { + rect = CellToRect(j+cell_rows, i+cell_cols); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + clippedcells.Subtract(rect); + } + } + } +#else + wxRegion clippedcells( left , top, right - left, bottom - top); - int i, j, cell_rows, cell_cols; - wxRect rect; + int i, j, cell_rows, cell_cols; + wxRect rect; - for (j=topRow; j 1) || (cell_cols > 1)) { - GetCellSize( j, i, &cell_rows, &cell_cols ); - if ((cell_rows > 1) || (cell_cols > 1)) - { - rect = CellToRect(j,i); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - clippedcells.Subtract(rect); - } - else if ((cell_rows < 0) || (cell_cols < 0)) - { - rect = CellToRect(j+cell_rows, i+cell_cols); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - clippedcells.Subtract(rect); - } + rect = CellToRect(j,i); + 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) ); // horizontal grid lines // - int i; + // already declared above - int i; for ( i = internalYToRow(top); i < m_numRows; i++ ) { int bot = GetRowBottom(i) - 1; @@ -6982,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; @@ -6999,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() ); @@ -7007,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 ); @@ -7032,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, @@ -7050,31 +7400,28 @@ 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 ); - - dc.SetBackgroundMode( wxTRANSPARENT ); - dc.SetTextForeground( GetLabelTextColour() ); - dc.SetFont( GetLabelFont() ); - +#endif dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); dc.SetFont( GetLabelFont() ); - int hAlign, vAlign; + int hAlign, vAlign, orient; GetColLabelAlignment( &hAlign, &vAlign ); + orient = GetColLabelTextOrientation(); - wxRect rect; rect.SetX( colLeft + 2 ); rect.SetY( 2 ); rect.SetWidth( GetColWidth(col) - 4 ); rect.SetHeight( m_colLabelHeight - 4 ); - DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign ); + DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign, orient ); } void wxGrid::DrawTextRectangle( wxDC& dc, const wxString& value, const wxRect& rect, int horizAlign, - int vertAlign ) + int vertAlign, + int textOrientation ) { wxArrayString lines; @@ -7083,18 +7430,20 @@ void wxGrid::DrawTextRectangle( wxDC& dc, //Forward to new API. DrawTextRectangle( dc, - lines, - rect, - horizAlign, - vertAlign ); + lines, + rect, + horizAlign, + vertAlign, + textOrientation ); } void wxGrid::DrawTextRectangle( wxDC& dc, - const wxArrayString& lines, - const wxRect& rect, - int horizAlign, - int vertAlign ) + const wxArrayString& lines, + const wxRect& rect, + int horizAlign, + int vertAlign, + int textOrientation ) { long textWidth, textHeight; long lineWidth, lineHeight; @@ -7105,49 +7454,80 @@ void wxGrid::DrawTextRectangle( wxDC& dc, nLines = lines.GetCount(); if( nLines > 0 ) { - int l; - float x, y; - GetTextBoxSize(dc, lines, &textWidth, &textHeight); - switch( vertAlign ) - { + int l; + float x = 0.0, y = 0.0; + + if( textOrientation == wxHORIZONTAL ) + GetTextBoxSize(dc, lines, &textWidth, &textHeight); + else + GetTextBoxSize( dc, lines, &textHeight, &textWidth ); + + switch( vertAlign ) + { case wxALIGN_BOTTOM: - y = rect.y + (rect.height - textHeight - 1); - break; + if( textOrientation == wxHORIZONTAL ) + y = rect.y + (rect.height - textHeight - 1); + else + x = rect.x + rect.width - textWidth; + break; case wxALIGN_CENTRE: - y = rect.y + ((rect.height - textHeight)/2); - break; + if( textOrientation == wxHORIZONTAL ) + y = rect.y + ((rect.height - textHeight)/2); + else + x = rect.x + ((rect.width - textWidth)/2); + break; case wxALIGN_TOP: default: - y = rect.y + 1; - break; - } - - // Align each line of a multi-line label - for( l = 0; l < nLines; l++ ) - { - dc.GetTextExtent(lines[l], &lineWidth, &lineHeight); + if( textOrientation == wxHORIZONTAL ) + y = rect.y + 1; + else + x = rect.x + 1; + break; + } - switch( horizAlign ) + // Align each line of a multi-line label + for( l = 0; l < nLines; l++ ) { - case wxALIGN_RIGHT: - x = rect.x + (rect.width - lineWidth - 1); - break; + dc.GetTextExtent(lines[l], &lineWidth, &lineHeight); - case wxALIGN_CENTRE: - x = rect.x + ((rect.width - lineWidth)/2); - break; + switch( horizAlign ) + { + case wxALIGN_RIGHT: + if( textOrientation == wxHORIZONTAL ) + x = rect.x + (rect.width - lineWidth - 1); + else + y = rect.y + lineWidth + 1; + break; - case wxALIGN_LEFT: - default: - x = rect.x + 1; - break; - } + case wxALIGN_CENTRE: + if( textOrientation == wxHORIZONTAL ) + x = rect.x + ((rect.width - lineWidth)/2); + else + y = rect.y + rect.height - ((rect.height - lineWidth)/2); + break; - dc.DrawText( lines[l], (int)x, (int)y ); - y += lineHeight; - } + case wxALIGN_LEFT: + default: + if( textOrientation == wxHORIZONTAL ) + x = rect.x + 1; + else + y = rect.y + rect.height - 1; + break; + } + + if( textOrientation == wxHORIZONTAL ) + { + dc.DrawText( lines[l], (int)x, (int)y ); + y += lineHeight; + } + else + { + dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 ); + x += lineHeight; + } + } } dc.DestroyClippingRegion(); } @@ -7236,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 @@ -7304,19 +7694,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 ) { @@ -7346,7 +7738,7 @@ void wxGrid::ShowCellEditControl() { if ( !IsVisible( m_currentCellCoords ) ) { - m_cellEditCtrlEnabled = FALSE; + m_cellEditCtrlEnabled = false; return; } else @@ -7394,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(), @@ -7442,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 @@ -7467,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 ); } } @@ -7540,10 +7938,16 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) static int CoordToRowOrCol(int coord, int defaultDist, int minDist, const wxArrayInt& BorderArray, int nMax, - bool maxOnOverflow) + bool clipToMinMax) { + + if (coord < 0) + return clipToMinMax && (nMax > 0) ? 0 : -1; + + if (!defaultDist) defaultDist = 1; + size_t i_max = coord / defaultDist, i_min = 0; @@ -7551,7 +7955,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, { if((int) i_max < nMax) return i_max; - return maxOnOverflow ? nMax - 1 : -1; + return clipToMinMax ? nMax - 1 : -1; } if ( i_max >= BorderArray.GetCount()) @@ -7561,13 +7965,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 maxOnOverflow ? (int)i_max : -1; + return clipToMinMax ? (int)i_max : -1; if ( coord < BorderArray[0] ) return 0; @@ -7591,14 +7998,14 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, int wxGrid::YToRow( int y ) { return CoordToRowOrCol(y, m_defaultRowHeight, - WXGRID_MIN_ROW_HEIGHT, m_rowBottoms, m_numRows, FALSE); + m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false); } int wxGrid::XToCol( int x ) { return CoordToRowOrCol(x, m_defaultColWidth, - WXGRID_MIN_COL_WIDTH, m_colRights, m_numCols, FALSE); + m_minAcceptableColWidth, m_colRights, m_numCols, false); } @@ -7761,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 ) @@ -7776,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(); } @@ -7822,11 +8229,11 @@ bool wxGrid::MoveCursorUp( bool expandSelection ) m_currentCellCoords.GetCol() ); } else - return FALSE; - return TRUE; + return false; + return true; } - return FALSE; + return false; } @@ -7856,11 +8263,11 @@ bool wxGrid::MoveCursorDown( bool expandSelection ) m_currentCellCoords.GetCol() ); } else - return FALSE; - return TRUE; + return false; + return true; } - return FALSE; + return false; } @@ -7890,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; } @@ -7924,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 ) @@ -7943,53 +8350,48 @@ bool wxGrid::MovePageUp() m_gridWin->GetClientSize( &cw, &ch ); int y = GetRowTop(row); - int newRow = YToRow( y - ch + 1 ); - if ( newRow == -1 ) - { - newRow = 0; - } - else if ( newRow == row ) + int newRow = internalYToRow( y - ch + 1 ); + + if ( newRow == row ) { + //row > 0 , so newrow can never be less than 0 here. newRow = row - 1; } 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 < m_numRows ) + if ( (row+1) < m_numRows ) { int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); int y = GetRowTop(row); - int newRow = YToRow( y + ch ); - if ( newRow == -1 ) - { - newRow = m_numRows - 1; - } - else if ( newRow == row ) + int newRow = internalYToRow( y + ch ); + if ( newRow == row ) { + // row < m_numRows , so newrow can't overflow here. 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 ) @@ -8049,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 ) @@ -8113,10 +8515,10 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) @@ -8177,10 +8579,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } bool wxGrid::MoveCursorRightBlock( bool expandSelection ) @@ -8241,10 +8643,10 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) SetCurrentCell( row, col ); } - return TRUE; + return true; } - return FALSE; + return false; } @@ -8265,6 +8667,11 @@ void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) *vert = m_colLabelVertAlign; } +int wxGrid::GetColLabelTextOrientation() +{ + return m_colLabelTextOrientation; +} + wxString wxGrid::GetRowLabelValue( int row ) { if ( m_table ) @@ -8301,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 ); } } @@ -8324,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 ); } } @@ -8447,6 +8854,26 @@ 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 +// +// Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD); +// pGrid->SetLabelFont(font); +// pGrid->SetColLabelTextOrientation(wxVERTICAL); +// +void wxGrid::SetColLabelTextOrientation( int textOrientation ) +{ + if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL ) + { + m_colLabelTextOrientation = textOrientation; + } + + if ( !GetBatchCount() ) + { + m_colLabelWin->Refresh(); + } +} + void wxGrid::SetRowLabelValue( int row, const wxString& s ) { if ( m_table ) @@ -8460,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 ); } } } @@ -8479,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 ); } } } @@ -8524,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); } } @@ -8540,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); } } @@ -8628,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); } // ---------------------------------------------------------------------------- @@ -8761,7 +9198,7 @@ bool wxGrid::CanHaveAttributes() { if ( !m_table ) { - return FALSE; + return false; } return m_table->CanHaveAttributes(); @@ -8802,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; } } @@ -8843,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 ) @@ -8887,9 +9325,7 @@ 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 ); + wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); if(!attr) attr = new wxGridCellAttr; wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); @@ -9154,10 +9590,14 @@ void wxGrid::EnableDragGridSize( bool enable ) m_canDragGridSize = enable; } +void wxGrid::EnableDragCell( bool enable ) +{ + m_canDragCell = enable; +} void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) { - m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT ); + m_defaultRowHeight = wxMax( height, m_minAcceptableRowHeight ); if ( resizeExistingRows ) { @@ -9176,6 +9616,9 @@ 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 ( m_rowHeights.IsEmpty() ) { // need to really create the array @@ -9197,7 +9640,7 @@ void wxGrid::SetRowSize( int row, int height ) void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) { - m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH ); + m_defaultColWidth = wxMax( width, m_minAcceptableColWidth ); if ( resizeExistingCols ) { @@ -9217,6 +9660,14 @@ void wxGrid::SetColSize( int col, int width ) wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") ); // should we check that it's bigger than GetColMinimalWidth(col) here? + // (VZ) + // No, because it is reasonable to assume the library user know's + // what he is doing. However whe should test against the weaker + // constariant of minimalAcceptableWidth, as this breaks rendering + // + // This test then fixes sf.net bug #645734 + + if ( width < GetColMinimalAcceptableWidth()) { return; } if ( m_colWidths.IsEmpty() ) { @@ -9251,24 +9702,60 @@ void wxGrid::SetColSize( int col, int width ) void wxGrid::SetColMinimalWidth( int col, int width ) { - m_colMinWidths.Put(col, width); + if (width > GetColMinimalAcceptableWidth()) { + wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col; + m_colMinWidths[key] = width; + } } void wxGrid::SetRowMinimalHeight( int row, int width ) { - m_rowMinHeights.Put(row, width); + if (width > GetRowMinimalAcceptableHeight()) { + wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row; + m_rowMinHeights[key] = width; + } } int wxGrid::GetColMinimalWidth(int col) const { - long value = m_colMinWidths.Get(col); - return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH; + 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 { - long value = m_rowMinHeights.Get(row); - return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT; + 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 ) +{ + // We do allow a width of 0 since this gives us + // an easy way to temporarily hidding columns. + if ( width<0 ) + return; + m_minAcceptableColWidth = width; +} + +void wxGrid::SetRowMinimalAcceptableHeight( int height ) +{ + // We do allow a height of 0 since this gives us + // an easy way to temporarily hidding rows. + if ( height<0 ) + return; + m_minAcceptableRowHeight = height; +}; + +int wxGrid::GetColMinimalAcceptableWidth() const +{ + return m_minAcceptableColWidth; +} + +int wxGrid::GetRowMinimalAcceptableHeight() const +{ + return m_minAcceptableRowHeight; } // ---------------------------------------------------------------------------- @@ -9279,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; @@ -9318,7 +9809,11 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) dc.SetFont( GetLabelFont() ); if ( column ) + { dc.GetTextExtent( GetColLabelValue(col), &w, &h ); + if( GetColLabelTextOrientation() == wxVERTICAL ) + w = h; + } else dc.GetTextExtent( GetRowLabelValue(row), &w, &h ); @@ -9359,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 @@ -9374,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 ) @@ -9436,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 @@ -9503,22 +9998,91 @@ void wxGrid::AutoSize() SetClientSize(sizeFit); } +void wxGrid::AutoSizeRowLabelSize( int row ) +{ + wxArrayString lines; + long w, h; + + // Hide the edit control, so it + // won't interfer with drag-shrinking. + if( IsCellEditControlShown() ) + { + HideCellEditControl(); + SaveEditControlValue(); + } + + // autosize row height depending on label text + StringToLines( GetRowLabelValue( row ), lines ); + wxClientDC dc( m_rowLabelWin ); + GetTextBoxSize( dc, lines, &w, &h); + if( h < m_defaultRowHeight ) + h = m_defaultRowHeight; + SetRowSize(row, h); + ForceRefresh(); +} + +void wxGrid::AutoSizeColLabelSize( int col ) +{ + wxArrayString lines; + long w, h; + + // Hide the edit control, so it + // won't interfer with drag-shrinking. + if( IsCellEditControlShown() ) + { + HideCellEditControl(); + SaveEditControlValue(); + } + + // autosize column width depending on label text + StringToLines( GetColLabelValue( col ), lines ); + wxClientDC dc( m_colLabelWin ); + if( GetColLabelTextOrientation() == wxHORIZONTAL ) + GetTextBoxSize( dc, lines, &w, &h); + else + GetTextBoxSize( dc, lines, &h, &w); + if( w < m_defaultColWidth ) + w = m_defaultColWidth; + SetColSize(col, w); + ForceRefresh(); +} + wxSize wxGrid::DoGetBestSize() const { // don't set sizes, only calculate them 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() @@ -9548,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 && @@ -9575,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 ); } @@ -9585,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 ); } @@ -9597,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 ); } @@ -9730,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 ); @@ -9805,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) ); @@ -9815,8 +10379,6 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, return rect; } - - // // ------ Grid event classes // @@ -9895,7 +10457,5 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type, m_ctrl = ctrl; } - -#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID - #endif // wxUSE_GRID +