///////////////////////////////////////////////////////////////////////////
-// Name: generic/grid.cpp
+// Name: src/generic/grid.cpp
// Purpose: wxGrid and related classes
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
-// Modified by:
+// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
// Created: 1/08/1999
// RCS-ID: $Id$
// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#ifdef __GNUG__
- #pragma implementation "grid.h"
-#endif
-
-// For compilers that support precompilatixon, includes "wx/wx.h".
+// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
#ifdef __BORLANDC__
#pragma hdrstop
#endif
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-#include "gridg.cpp"
-#else
+#if wxUSE_GRID
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/checkbox.h"
#include "wx/combobox.h"
#include "wx/valtext.h"
+ #include "wx/intl.h"
+ #include "wx/math.h"
+ #include "wx/listbox.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"
// array classes
// ----------------------------------------------------------------------------
-WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridCellAttr *, wxArrayAttrs,
+ class WXDLLIMPEXP_ADV);
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"
WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+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)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
+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; }
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)
};
-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
{
public:
wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
private:
wxGrid *m_owner;
- void OnPaint( wxPaintEvent &event );
+ void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)
};
-class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
{
public:
wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
wxGrid *m_owner;
void OnMouseEvent( wxMouseEvent& event );
+ void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
};
-class WXDLLEXPORT wxGridWindow : public wxPanel
+class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
{
public:
wxGridWindow()
{
- m_owner = (wxGrid *)NULL;
- m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
- m_colLabelWin = (wxGridColLabelWindow *)NULL;
+ m_owner = NULL;
+ m_rowLabelWin = NULL;
+ m_colLabelWin = NULL;
}
wxGridWindow( wxGrid *parent,
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size );
- ~wxGridWindow();
+ ~wxGridWindow() {}
void ScrollWindow( int dx, int dy, const wxRect *rect );
+ wxGrid* GetOwner() { return m_owner; }
+
private:
wxGrid *m_owner;
wxGridRowLabelWindow *m_rowLabelWin;
wxGridColLabelWindow *m_colLabelWin;
void OnPaint( wxPaintEvent &event );
+ void OnMouseWheel( wxMouseEvent& event );
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)
};
-
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)
+ wxGrid *m_grid;
+ wxGridCellEditor *m_editor;
+
+ // Work around the fact that a focus kill event can be sent to
+ // a combobox within a set focus event.
+ 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()
-
// ----------------------------------------------------------------------------
// the internal data representation used by wxGridCellAttrProvider
// ----------------------------------------------------------------------------
// this class stores attributes set for cells
-class WXDLLEXPORT wxGridCellAttrData
+class WXDLLIMPEXP_ADV wxGridCellAttrData
{
public:
void SetAttr(wxGridCellAttr *attr, int row, int col);
};
// this class stores attributes set for rows or columns
-class WXDLLEXPORT wxGridRowOrColAttrData
+class WXDLLIMPEXP_ADV wxGridRowOrColAttrData
{
public:
// empty ctor to suppress warnings
- wxGridRowOrColAttrData() { }
+ wxGridRowOrColAttrData() {}
~wxGridRowOrColAttrData();
void SetAttr(wxGridCellAttr *attr, int rowOrCol);
// 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;
wxGridCellRenderer* renderer,
wxGridCellEditor* editor)
: m_typeName(typeName), m_renderer(renderer), m_editor(editor)
- { }
+ {}
~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() {}
wxGridDataTypeInfoArray m_typeinfo;
};
+
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
#ifdef DEBUG_ATTR_CACHE
static size_t gs_nAttrCacheHits = 0;
static size_t gs_nAttrCacheMisses = 0;
-#endif // DEBUG_ATTR_CACHE
+#endif
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
wxGridCellCoords wxGridNoCellCoords( -1, -1 );
-wxRect wxGridNoCellRect( -1, -1, -1, -1 );
+wxRect wxGridNoCellRect( -1, -1, -1, -1 );
// scroll line size
-// TODO: fixed so far - make configurable later (and also different for x/y)
-static const size_t GRID_SCROLL_LINE = 10;
+// TODO: this doesn't work at all, grid cells have different sizes and approx
+// calculations don't work as because of the size mismatch scrollbars
+// sometimes fail to be shown when they should be or vice versa
+//
+// The scroll bars may be a little flakey once in a while, but that is
+// surely much less horrible than having scroll lines of only 1!!!
+// -- Robin
+//
+// Well, it's still seriously broken so it might be better but needs
+// fixing anyhow
+// -- Vadim
+static const size_t GRID_SCROLL_LINE_X = 15; // 1;
+static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
// the size of hash tables used a bit everywhere (the max number of elements
// in these hash tables is the number of rows/columns)
static const int GRID_HASH_SIZE = 100;
+#if 0
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static inline int GetScrollX(int x)
+{
+ return (x + GRID_SCROLL_LINE_X - 1) / GRID_SCROLL_LINE_X;
+}
+
+static inline int GetScrollY(int y)
+{
+ return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
+}
+#endif
+
// ============================================================================
// implementation
// ============================================================================
wxGridCellEditor::wxGridCellEditor()
{
m_control = NULL;
+ m_attr = NULL;
}
-
wxGridCellEditor::~wxGridCellEditor()
{
Destroy();
{
// erase the background because we might not fill the cell
wxClientDC dc(m_control->GetParent());
+ 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);
{
if (m_control)
{
- m_control->PopEventHandler(TRUE /* delete it*/);
+ m_control->PopEventHandler( true /* delete it*/ );
m_control->Destroy();
m_control = NULL;
void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
+
m_control->Show(show);
if ( show )
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
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
}
}
void wxGridCellEditor::SetSize(const wxRect& rect)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
+
m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
}
bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
{
- // accept the simple key presses, not anything with Ctrl/Alt/Meta
- return !event.HasModifiers();
+ 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;
+
+ int key = 0;
+ bool keyOk = true;
+
+#ifdef __WXGTK20__
+ // If it's a F-Key or other special key then it shouldn't start the
+ // editor.
+ if (event.GetKeyCode() >= WXK_START)
+ return false;
+#endif
+#if wxUSE_UNICODE
+ // if the unicode key code is not really a unicode character (it may
+ // be a function key or etc., the platforms appear to always give us a
+ // small value in this case) then fallback to the ASCII key code but
+ // don't do anything for function keys or etc.
+ key = event.GetUnicodeKey();
+ if (key <= 127)
+ {
+ key = event.GetKeyCode();
+ keyOk = (key <= 127);
+ }
+#else
+ key = event.GetKeyCode();
+ keyOk = (key <= 255);
+#endif
+
+ return keyOk;
}
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
{
}
+#if wxUSE_TEXTCTRL
+
// ----------------------------------------------------------------------------
// wxGridCellTextEditor
// ----------------------------------------------------------------------------
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize
#if defined(__WXMSW__)
- , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
+ , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL | wxNO_BORDER
#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);
}
void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
wxGridCellAttr * WXUNUSED(attr))
{
- // as we fill the entire client area, don't do anything here to minimize
- // flicker
+ // as we fill the entire client area,
+ // don't do anything here to minimize flicker
}
void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
{
wxRect rect(rectOrig);
- // Make the edit control large enough to allow for internal
- // margins
+ // Make the edit control large enough to allow for internal margins
//
- // TODO: remove this if the text ctrl sizing is improved esp. for
- // unix
+ // TODO: remove this if the text ctrl sizing is improved esp. for unix
//
#if defined(__WXGTK__)
if (rect.x != 0)
rect.width -= 1;
rect.height -= 1;
}
-#else // !GTK
- int extra_x = ( rect.x > 2 )? 2 : 1;
- int extra_y = ( rect.y > 2 )? 2 : 1;
-#if defined(__WXMOTIF__)
- extra_x *= 2;
- extra_y *= 2;
-#endif
+#elif defined(__WXMSW__)
+ if ( rect.x == 0 )
+ rect.x += 2;
+ else
+ rect.x += 3;
+
+ if ( rect.y == 0 )
+ rect.y += 2;
+ else
+ rect.y += 3;
+
+ rect.width -= 2;
+ rect.height -= 2;
+#else
+ int extra_x = ( rect.x > 2 ) ? 2 : 1;
+ int extra_y = ( rect.y > 2 ) ? 2 : 1;
+
+ #if defined(__WXMOTIF__)
+ extra_x *= 2;
+ extra_y *= 2;
+ #endif
+
rect.SetLeft( wxMax(0, rect.x - extra_x) );
rect.SetTop( wxMax(0, rect.y - extra_y) );
- rect.SetRight( rect.GetRight() + 2*extra_x );
- rect.SetBottom( rect.GetBottom() + 2*extra_y );
-#endif // GTK/!GTK
+ rect.SetRight( rect.GetRight() + 2 * extra_x );
+ rect.SetBottom( rect.GetBottom() + 2 * extra_y );
+#endif
wxGridCellEditor::SetSize(rect);
}
void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
m_startValue = grid->GetTable()->GetValue(row, col);
{
Text()->SetValue(startValue);
Text()->SetInsertionPointEnd();
+ Text()->SetSelection(-1, -1);
Text()->SetFocus();
}
-bool wxGridCellTextEditor::EndEdit(int row, int col,
- wxGrid* grid)
+bool wxGridCellTextEditor::EndEdit(int row, int col, wxGrid* grid)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
- bool changed = FALSE;
+ 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;
}
-
void wxGridCellTextEditor::Reset()
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
DoReset(m_startValue);
}
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)
{
- // we don't check for !HasModifiers() because IsAcceptedKey() did it
+ // 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.
- // insert the key in the control
+ wxTextCtrl* tc = Text();
wxChar ch;
- int keycode = event.GetKeyCode();
- switch ( keycode )
- {
- case WXK_NUMPAD0:
- case WXK_NUMPAD1:
- case WXK_NUMPAD2:
- case WXK_NUMPAD3:
- case WXK_NUMPAD4:
- case WXK_NUMPAD5:
- case WXK_NUMPAD6:
- case WXK_NUMPAD7:
- case WXK_NUMPAD8:
- case WXK_NUMPAD9:
- ch = _T('0') + keycode - WXK_NUMPAD0;
- break;
-
- case WXK_MULTIPLY:
- case WXK_NUMPAD_MULTIPLY:
- ch = _T('*');
- break;
-
- case WXK_ADD:
- case WXK_NUMPAD_ADD:
- ch = _T('+');
- break;
+ long pos;
- case WXK_SUBTRACT:
- case WXK_NUMPAD_SUBTRACT:
- ch = _T('-');
- break;
+#if wxUSE_UNICODE
+ ch = event.GetUnicodeKey();
+ if (ch <= 127)
+ ch = (wxChar)event.GetKeyCode();
+#else
+ ch = (wxChar)event.GetKeyCode();
+#endif
- case WXK_DECIMAL:
- case WXK_NUMPAD_DECIMAL:
- ch = _T('.');
+ switch (ch)
+ {
+ case WXK_DELETE:
+ // delete the character at the cursor
+ pos = tc->GetInsertionPoint();
+ if (pos < tc->GetLastPosition())
+ tc->Remove(pos, pos + 1);
break;
- case WXK_DIVIDE:
- case WXK_NUMPAD_DIVIDE:
- ch = _T('/');
+ case WXK_BACK:
+ // delete the character before the cursor
+ pos = tc->GetInsertionPoint();
+ if (pos > 0)
+ tc->Remove(pos - 1, pos);
break;
default:
- if ( keycode < 256 && keycode >= 0 && isprint(keycode) )
- {
- // FIXME this is not going to work for non letters...
- if ( !event.ShiftDown() )
- {
- keycode = tolower(keycode);
- }
-
- ch = (wxChar)keycode;
- }
- else
- {
- ch = _T('\0');
- }
- }
-
- if ( ch )
- {
- Text()->AppendText(ch);
- }
- else
- {
- event.Skip();
+ tc->WriteText(ch);
+ break;
}
}
// wxMotif needs a little extra help...
size_t pos = (size_t)( Text()->GetInsertionPoint() );
wxString s( Text()->GetValue() );
- s = s.Left(pos) + "\n" + s.Mid(pos);
+ s = s.Left(pos) + wxT("\n") + s.Mid(pos);
Text()->SetValue(s);
Text()->SetInsertionPoint( pos );
#else
else
{
long tmp;
- if ( !params.ToLong(&tmp) )
+ if ( params.ToLong(&tmp) )
{
- wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str());
+ m_maxChars = (size_t)tmp;
}
else
{
- m_maxChars = (size_t)tmp;
+ wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
}
}
}
+// return the value in the text control
+wxString wxGridCellTextEditor::GetValue() const
+{
+ return Text()->GetValue();
+}
+
// ----------------------------------------------------------------------------
// wxGridCellNumberEditor
// ----------------------------------------------------------------------------
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);
wxGridCellEditor::Create(parent, id, evtHandler);
}
else
+#endif
{
// just a text control
wxGridCellTextEditor::Create(parent, id, evtHandler);
#if wxUSE_VALIDATORS
Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
+#endif
}
}
}
else
{
+ m_valueOld = 0;
wxString sValue = table->GetValue(row, col);
- if (! sValue.ToLong(&m_valueOld))
+ 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());
}
wxGrid* grid)
{
bool changed;
- long value;
+ long value = 0;
+ wxString text;
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
value = Spin()->GetValue();
changed = value != m_valueOld;
+ if (changed)
+ text = wxString::Format(wxT("%ld"), value);
}
else
+#endif
{
- changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld);
+ text = Text()->GetValue();
+ changed = (text.empty() || text.ToLong(&value)) && (value != m_valueOld);
}
if ( changed )
if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
grid->GetTable()->SetValueAsLong(row, col, value);
else
- grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%ld"), value));
+ grid->GetTable()->SetValue(row, col, text);
}
return changed;
void wxGridCellNumberEditor::Reset()
{
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
Spin()->SetValue((int)m_valueOld);
}
else
+#endif
{
DoReset(GetString());
}
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 == '-' )
+ if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-')
{
wxGridCellTextEditor::StartingKey(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();
}
}
}
+// return the value in the spin control if it is there (the text control otherwise)
+wxString wxGridCellNumberEditor::GetValue() const
+{
+ wxString s;
+
+#if wxUSE_SPINCTRL
+ if ( HasRange() )
+ {
+ long value = Spin()->GetValue();
+ s.Printf(wxT("%ld"), value);
+ }
+ else
+#endif
+ {
+ s = Text()->GetValue();
+ }
+
+ return s;
+}
+
// ----------------------------------------------------------------------------
// wxGridCellFloatEditor
// ----------------------------------------------------------------------------
#if wxUSE_VALIDATORS
Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
+#endif
}
void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
}
else
{
+ m_valueOld = 0.0;
wxString sValue = table->GetValue(row, col);
- if (! sValue.ToDouble(&m_valueOld))
+ if (! sValue.ToDouble(&m_valueOld) && ! sValue.empty())
{
wxFAIL_MSG( _T("this cell doesn't have float value") );
return;
bool wxGridCellFloatEditor::EndEdit(int row, int col,
wxGrid* grid)
{
- double value;
- if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) )
+ double value = 0.0;
+ wxString text(Text()->GetValue());
+
+ if ( (text.empty() || text.ToDouble(&value)) &&
+ !wxIsSameDouble(value, m_valueOld) )
{
if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
grid->GetTable()->SetValueAsDouble(row, col, value);
else
- grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%f"), value));
+ grid->GetTable()->SetValue(row, col, text);
- return TRUE;
- }
- else
- {
- return FALSE;
+ return true;
}
+
+ return false;
}
void wxGridCellFloatEditor::Reset()
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{
- int keycode = (int)event.KeyCode();
- if ( isdigit(keycode) ||
- keycode == '+' || keycode == '-' || keycode == '.' )
+ 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);
wxString wxGridCellFloatEditor::GetString() const
{
wxString fmt;
- if ( m_width == -1 )
+ if ( m_precision == -1 && m_width != -1)
{
- // default width/precision
- fmt = _T("%g");
+ // default precision
+ fmt.Printf(_T("%%%d.f"), m_width);
}
- else if ( m_precision == -1 )
+ else if ( m_precision != -1 && m_width == -1)
{
- // default precision
- fmt.Printf(_T("%%%d.g"), m_width);
+ // default width
+ fmt.Printf(_T("%%.%df"), m_precision);
+ }
+ else if ( m_precision != -1 && m_width != -1 )
+ {
+ fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
}
else
{
- fmt.Printf(_T("%%%d.%dg"), m_width, m_precision);
+ // default width/precision
+ fmt = _T("%f");
}
return wxString::Format(fmt, m_valueOld);
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;
+ 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
- default:
- // additionally accept 'e' as in '1e+6'
- if ( (keycode < 128) &&
- (isdigit(keycode) || tolower(keycode) == 'e') )
- return TRUE;
+ if ( (keycode < 128) &&
+ (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
+ is_decimal_point || keycode == '+' || keycode == '-') )
+ {
+ return true;
}
}
- return FALSE;
+ return false;
}
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+
// ----------------------------------------------------------------------------
// wxGridCellBoolEditor
// ----------------------------------------------------------------------------
void wxGridCellBoolEditor::SetSize(const wxRect& r)
{
- bool resize = FALSE;
+ bool resize = false;
wxSize size = m_control->GetSize();
wxCoord minSize = wxMin(r.width, r.height);
// reset to default size if it had been made smaller
size = sizeBest;
- resize = TRUE;
+ resize = true;
}
if ( size.x >= minSize || size.y >= minSize )
// leave 1 pixel margin
size.x = size.y = minSize - 2;
- resize = TRUE;
+ resize = true;
}
if ( resize )
size.y -= 2;
#endif
- m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2);
+ int hAlign = wxALIGN_CENTRE;
+ 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
+
+ y = r.y + r.height / 2 - size.y / 2;
+ }
+ else if (hAlign == wxALIGN_RIGHT)
+ {
+ x = r.x + r.width - size.x - 2;
+ y = r.y + r.height / 2 - size.y / 2;
+ }
+ else if (hAlign == wxALIGN_CENTRE)
+ {
+ x = r.x + r.width / 2 - size.x / 2;
+ y = r.y + r.height / 2 - size.y / 2;
+ }
+
+ m_control->Move(x, y);
}
void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
{
wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxT("The wxGridCellEditor must be created first!"));
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+ {
m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+ }
else
- m_startValue = !!grid->GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid->GetTable()->GetValue(row, col) );
+ m_startValue = !( !cellval || (cellval == wxT("0")) );
+ }
+
CBox()->SetValue(m_startValue);
CBox()->SetFocus();
}
wxGrid* grid)
{
wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ 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 )
{
void wxGridCellBoolEditor::Reset()
{
wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxT("The wxGridCellEditor must be created first!"));
CBox()->SetValue(m_startValue);
}
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
+{
+ bool bSet = CBox()->GetValue();
+ return bSet ? _T("1") : wxEmptyString;
}
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+
// ----------------------------------------------------------------------------
// wxGridCellChoiceEditor
// ----------------------------------------------------------------------------
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices,
+ bool allowOthers)
+ : m_choices(choices),
+ m_allowOthers(allowOthers) { }
+
wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
const wxString choices[],
bool allowOthers)
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);
}
// flicker
// TODO: It doesn't actually fill the client area since the height of a
- // combo always defaults to the standard... Until someone has time to
- // figure out the right rectangle to paint, just do it the normal way...
+ // combo always defaults to the standard. Until someone has time to
+ // figure out the right rectangle to paint, just do it the normal way.
wxGridCellEditor::PaintBackground(rectCell, attr);
}
void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
{
wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxT("The wxGridCellEditor must be created first!"));
+
+ wxGridCellEditorEvtHandler* evtHandler = NULL;
+ if (m_control)
+ 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);
- Combo()->SetValue(m_startValue);
- size_t count = m_choices.GetCount();
- for (size_t i=0; i<count; i++)
+ if (m_allowOthers)
{
- if (m_startValue == m_choices[i])
- {
- Combo()->SetSelection(i);
- break;
- }
+ Combo()->SetValue(m_startValue);
+ }
+ else
+ {
+ // find the right position, or default to the first if not found
+ int pos = Combo()->FindString(m_startValue);
+ if (pos == wxNOT_FOUND)
+ pos = 0;
+ Combo()->SetSelection(pos);
}
+
Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
+
+ if (evtHandler)
+ {
+ // When dropping down the menu, a kill focus event
+ // happens after this point, so we can't reset the flag yet.
+#if !defined(__WXGTK20__)
+ evtHandler->SetInSetFocus(false);
+#endif
+ }
}
bool wxGridCellChoiceEditor::EndEdit(int row, int col,
wxGrid* grid)
{
wxString value = Combo()->GetValue();
- bool changed = value != m_startValue;
-
- if ( changed )
- grid->GetTable()->SetValue(row, col, value);
+ if ( value == m_startValue )
+ return false;
- m_startValue = wxEmptyString;
- Combo()->SetValue(m_startValue);
+ grid->GetTable()->SetValue(row, col, value);
- return changed;
+ return true;
}
void wxGridCellChoiceEditor::Reset()
}
}
+// return the value in the text control
+wxString wxGridCellChoiceEditor::GetValue() const
+{
+ return Combo()->GetValue();
+}
+
+#endif // wxUSE_COMBOBOX
+
// ----------------------------------------------------------------------------
// wxGridCellEditorEvtHandler
// ----------------------------------------------------------------------------
-void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
{
- switch ( event.KeyCode() )
+ // Don't disable the cell if we're just starting to edit it
+ if (m_inSetFocus)
+ return;
+
+ // accept changes
+ m_grid->DisableCellEditControl();
+
+ event.Skip();
+}
+
+void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+{
+ switch ( event.GetKeyCode() )
{
case WXK_ESCAPE:
m_editor->Reset();
break;
case WXK_TAB:
- event.Skip( m_grid->ProcessEvent( event ) );
+ m_grid->GetEventHandler()->ProcessEvent( event );
break;
case WXK_RETURN:
- if (!m_grid->ProcessEvent(event))
+ case WXK_NUMPAD_ENTER:
+ if (!m_grid->GetEventHandler()->ProcessEvent(event))
m_editor->HandleReturn(event);
break;
-
default:
event.Skip();
+ break;
}
}
void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
{
- switch ( event.KeyCode() )
+ int row = m_grid->GetGridCursorRow();
+ int col = m_grid->GetGridCursorCol();
+ wxRect rect = m_grid->CellToRect( row, col );
+ int cw, ch;
+ m_grid->GetGridWindow()->GetClientSize( &cw, &ch );
+
+ // if cell width is smaller than grid client area, cell is wholly visible
+ bool wholeCellVisible = (rect.GetWidth() < cw);
+
+ switch ( event.GetKeyCode() )
{
case WXK_ESCAPE:
case WXK_TAB:
case WXK_RETURN:
+ case WXK_NUMPAD_ENTER:
+ break;
+
+ case WXK_HOME:
+ {
+ if ( wholeCellVisible )
+ {
+ // no special processing needed...
+ event.Skip();
+ break;
+ }
+
+ // do special processing for partly visible cell...
+
+ // get the widths of all cells previous to this one
+ int colXPos = 0;
+ for ( int i = 0; i < col; i++ )
+ {
+ colXPos += m_grid->GetColSize(i);
+ }
+
+ int xUnit = 1, yUnit = 1;
+ m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
+ if (col != 0)
+ {
+ m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));
+ }
+ else
+ {
+ m_grid->Scroll(colXPos / xUnit, m_grid->GetScrollPos(wxVERTICAL));
+ }
+ event.Skip();
+ break;
+ }
+
+ case WXK_END:
+ {
+ if ( wholeCellVisible )
+ {
+ // no special processing needed...
+ event.Skip();
+ break;
+ }
+
+ // do special processing for partly visible cell...
+
+ int textWidth = 0;
+ wxString value = m_grid->GetCellValue(row, col);
+ if ( wxEmptyString != value )
+ {
+ // get width of cell CONTENTS (text)
+ int y;
+ wxFont font = m_grid->GetCellFont(row, col);
+ m_grid->GetTextExtent(value, &textWidth, &y, NULL, NULL, &font);
+
+ // try to RIGHT align the text by scrolling
+ int client_right = m_grid->GetGridWindow()->GetClientSize().GetWidth();
+
+ // (m_grid->GetScrollLineX()*2) is a factor for not scrolling to far,
+ // otherwise the last part of the cell content might be hidden below the scroll bar
+ // FIXME: maybe there is a more suitable correction?
+ textWidth -= (client_right - (m_grid->GetScrollLineX() * 2));
+ if ( textWidth < 0 )
+ {
+ textWidth = 0;
+ }
+ }
+
+ // get the widths of all cells previous to this one
+ int colXPos = 0;
+ for ( int i = 0; i < col; i++ )
+ {
+ colXPos += m_grid->GetColSize(i);
+ }
+
+ // and add the (modified) text width of the cell contents
+ // as we'd like to see the last part of the cell contents
+ colXPos += textWidth;
+
+ int xUnit = 1, yUnit = 1;
+ m_grid->GetScrollPixelsPerUnit(&xUnit, &yUnit);
+ m_grid->Scroll(colXPos / xUnit - 1, m_grid->GetScrollPos(wxVERTICAL));
+ event.Skip();
break;
+ }
default:
event.Skip();
+ break;
}
}
{
dc.SetBackgroundMode( wxSOLID );
- if ( isSelected )
+ // grey out fields if the grid is disabled
+ if ( grid.IsEnabled() )
{
- dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ if ( isSelected )
+ {
+ dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ }
+ else
+ {
+ dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ }
}
else
{
- dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
}
dc.SetPen( *wxTRANSPARENT_PEN );
// wxGridCellStringRenderer
// ----------------------------------------------------------------------------
-void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
- wxGridCellAttr& attr,
+void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
+ const wxGridCellAttr& attr,
wxDC& dc,
bool isSelected)
{
// TODO some special colours for attr.IsReadOnly() case?
- if ( isSelected )
+ // different coloured text when the grid is disabled
+ if ( grid.IsEnabled() )
{
- dc.SetTextBackground( grid.GetSelectionBackground() );
- dc.SetTextForeground( grid.GetSelectionForeground() );
+ if ( isSelected )
+ {
+ dc.SetTextBackground( grid.GetSelectionBackground() );
+ dc.SetTextForeground( grid.GetSelectionForeground() );
+ }
+ else
+ {
+ dc.SetTextBackground( attr.GetBackgroundColour() );
+ dc.SetTextForeground( attr.GetTextColour() );
+ }
}
else
{
- dc.SetTextBackground( attr.GetBackgroundColour() );
- dc.SetTextForeground( attr.GetTextColour() );
+ dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+ dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
}
dc.SetFont( attr.GetFont() );
}
-wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+wxSize wxGridCellStringRenderer::DoGetBestSize(const wxGridCellAttr& attr,
wxDC& dc,
const wxString& text)
{
int row, int col,
bool isSelected)
{
- wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+ wxRect rect = rectCell;
+ rect.Inflate(-1);
- // now we only have to draw the text
- SetTextColoursAndFont(grid, attr, dc, isSelected);
+ // erase only this cells background, overflow cells should have been erased
+ wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- wxRect rect = rectCell;
- rect.Inflate(-1);
+ int overflowCols = 0;
+
+ if (attr.GetOverflow())
+ {
+ int cols = grid.GetNumberCols();
+ int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth();
+ int cell_rows, cell_cols;
+ attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <= 0
+ if ((best_width > rectCell.width) && (col < cols) && grid.GetTable())
+ {
+ int i, c_cols, c_rows;
+ for (i = col+cell_cols; i < cols; i++)
+ {
+ bool is_empty = true;
+ for (int j=row; j < row + cell_rows; j++)
+ {
+ // check w/ anchor cell for multicell block
+ grid.GetCellSize(j, i, &c_rows, &c_cols);
+ if (c_rows > 0)
+ c_rows = 0;
+ if (!grid.GetTable()->IsEmptyCell(j + c_rows, i))
+ {
+ is_empty = false;
+ break;
+ }
+ }
+
+ if (is_empty)
+ {
+ rect.width += grid.GetColSize(i);
+ }
+ else
+ {
+ i--;
+ break;
+ }
+
+ if (rect.width >= best_width)
+ break;
+ }
+
+ overflowCols = i - col - cell_cols + 1;
+ if (overflowCols >= cols)
+ overflowCols = cols - 1;
+ }
+
+ if (overflowCols > 0) // redraw overflow cells w/ proper hilight
+ {
+ hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned
+ wxRect clip = rect;
+ clip.x += rectCell.width;
+ // draw each overflow cell individually
+ int col_end = col + cell_cols + overflowCols;
+ if (col_end >= grid.GetNumberCols())
+ col_end = grid.GetNumberCols() - 1;
+ for (int i = col + cell_cols; i <= col_end; i++)
+ {
+ clip.width = grid.GetColSize(i) - 1;
+ dc.DestroyClippingRegion();
+ dc.SetClippingRegion(clip);
+
+ SetTextColoursAndFont(grid, attr, dc,
+ grid.IsInSelection(row,i));
+
+ grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
+ rect, hAlign, vAlign);
+ clip.x += grid.GetColSize(i) - 1;
+ }
+
+ rect = rectCell;
+ rect.Inflate(-1);
+ rect.width++;
+ dc.DestroyClippingRegion();
+ }
+ }
+
+ // now we only have to draw the text
+ SetTextColoursAndFont(grid, attr, dc, isSelected);
grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
rect, hAlign, vAlign);
// wxGridCellNumberRenderer
// ----------------------------------------------------------------------------
-wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col)
+wxString wxGridCellNumberRenderer::GetString(const wxGrid& grid, int row, int col)
{
wxGridTableBase *table = grid.GetTable();
wxString text;
// draw the text right aligned by default
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- hAlign = wxRIGHT;
+ hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell;
rect.Inflate(-1);
return renderer;
}
-wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+wxString wxGridCellFloatRenderer::GetString(const wxGrid& grid, int row, int col)
{
wxGridTableBase *table = grid.GetTable();
if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
{
val = table->GetValueAsDouble(row, col);
- hasDouble = TRUE;
+ hasDouble = true;
}
else
{
{
if ( m_width == -1 )
{
- // default width/precision
- m_format = _T("%f");
+ if ( m_precision == -1 )
+ {
+ // default width/precision
+ m_format = _T("%f");
+ }
+ else
+ {
+ m_format.Printf(_T("%%.%df"), m_precision);
+ }
}
else if ( m_precision == -1 )
{
}
text.Printf(m_format, val);
+
}
//else: text already contains the string
// draw the text right aligned by default
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- hAlign = wxRIGHT;
+ hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell;
rect.Inflate(-1);
void wxGridCellFloatRenderer::SetParameters(const wxString& params)
{
- bool ok = TRUE;
-
if ( !params )
{
// reset to defaults
else
{
wxString tmp = params.BeforeFirst(_T(','));
- if ( !!tmp )
+ if ( !tmp.empty() )
{
long width;
- if ( !tmp.ToLong(&width) )
+ if ( tmp.ToLong(&width) )
{
- ok = FALSE;
+ SetWidth((int)width);
}
else
{
- SetWidth((int)width);
-
- tmp = params.AfterFirst(_T(','));
- if ( !!tmp )
- {
- long precision;
- if ( !tmp.ToLong(&precision) )
- {
- ok = FALSE;
- }
- else
- {
- SetPrecision((int)precision);
- }
- }
+ wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
}
}
- if ( !ok )
+ tmp = params.AfterFirst(_T(','));
+ if ( !tmp.empty() )
{
- wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string '%s ignored"), params.c_str());
+ long precision;
+ if ( tmp.ToLong(&precision) )
+ {
+ SetPrecision((int)precision);
+ }
+ else
+ {
+ wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
+ }
}
}
}
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__)
}
// draw a border around checkmark
+ int vAlign, hAlign;
+ attr.GetAlignment(&hAlign, &vAlign);
+
wxRect rectBorder;
- rectBorder.x = rect.x + rect.width/2 - size.x/2;
- rectBorder.y = rect.y + rect.height/2 - size.y/2;
- rectBorder.width = size.x;
- rectBorder.height = size.y;
+ if (hAlign == wxALIGN_CENTRE)
+ {
+ rectBorder.x = rect.x + rect.width / 2 - size.x / 2;
+ rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
+ rectBorder.width = size.x;
+ rectBorder.height = size.y;
+ }
+ else if (hAlign == wxALIGN_LEFT)
+ {
+ rectBorder.x = rect.x + 2;
+ rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
+ rectBorder.width = size.x;
+ rectBorder.height = size.y;
+ }
+ else if (hAlign == wxALIGN_RIGHT)
+ {
+ rectBorder.x = rect.x + rect.width - size.x - 2;
+ rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
+ rectBorder.width = size.x;
+ rectBorder.height = size.y;
+ }
bool value;
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+ {
value = grid.GetTable()->GetValueAsBool(row, col);
+ }
else
- value = !!grid.GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid.GetTable()->GetValue(row, col) );
+ value = !( !cellval || (cellval == wxT("0")) );
+ }
if ( value )
{
wxRect rectMark = rectBorder;
+
#ifdef __WXMSW__
// MSW DrawCheckMark() is weird (and should probably be changed...)
- rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+ rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN / 2);
rectMark.x++;
rectMark.y++;
-#else // !MSW
+#else
rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-#endif // MSW/!MSW
+#endif
dc.SetTextForeground(attr.GetTextColour());
dc.DrawCheckMark(rectMark);
// wxGridCellAttr
// ----------------------------------------------------------------------------
+void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
+{
+ m_nRef = 1;
+
+ m_isReadOnly = Unset;
+
+ m_renderer = NULL;
+ m_editor = NULL;
+
+ m_attrkind = wxGridCellAttr::Cell;
+
+ m_sizeRows = m_sizeCols = 1;
+ m_overflow = UnsetOverflow;
+
+ SetDefAttr(attrDefault);
+}
+
wxGridCellAttr *wxGridCellAttr::Clone() const
{
- wxGridCellAttr *attr = new wxGridCellAttr;
+ wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr);
+
if ( HasTextColour() )
attr->SetTextColour(GetTextColour());
if ( HasBackgroundColour() )
if ( HasAlignment() )
attr->SetAlignment(m_hAlign, m_vAlign);
+ attr->SetSize( m_sizeRows, m_sizeCols );
+
if ( m_renderer )
{
attr->SetRenderer(m_renderer);
if ( IsReadOnly() )
attr->SetReadOnly();
- attr->SetDefAttr(m_defGridAttr);
+ attr->SetKind( m_attrkind );
return attr;
}
+void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
+{
+ if ( !HasTextColour() && mergefrom->HasTextColour() )
+ SetTextColour(mergefrom->GetTextColour());
+ if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() )
+ SetBackgroundColour(mergefrom->GetBackgroundColour());
+ if ( !HasFont() && mergefrom->HasFont() )
+ SetFont(mergefrom->GetFont());
+ if ( !HasAlignment() && mergefrom->HasAlignment() )
+ {
+ int hAlign, vAlign;
+ mergefrom->GetAlignment( &hAlign, &vAlign);
+ SetAlignment(hAlign, vAlign);
+ }
+ 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
+ //
+ // Maybe add support for merge of Render and Editor?
+ if (!HasRenderer() && mergefrom->HasRenderer() )
+ {
+ m_renderer = mergefrom->m_renderer;
+ m_renderer->IncRef();
+ }
+ if ( !HasEditor() && mergefrom->HasEditor() )
+ {
+ m_editor = mergefrom->m_editor;
+ m_editor->IncRef();
+ }
+ if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
+ SetReadOnly(mergefrom->IsReadOnly());
+
+ if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
+ SetOverflow(mergefrom->GetOverflow());
+
+ SetDefAttr(mergefrom->m_defGridAttr);
+}
+
+void wxGridCellAttr::SetSize(int num_rows, int num_cols)
+{
+ // The size of a cell is normally 1,1
+
+ // If this cell is larger (2,2) then this is the top left cell
+ // the other cells that will be covered (lower right cells) must be
+ // set to negative or zero values such that
+ // row + num_rows of the covered cell points to the larger cell (this cell)
+ // same goes for the col + num_cols.
+
+ // Size of 0,0 is NOT valid, neither is <=0 and any positive value
+
+ wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) ||
+ !((num_rows <= 0) && (num_cols > 0)) ||
+ !((num_rows == 0) && (num_cols == 0))),
+ wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
+
+ m_sizeRows = num_rows;
+ m_sizeCols = num_cols;
+}
+
const wxColour& wxGridCellAttr::GetTextColour() const
{
if (HasTextColour())
{
return m_colText;
}
- else if (m_defGridAttr != this)
+ else if (m_defGridAttr && m_defGridAttr != this)
{
return m_defGridAttr->GetTextColour();
}
}
}
-
const wxColour& wxGridCellAttr::GetBackgroundColour() const
{
if (HasBackgroundColour())
+ {
return m_colBack;
- else if (m_defGridAttr != this)
+ }
+ else if (m_defGridAttr && m_defGridAttr != this)
+ {
return m_defGridAttr->GetBackgroundColour();
+ }
else
{
wxFAIL_MSG(wxT("Missing default cell attribute"));
}
}
-
const wxFont& wxGridCellAttr::GetFont() const
{
if (HasFont())
+ {
return m_font;
- else if (m_defGridAttr != this)
+ }
+ else if (m_defGridAttr && m_defGridAttr != this)
+ {
return m_defGridAttr->GetFont();
+ }
else
{
wxFAIL_MSG(wxT("Missing default cell attribute"));
}
}
-
void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
{
if (HasAlignment())
{
- if ( hAlign ) *hAlign = m_hAlign;
- if ( vAlign ) *vAlign = m_vAlign;
+ if ( hAlign )
+ *hAlign = m_hAlign;
+ if ( vAlign )
+ *vAlign = m_vAlign;
}
- else if (m_defGridAttr != this)
+ else if (m_defGridAttr && m_defGridAttr != this)
+ {
m_defGridAttr->GetAlignment(hAlign, vAlign);
+ }
else
{
wxFAIL_MSG(wxT("Missing default cell attribute"));
}
}
+void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
+{
+ if ( num_rows )
+ *num_rows = m_sizeRows;
+ if ( num_cols )
+ *num_cols = m_sizeCols;
+}
// GetRenderer and GetEditor use a slightly different decision path about
// which attribute to use. If a non-default attr object has one then it is
// used, otherwise the default editor or renderer is fetched from the grid and
// used. It should be the default for the data type of the cell. If it is
// NULL (because the table has a type that the grid does not have in its
-// registry,) then the grid's default editor or renderer is used.
+// registry), then the grid's default editor or renderer is used.
wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
{
- wxGridCellRenderer* renderer = NULL;
+ wxGridCellRenderer *renderer = NULL;
- if ( m_defGridAttr != this || grid == NULL )
+ if ( m_renderer && this != m_defGridAttr )
{
- renderer = m_renderer; // use local attribute
- if ( renderer )
- renderer->IncRef();
+ // use the cells renderer if it has one
+ renderer = m_renderer;
+ renderer->IncRef();
}
-
- if ( !renderer && grid ) // get renderer for the data type
+ else // no non-default cell renderer
{
- // GetDefaultRendererForCell() will do IncRef() for us
- renderer = grid->GetDefaultRendererForCell(row, col);
- }
+ // get default renderer for the data type
+ if ( grid )
+ {
+ // GetDefaultRendererForCell() will do IncRef() for us
+ renderer = grid->GetDefaultRendererForCell(row, col);
+ }
- if ( !renderer )
- {
- // if we still don't have one then use the grid default
- // (no need for IncRef() here neither)
- renderer = m_defGridAttr->GetRenderer(NULL,0,0);
+ if ( renderer == NULL )
+ {
+ if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
+ {
+ // if we still don't have one then use the grid default
+ // (no need for IncRef() here neither)
+ renderer = m_defGridAttr->GetRenderer(NULL, 0, 0);
+ }
+ else // default grid attr
+ {
+ // use m_renderer which we had decided not to use initially
+ renderer = m_renderer;
+ if ( renderer )
+ renderer->IncRef();
+ }
+ }
}
- if ( !renderer)
- {
- wxFAIL_MSG(wxT("Missing default cell attribute"));
- }
+ // we're supposed to always find something
+ wxASSERT_MSG(renderer, wxT("Missing default cell renderer"));
return renderer;
}
+// same as above, except for s/renderer/editor/g
wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
{
- wxGridCellEditor* editor = NULL;
+ wxGridCellEditor *editor = NULL;
- if ( m_defGridAttr != this || grid == NULL )
+ if ( m_editor && this != m_defGridAttr )
{
- editor = m_editor; // use local attribute
- if ( editor )
- editor->IncRef();
+ // use the cells editor if it has one
+ editor = m_editor;
+ editor->IncRef();
}
-
- if ( !editor && grid ) // get renderer for the data type
- editor = grid->GetDefaultEditorForCell(row, col);
-
- if ( !editor )
- // if we still don't have one then use the grid default
- editor = m_defGridAttr->GetEditor(NULL,0,0);
-
- if ( !editor )
+ else // no non default cell editor
{
- wxFAIL_MSG(wxT("Missing default cell attribute"));
+ // get default editor for the data type
+ if ( grid )
+ {
+ // GetDefaultEditorForCell() will do IncRef() for us
+ editor = grid->GetDefaultEditorForCell(row, col);
+ }
+
+ if ( editor == NULL )
+ {
+ if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
+ {
+ // if we still don't have one then use the grid default
+ // (no need for IncRef() here neither)
+ editor = m_defGridAttr->GetEditor(NULL, 0, 0);
+ }
+ else // default grid attr
+ {
+ // use m_editor which we had decided not to use initially
+ editor = m_editor;
+ if ( editor )
+ editor->IncRef();
+ }
+ }
}
+ // we're supposed to always find something
+ wxASSERT_MSG(editor, wxT("Missing default cell editor"));
+
return editor;
}
}
else
{
+ // free the old attribute
+ m_attrs[(size_t)n].attr->DecRef();
+
if ( attr )
{
// change the attribute
else
{
// ...or remove the attribute
- m_attrs.RemoveAt((size_t)n);
- n--; count--;
+ // No need to DecRef the attribute itself since this is
+ // done be wxGridCellWithAttr's destructor!
+ m_attrs.RemoveAt(n);
+ n--;
+ count--;
}
}
}
else
{
// ...or remove the attribute
- m_attrs.RemoveAt((size_t)n);
- n--; count--;
+ // No need to DecRef the attribute itself since this is
+ // done be wxGridCellWithAttr's destructor!
+ m_attrs.RemoveAt(n);
+ n--;
+ count--;
}
}
}
rowOrCol += numRowsOrCols;
else
{
- m_rowsOrCols.RemoveAt((size_t)n);
- m_attrs.RemoveAt((size_t)n);
- n--; count--;
+ m_rowsOrCols.RemoveAt(n);
+ m_attrs[n]->DecRef();
+ m_attrs.RemoveAt(n);
+ n--;
+ count--;
}
}
}
m_data = new wxGridCellAttrProviderData;
}
-wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const
+wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
+ wxGridCellAttr::wxAttrKind kind ) const
{
wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
if ( m_data )
{
- // first look for the attribute of this specific cell
- attr = m_data->m_cellAttrs.GetAttr(row, col);
-
- if ( !attr )
+ switch (kind)
{
- // then look for the col attr (col attributes are more common than
- // the row ones, hence they have priority)
- attr = m_data->m_colAttrs.GetAttr(col);
- }
+ case (wxGridCellAttr::Any):
+ // Get cached merge attributes.
+ // Currently not used as no cache implemented as not mutable
+ // attr = m_data->m_mergeAttr.GetAttr(row, col);
+ if (!attr)
+ {
+ // Basically implement old version.
+ // Also check merge cache, so we don't have to re-merge every time..
+ wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col);
+ wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
+ wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
- if ( !attr )
- {
- // finally try the row attributes
- attr = m_data->m_rowAttrs.GetAttr(row);
+ if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol))
+ {
+ // Two or more are non NULL
+ attr = new wxGridCellAttr;
+ attr->SetKind(wxGridCellAttr::Merged);
+
+ // Order is important..
+ if (attrcell)
+ {
+ attr->MergeWith(attrcell);
+ attrcell->DecRef();
+ }
+ if (attrcol)
+ {
+ attr->MergeWith(attrcol);
+ attrcol->DecRef();
+ }
+ if (attrrow)
+ {
+ attr->MergeWith(attrrow);
+ attrrow->DecRef();
+ }
+
+ // store merge attr if cache implemented
+ //attr->IncRef();
+ //m_data->m_mergeAttr.SetAttr(attr, row, col);
+ }
+ else
+ {
+ // one or none is non null return it or null.
+ if (attrrow)
+ attr = attrrow;
+ if (attrcol)
+ {
+ if (attr)
+ attr->DecRef();
+ attr = attrcol;
+ }
+ if (attrcell)
+ {
+ if (attr)
+ attr->DecRef();
+ attr = attrcell;
+ }
+ }
+ }
+ break;
+
+ case (wxGridCellAttr::Cell):
+ attr = m_data->m_cellAttrs.GetAttr(row, col);
+ break;
+
+ case (wxGridCellAttr::Col):
+ attr = m_data->m_colAttrs.GetAttr(col);
+ break;
+
+ case (wxGridCellAttr::Row):
+ attr = m_data->m_rowAttrs.GetAttr(row);
+ break;
+
+ default:
+ // unused as yet...
+ // (wxGridCellAttr::Default):
+ // (wxGridCellAttr::Merged):
+ break;
}
}
delete m_typeinfo[i];
}
-
void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
wxGridCellRenderer* renderer,
wxGridCellEditor* editor)
{
// check whether this is one of the standard ones, in which case
// register it "on the fly"
+#if wxUSE_TEXTCTRL
if ( typeName == wxGRID_VALUE_STRING )
{
RegisterDataType(wxGRID_VALUE_STRING,
new wxGridCellStringRenderer,
new wxGridCellTextEditor);
}
- else if ( typeName == wxGRID_VALUE_BOOL )
+ else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_CHECKBOX
+ if ( typeName == wxGRID_VALUE_BOOL )
{
RegisterDataType(wxGRID_VALUE_BOOL,
new wxGridCellBoolRenderer,
new wxGridCellBoolEditor);
}
- else if ( typeName == wxGRID_VALUE_NUMBER )
+ else
+#endif // wxUSE_CHECKBOX
+#if wxUSE_TEXTCTRL
+ if ( typeName == wxGRID_VALUE_NUMBER )
{
RegisterDataType(wxGRID_VALUE_NUMBER,
new wxGridCellNumberRenderer,
new wxGridCellFloatRenderer,
new wxGridCellFloatEditor);
}
- else if ( typeName == wxGRID_VALUE_CHOICE )
+ else
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_COMBOBOX
+ if ( typeName == wxGRID_VALUE_CHOICE )
{
RegisterDataType(wxGRID_VALUE_CHOICE,
new wxGridCellStringRenderer,
new wxGridCellChoiceEditor);
}
else
+#endif // wxUSE_COMBOBOX
{
return wxNOT_FOUND;
}
wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
{
wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
- renderer->IncRef();
+ if (renderer)
+ renderer->IncRef();
+
return renderer;
}
wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
{
wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
- editor->IncRef();
+ if (editor)
+ editor->IncRef();
+
return editor;
}
IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
-
wxGridTableBase::wxGridTableBase()
{
m_view = (wxGrid *) NULL;
// use the default attr provider by default
SetAttrProvider(new wxGridCellAttrProvider);
}
- return TRUE;
+
+ return true;
}
-wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
+wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind)
{
if ( m_attrProvider )
- return m_attrProvider->GetAttr(row, col);
+ return m_attrProvider->GetAttr(row, col, kind);
else
return (wxGridCellAttr *)NULL;
}
{
if ( m_attrProvider )
{
+ attr->SetKind(wxGridCellAttr::Cell);
m_attrProvider->SetAttr(attr, row, col);
}
else
{
if ( m_attrProvider )
{
+ attr->SetKind(wxGridCellAttr::Row);
m_attrProvider->SetRowAttr(attr, row);
}
else
{
if ( m_attrProvider )
{
+ attr->SetKind(wxGridCellAttr::Col);
m_attrProvider->SetColAttr(attr, col);
}
else
{
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),
{
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),
{
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),
{
wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
- return FALSE;
+ return false;
}
-
wxString wxGridTableBase::GetRowLabelValue( int row )
{
wxString s;
- s << row + 1; // RD: Starting the rows at zero confuses users, no matter
- // how much it makes sense to us geeks.
+
+ // RD: Starting the rows at zero confuses users,
+ // no matter how much it makes sense to us geeks.
+ s << row + 1;
+
return s;
}
unsigned int i, n;
for ( n = 1; ; n++ )
{
- s += (_T('A') + (wxChar)( col%26 ));
- col = col/26 - 1;
- if ( col < 0 ) break;
+ s += (wxChar) (_T('A') + (wxChar)(col % 26));
+ col = col / 26 - 1;
+ if ( col < 0 )
+ break;
}
// reverse the string...
wxString s2;
- for ( i = 0; i < n; i++ )
+ for ( i = 0; i < n; i++ )
{
- s2 += s[n-i-1];
+ s2 += s[n - i - 1];
}
return s2;
}
-
wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) )
{
return wxGRID_VALUE_STRING;
bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
{
- return FALSE;
+ return false;
}
void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
{
}
-
void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col),
const wxString& WXUNUSED(typeName) )
{
m_comInt2 = commandInt2;
}
-
-
//////////////////////////////////////////////////////////////////////
//
// A basic grid table for string data. An object of this class will
wxGridStringTable::wxGridStringTable( int numRows, int numCols )
: wxGridTableBase()
{
- int row, col;
-
m_data.Alloc( numRows );
wxArrayString sa;
sa.Alloc( numCols );
- for ( col = 0; col < numCols; col++ )
- {
- sa.Add( wxEmptyString );
- }
+ sa.Add( wxEmptyString, numCols );
- for ( row = 0; row < numRows; row++ )
- {
- m_data.Add( sa );
- }
+ m_data.Add( sa, numRows );
}
wxGridStringTable::~wxGridStringTable()
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);
{
numCols = m_data[0].GetCount();
- for ( row = 0; row < numRows; row++ )
+ for ( row = 0; row < numRows; row++ )
{
- for ( col = 0; col < numCols; col++ )
+ for ( col = 0; col < numCols; col++ )
{
m_data[row][col] = wxEmptyString;
}
}
}
-
bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
{
- size_t row, col;
-
size_t curNumRows = m_data.GetCount();
size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
( GetView() ? GetView()->GetNumberCols() : 0 ) );
wxArrayString sa;
sa.Alloc( curNumCols );
- for ( col = 0; col < curNumCols; col++ )
- {
- sa.Add( wxEmptyString );
- }
+ sa.Add( wxEmptyString, curNumCols );
+ m_data.Insert( sa, pos, numRows );
- for ( row = pos; row < pos + numRows; row++ )
- {
- m_data.Insert( sa, row );
- }
if ( GetView() )
{
wxGridTableMessage msg( this,
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::AppendRows( size_t numRows )
{
- size_t row, col;
-
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
- ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+ size_t curNumCols = ( curNumRows > 0
+ ? m_data[0].GetCount()
+ : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
wxArrayString sa;
if ( curNumCols > 0 )
{
sa.Alloc( curNumCols );
- for ( col = 0; col < curNumCols; col++ )
- {
- sa.Add( wxEmptyString );
- }
+ sa.Add( wxEmptyString, curNumCols );
}
- for ( row = 0; row < numRows; row++ )
- {
- m_data.Add( sa );
- }
+ m_data.Add( sa, numRows );
if ( GetView() )
{
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
{
- size_t n;
-
size_t curNumRows = m_data.GetCount();
if ( pos >= curNumRows )
{
- wxString errmsg;
- errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"),
- pos, numRows, curNumRows );
- wxFAIL_MSG( errmsg );
- return FALSE;
+ wxFAIL_MSG( wxString::Format
+ (
+ wxT("Called wxGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows"),
+ (unsigned long)pos,
+ (unsigned long)numRows,
+ (unsigned long)curNumRows
+ ) );
+
+ return false;
}
if ( numRows > curNumRows - pos )
if ( numRows >= curNumRows )
{
- m_data.Empty(); // don't release memory just yet
+ m_data.Clear();
}
else
{
- for ( n = 0; n < numRows; n++ )
- {
- m_data.Remove( pos );
- }
+ m_data.RemoveAt( pos, numRows );
}
+
if ( GetView() )
{
wxGridTableMessage msg( this,
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
size_t row, col;
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
- ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+ size_t curNumCols = ( curNumRows > 0
+ ? m_data[0].GetCount()
+ : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
if ( pos >= curNumCols )
{
return AppendCols( numCols );
}
- for ( row = 0; row < curNumRows; row++ )
+ if ( !m_colLabels.IsEmpty() )
+ {
+ m_colLabels.Insert( wxEmptyString, pos, numCols );
+
+ size_t i;
+ for ( i = pos; i < pos + numCols; i++ )
+ m_colLabels[i] = wxGridTableBase::GetColLabelValue( i );
+ }
+
+ for ( row = 0; row < curNumRows; row++ )
{
- for ( col = pos; col < pos + numCols; col++ )
+ for ( col = pos; col < pos + numCols; col++ )
{
m_data[row].Insert( wxEmptyString, col );
}
}
+
if ( GetView() )
{
wxGridTableMessage msg( this,
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::AppendCols( size_t numCols )
{
- size_t row, n;
+ size_t row;
size_t curNumRows = m_data.GetCount();
+
#if 0
if ( !curNumRows )
{
// TODO: something better than this ?
//
wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
- return FALSE;
+ return false;
}
#endif
- for ( row = 0; row < curNumRows; row++ )
+ for ( row = 0; row < curNumRows; row++ )
{
- for ( n = 0; n < numCols; n++ )
- {
- m_data[row].Add( wxEmptyString );
- }
+ m_data[row].Add( wxEmptyString, numCols );
}
if ( GetView() )
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
{
- size_t row, n;
+ size_t row;
size_t curNumRows = m_data.GetCount();
size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
if ( pos >= curNumCols )
{
- wxString errmsg;
- errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"),
- pos, numCols, curNumCols );
- wxFAIL_MSG( errmsg );
- return FALSE;
+ wxFAIL_MSG( wxString::Format
+ (
+ wxT("Called wxGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols"),
+ (unsigned long)pos,
+ (unsigned long)numCols,
+ (unsigned long)curNumCols
+ ) );
+ return false;
+ }
+
+ int colID;
+ if ( GetView() )
+ colID = GetView()->GetColAt( pos );
+ else
+ colID = pos;
+
+ if ( numCols > curNumCols - colID )
+ {
+ numCols = curNumCols - colID;
}
- if ( numCols > curNumCols - pos )
+ if ( !m_colLabels.IsEmpty() )
{
- numCols = curNumCols - pos;
+ m_colLabels.RemoveAt( colID, numCols );
}
- for ( row = 0; row < curNumRows; row++ )
+ for ( row = 0; row < curNumRows; row++ )
{
if ( numCols >= curNumCols )
{
}
else
{
- for ( n = 0; n < numCols; n++ )
- {
- m_data[row].Remove( pos );
- }
+ m_data[row].RemoveAt( colID, numCols );
}
}
+
if ( GetView() )
{
wxGridTableMessage msg( this,
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
wxString wxGridStringTable::GetRowLabelValue( int row )
}
else
{
- return m_rowLabels[ row ];
+ return m_rowLabels[row];
}
}
}
else
{
- return m_colLabels[ col ];
+ return m_colLabels[col];
}
}
{
int n = m_rowLabels.GetCount();
int i;
- for ( i = n; i <= row; i++ )
+
+ for ( i = n; i <= row; i++ )
{
m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
}
{
int n = m_colLabels.GetCount();
int i;
- for ( i = n; i <= col; i++ )
+
+ for ( i = n; i <= col; i++ )
{
m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
}
}
-
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
+ EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
+ EVT_CHAR( wxGridRowLabelWindow::OnChar )
END_EVENT_TABLE()
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
{
m_owner = parent;
}
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( 0, -y );
- m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
- m_owner->DrawRowLabels( dc );
+ wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
+ m_owner->DrawRowLabels( dc, rows );
}
-
void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
{
m_owner->ProcessRowLabelMouseEvent( event );
}
+void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent( event );
+}
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
-
+void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
//////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
EVT_PAINT( wxGridColLabelWindow::OnPaint )
+ EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
+ EVT_CHAR( wxGridColLabelWindow::OnChar )
END_EVENT_TABLE()
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
{
m_owner = parent;
}
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( -x, 0 );
- m_owner->CalcColLabelsExposed( GetUpdateRegion() );
- m_owner->DrawColLabels( dc );
+ wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
+ m_owner->DrawColLabels( dc, cols );
}
-
void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
{
m_owner->ProcessColLabelMouseEvent( event );
}
+void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent( event );
+}
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
-
+void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
//////////////////////////////////////////////////////////////////////
IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+ EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
- EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
+ 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;
}
int client_width = 0;
GetClientSize( &client_width, &client_height );
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
- dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
-
- dc.SetPen( *wxWHITE_PEN );
+ // 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_3DSHADOW), 1, wxSOLID) );
+ dc.DrawLine( client_width - 1, client_height - 1, client_width - 1, 0 );
+ dc.DrawLine( client_width - 1, client_height - 1, 0, client_height - 1 );
dc.DrawLine( 0, 0, client_width, 0 );
dc.DrawLine( 0, 0, 0, client_height );
-}
+ dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( 1, 1, client_width - 1, 1 );
+ dc.DrawLine( 1, 1, 1, client_height - 1 );
+#endif
+}
void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
{
m_owner->ProcessCornerLabelMouseEvent( event );
}
+void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent(event);
+}
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
-
+void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
//////////////////////////////////////////////////////////////////////
-IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
-BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
+BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
EVT_PAINT( wxGridWindow::OnPaint )
+ EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
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()
wxGridWindow::wxGridWindow( wxGrid *parent,
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
- wxWindowID id, const wxPoint &pos, const wxSize &size )
- : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" )
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size )
+ : wxWindow(
+ parent, id, pos, size,
+ wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN | wxFULL_REPAINT_ON_RESIZE,
+ wxT("grid window") )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
m_colLabelWin = colLblWin;
- SetBackgroundColour( "WHITE" );
}
-
-wxGridWindow::~wxGridWindow()
-{
-}
-
-
void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
wxPaintDC dc( this );
m_owner->PrepareDC( dc );
wxRegion reg = GetUpdateRegion();
- m_owner->CalcCellsExposed( reg );
- m_owner->DrawGridCellArea( dc );
+ wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
+ m_owner->DrawGridCellArea( dc, dirtyCells );
+
#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
+
m_owner->DrawGridSpace( dc );
- m_owner->DrawHighlight( dc );
+ m_owner->DrawHighlight( dc, dirtyCells );
}
-
void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
{
- wxPanel::ScrollWindow( dx, dy, rect );
+ wxWindow::ScrollWindow( dx, dy, rect );
m_rowLabelWin->ScrollWindow( 0, dy, rect );
m_colLabelWin->ScrollWindow( dx, 0, rect );
}
-
void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
{
+ if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
+ SetFocus();
+
m_owner->ProcessGridCellMouseEvent( event );
}
+void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
+{
+ m_owner->GetEventHandler()->ProcessEvent( event );
+}
// This seems to be required for wxMotif/wxGTK otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
+
+void wxGridWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
{
}
+void wxGridWindow::OnFocus(wxFocusEvent& event)
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
//////////////////////////////////////////////////////////////////////
-
+// Internal Helper function for computing row or column from some
+// (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array
+// of m_rowBottoms/m_ColRights to speed up the search!
+
+// Internal helper macros for simpler use of that function
+
+static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
+ const wxArrayInt& BorderArray, int nMax,
+ bool clipToMinMax);
+
+#define internalXToCol(x) XToCol(x, true)
+#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
+ 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 (e.g., 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,
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;
+}
wxGrid::~wxGrid()
{
+ // Must do this or ~wxScrollHelper will pop the wrong event handler
+ SetTargetWindow(this);
ClearAttrCache();
wxSafeDecRef(m_defaultCellAttr);
delete m_selection;
}
-
//
// ----- 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
+
void wxGrid::Create()
{
- m_created = FALSE; // set to TRUE by CreateGrid
+ // set to true by CreateGrid
+ m_created = false;
+
+ // create the type registry
+ m_typeRegistry = new wxGridTypeRegistry;
+ m_selection = NULL;
- m_table = (wxGridTableBase *) NULL;
- m_ownTable = FALSE;
+ m_table = (wxGridTableBase *) NULL;
+ m_ownTable = false;
- m_cellEditCtrlEnabled = FALSE;
+ m_cellEditCtrlEnabled = false;
- m_defaultCellAttr = new wxGridCellAttr;
- m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
+ m_defaultCellAttr = new wxGridCellAttr();
// Set default cell attributes
+ m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
+ m_defaultCellAttr->SetKind(wxGridCellAttr::Default);
m_defaultCellAttr->SetFont(GetFont());
- m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
- m_defaultCellAttr->SetTextColour(
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
- m_defaultCellAttr->SetBackgroundColour(
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ 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));
+#endif
m_numRows = 0;
m_numCols = 0;
m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
- // create the type registry
- m_typeRegistry = new wxGridTypeRegistry;
- m_selection = 0;
// subwindow components that make up the wxGrid
- m_cornerLabelWin = new wxGridCornerLabelWindow( this,
- -1,
- wxDefaultPosition,
- wxDefaultSize );
-
m_rowLabelWin = new wxGridRowLabelWindow( this,
- -1,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
m_colLabelWin = new wxGridColLabelWindow( this,
- -1,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
+ m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+ 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();
+}
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;
m_table = new wxGridStringTable( m_numRows, m_numCols );
m_table->SetView( this );
- m_ownTable = TRUE;
+ m_ownTable = true;
m_selection = new wxGridSelection( this, selmode );
- Init();
- m_created = TRUE;
+
+ CalcDimensions();
+
+ m_created = true;
return m_created;
}
void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
{
- if ( !m_created )
- {
- wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
- }
- else
- m_selection->SetSelectionMode( selmode );
+ wxCHECK_RET( m_created,
+ wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
+
+ m_selection->SetSelectionMode( selmode );
+}
+
+wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
+{
+ wxCHECK_MSG( m_created, wxGrid::wxGridSelectCells,
+ wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
+
+ return m_selection->GetSelectionMode();
}
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 implmentation 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 = NULL;
+ delete t;
+ }
+
+ delete m_selection;
+
+ m_table = NULL;
+ m_selection = NULL;
+ m_numRows = 0;
+ m_numCols = 0;
}
- else
+
+ if (table)
{
m_numRows = table->GetNumberRows();
m_numCols = table->GetNumberCols();
m_table = table;
m_table->SetView( this );
- if (takeOwnership)
- m_ownTable = TRUE;
+ m_ownTable = takeOwnership;
m_selection = new wxGridSelection( this, selmode );
- Init();
- m_created = TRUE;
+
+ CalcDimensions();
+
+ m_created = true;
}
return m_created;
}
-
void wxGrid::Init()
{
m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
}
else
{
- m_labelBackgroundColour = wxColour( _T("WHITE") );
+ m_labelBackgroundColour = *wxWHITE;
}
- m_labelTextColour = wxColour( _T("BLACK") );
+ m_labelTextColour = *wxBLACK;
// init attr cache
m_attrCache.row = -1;
+ m_attrCache.col = -1;
+ m_attrCache.attr = NULL;
// TODO: something better than this ?
//
m_labelFont = this->GetFont();
- m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+ m_labelFont.SetWeight( wxBOLD );
- m_rowLabelHorizAlign = wxLEFT;
- m_rowLabelVertAlign = wxCENTRE;
+ m_rowLabelHorizAlign = wxALIGN_CENTRE;
+ m_rowLabelVertAlign = wxALIGN_CENTRE;
- m_colLabelHorizAlign = wxCENTRE;
- m_colLabelVertAlign = wxTOP;
+ 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
m_defaultRowHeight += 4;
#endif
- m_gridLineColour = wxColour( 128, 128, 255 );
- m_gridLinesEnabled = TRUE;
- m_cellHighlightColour = m_gridLineColour;
+ m_gridLineColour = wxColour( 192,192,192 );
+ m_gridLinesEnabled = true;
+ m_cellHighlightColour = *wxBLACK;
+ m_cellHighlightPenWidth = 2;
+ m_cellHighlightROPenWidth = 1;
+
+ m_canDragColMove = false;
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 );
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
- m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
- m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ 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 = 50;
+ m_extraHeight = 0;
- CalcDimensions();
+ m_scrollLineX = GRID_SCROLL_LINE_X;
+ m_scrollLineY = GRID_SCROLL_LINE_Y;
}
// ----------------------------------------------------------------------------
m_rowBottoms.Alloc( m_numRows );
int rowBottom = 0;
- for ( int i = 0; i < m_numRows; i++ )
+
+ m_rowHeights.Add( m_defaultRowHeight, m_numRows );
+
+ for ( int i = 0; i < m_numRows; i++ )
{
- m_rowHeights.Add( m_defaultRowHeight );
rowBottom += m_defaultRowHeight;
m_rowBottoms.Add( rowBottom );
}
m_colWidths.Alloc( m_numCols );
m_colRights.Alloc( m_numCols );
int colRight = 0;
- for ( int i = 0; i < m_numCols; i++ )
+
+ m_colWidths.Add( m_defaultColWidth, m_numCols );
+
+ for ( int i = 0; i < m_numCols; i++ )
{
- m_colWidths.Add( m_defaultColWidth );
- colRight += m_defaultColWidth;
+ colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
m_colRights.Add( colRight );
}
}
int wxGrid::GetColLeft(int col) const
{
- return m_colRights.IsEmpty() ? col * m_defaultColWidth
+ return m_colRights.IsEmpty() ? GetColPos( col ) * m_defaultColWidth
: m_colRights[col] - m_colWidths[col];
}
int wxGrid::GetColRight(int col) const
{
- return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth
+ return m_colRights.IsEmpty() ? (GetColPos( col ) + 1) * m_defaultColWidth
: m_colRights[col];
}
int cw, ch;
GetClientSize( &cw, &ch );
- if ( m_numRows > 0 || m_numCols > 0 )
- {
- int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0;
- int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0;
+ if ( m_rowLabelWin->IsShown() )
+ cw -= m_rowLabelWidth;
+ if ( m_colLabelWin->IsShown() )
+ ch -= m_colLabelHeight;
- // TODO: restore the scroll position that we had before sizing
- //
- int x, y;
- GetViewStart( &x, &y );
- SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
- right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
- x, y );
+ // grid total size
+ int w = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) + m_extraWidth + 1 : 0;
+ int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+
+ // take into account editor if shown
+ if ( IsCellEditControlShown() )
+ {
+ int w2, h2;
+ int r = m_currentCellCoords.GetRow();
+ int c = m_currentCellCoords.GetCol();
+ int x = GetColLeft(c);
+ int y = GetRowTop(r);
+
+ // how big is the editor
+ wxGridCellAttr* attr = GetCellAttr(r, c);
+ wxGridCellEditor* editor = attr->GetEditor(this, r, c);
+ editor->GetControl()->GetSize(&w2, &h2);
+ w2 += x;
+ h2 += y;
+ if ( w2 > w )
+ w = w2;
+ if ( h2 > h )
+ h = h2;
+ editor->DecRef();
+ attr->DecRef();
}
-}
+ // preserve (more or less) the previous position
+ int x, y;
+ GetViewStart( &x, &y );
+
+ // 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( m_scrollLineX, m_scrollLineY,
+ GetScrollX(w), GetScrollY(h), x, y,
+ GetBatchCount() != 0);
+
+ // if our OnSize() hadn't been called (it would if we have scrollbars), we
+ // still must reposition the children
+ CalcWindowSizes();
+}
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() )
- m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+ if ( m_colLabelWin && m_colLabelWin->IsShown() )
+ m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw - m_rowLabelWidth, m_colLabelHeight );
- if ( m_rowLabelWin->IsShown() )
- m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+ if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
+ m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch - m_colLabelHeight );
- if ( m_gridWin->IsShown() )
- m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+ if ( m_gridWin && m_gridWin->IsShown() )
+ m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw - m_rowLabelWidth, ch - m_colLabelHeight );
}
-
-// this is called when the grid table sends a message to say that it
-// has been redimensioned
+// this is called when the grid table sends a message
+// to indicate that it has been redimensioned
//
bool wxGrid::Redimension( wxGridTableMessage& msg )
{
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.
+ ClearAttrCache();
+
+ // By the same reasoning, the editor should be dismissed if columns are
+ // added or removed. And for consistency, it should IMHO always be
+ // removed, not only if the cell "underneath" it actually changes.
+ // For now, I intentionally do not save the editor's content as the
+ // cell it might want to save that stuff to might no longer exist.
+ HideCellEditControl();
#if 0
// if we were using the default widths/heights so far, we must change them
if ( !m_rowHeights.IsEmpty() )
{
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Insert( m_defaultRowHeight, pos );
- m_rowBottoms.Insert( 0, pos );
- }
+ m_rowHeights.Insert( m_defaultRowHeight, pos, numRows );
+ m_rowBottoms.Insert( 0, pos, numRows );
int bottom = 0;
- if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+ if ( pos > 0 )
+ bottom = m_rowBottoms[pos - 1];
- for ( i = pos; i < m_numRows; i++ )
+ for ( i = pos; i < m_numRows; i++ )
{
bottom += m_rowHeights[i];
m_rowBottoms[i] = bottom;
}
}
+
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
//
SetCurrentCell( 0, 0 );
}
- m_selection->UpdateRows( pos, numRows );
+
+ if ( m_selection )
+ m_selection->UpdateRows( pos, numRows );
wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
if (attrProvider)
attrProvider->UpdateAttrRows( pos, numRows );
m_rowLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
if ( !m_rowHeights.IsEmpty() )
{
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Add( m_defaultRowHeight );
- m_rowBottoms.Add( 0 );
- }
+ m_rowHeights.Add( m_defaultRowHeight, numRows );
+ m_rowBottoms.Add( 0, numRows );
int bottom = 0;
- if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+ if ( oldNumRows > 0 )
+ bottom = m_rowBottoms[oldNumRows - 1];
- for ( i = oldNumRows; i < m_numRows; i++ )
+ for ( i = oldNumRows; i < m_numRows; i++ )
{
bottom += m_rowHeights[i];
m_rowBottoms[i] = bottom;
}
}
+
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
//
SetCurrentCell( 0, 0 );
}
+
if ( !GetBatchCount() )
{
CalcDimensions();
m_rowLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
if ( !m_rowHeights.IsEmpty() )
{
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Remove( pos );
- m_rowBottoms.Remove( pos );
- }
+ m_rowHeights.RemoveAt( pos, numRows );
+ m_rowBottoms.RemoveAt( pos, numRows );
int h = 0;
- for ( i = 0; i < m_numRows; i++ )
+ for ( i = 0; i < m_numRows; i++ )
{
h += m_rowHeights[i];
m_rowBottoms[i] = h;
}
}
+
if ( !m_numRows )
{
m_currentCellCoords = wxGridNoCellCoords;
if ( m_currentCellCoords.GetRow() >= m_numRows )
m_currentCellCoords.Set( 0, 0 );
}
- m_selection->UpdateRows( pos, -((int)numRows) );
+
+ if ( m_selection )
+ m_selection->UpdateRows( pos, -((int)numRows) );
wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
- if (attrProvider) {
+ if (attrProvider)
+ {
attrProvider->UpdateAttrRows( pos, -((int)numRows) );
+
+// ifdef'd out following patch from Paul Gammans
+#if 0
// No need to touch column attributes, unless we
// removed _all_ rows, in this case, we remove
// all column attributes.
// needed data is not available inside UpdateAttrRows.
if ( !GetNumberRows() )
attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
+#endif
}
+
if ( !GetBatchCount() )
{
CalcDimensions();
m_rowLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
int numCols = msg.GetCommandInt2();
m_numCols += numCols;
- if ( !m_colWidths.IsEmpty() )
+ if ( !m_colAt.IsEmpty() )
{
- for ( i = 0; i < numCols; i++ )
+ //Shift the column IDs
+ int i;
+ for ( i = 0; i < m_numCols - numCols; i++ )
+ {
+ if ( m_colAt[i] >= (int)pos )
+ m_colAt[i] += numCols;
+ }
+
+ m_colAt.Insert( pos, pos, numCols );
+
+ //Set the new columns' positions
+ for ( i = pos + 1; i < (int)pos + numCols; i++ )
{
- m_colWidths.Insert( m_defaultColWidth, pos );
- m_colRights.Insert( 0, pos );
+ m_colAt[i] = i;
}
+ }
+
+ if ( !m_colWidths.IsEmpty() )
+ {
+ m_colWidths.Insert( m_defaultColWidth, pos, numCols );
+ m_colRights.Insert( 0, pos, numCols );
int right = 0;
- if ( pos > 0 ) right = m_colRights[pos-1];
+ if ( pos > 0 )
+ right = m_colRights[GetColAt( pos - 1 )];
- for ( i = pos; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = pos; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
right += m_colWidths[i];
m_colRights[i] = right;
}
}
+
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
//
SetCurrentCell( 0, 0 );
}
- m_selection->UpdateCols( pos, numCols );
+
+ if ( m_selection )
+ m_selection->UpdateCols( pos, numCols );
wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
if (attrProvider)
attrProvider->UpdateAttrCols( pos, numCols );
CalcDimensions();
m_colLabelWin->Refresh();
}
-
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
int numCols = msg.GetCommandInt();
int oldNumCols = m_numCols;
m_numCols += numCols;
- if ( !m_colWidths.IsEmpty() )
+
+ if ( !m_colAt.IsEmpty() )
{
- for ( i = 0; i < numCols; i++ )
+ m_colAt.Add( 0, numCols );
+
+ //Set the new columns' positions
+ int i;
+ for ( i = oldNumCols; i < m_numCols; i++ )
{
- m_colWidths.Add( m_defaultColWidth );
- m_colRights.Add( 0 );
+ m_colAt[i] = i;
}
+ }
+
+ if ( !m_colWidths.IsEmpty() )
+ {
+ m_colWidths.Add( m_defaultColWidth, numCols );
+ m_colRights.Add( 0, numCols );
int right = 0;
- if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+ if ( oldNumCols > 0 )
+ right = m_colRights[GetColAt( oldNumCols - 1 )];
- for ( i = oldNumCols; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = oldNumCols; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
right += m_colWidths[i];
m_colRights[i] = right;
}
}
+
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
m_colLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_COLS_DELETED:
int numCols = msg.GetCommandInt2();
m_numCols -= numCols;
- if ( !m_colWidths.IsEmpty() )
+ if ( !m_colAt.IsEmpty() )
{
- for ( i = 0; i < numCols; i++ )
+ int colID = GetColAt( pos );
+
+ m_colAt.RemoveAt( pos, numCols );
+
+ //Shift the column IDs
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
{
- m_colWidths.Remove( pos );
- m_colRights.Remove( pos );
+ if ( m_colAt[colPos] > colID )
+ m_colAt[colPos] -= numCols;
}
+ }
+
+ if ( !m_colWidths.IsEmpty() )
+ {
+ m_colWidths.RemoveAt( pos, numCols );
+ m_colRights.RemoveAt( pos, numCols );
int w = 0;
- for ( i = 0; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
w += m_colWidths[i];
m_colRights[i] = w;
}
}
+
if ( !m_numCols )
{
m_currentCellCoords = wxGridNoCellCoords;
if ( m_currentCellCoords.GetCol() >= m_numCols )
m_currentCellCoords.Set( 0, 0 );
}
- m_selection->UpdateCols( pos, -((int)numCols) );
+
+ if ( m_selection )
+ m_selection->UpdateCols( pos, -((int)numCols) );
wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
- if (attrProvider) {
+ if (attrProvider)
+ {
attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+
+// ifdef'd out following patch from Paul Gammans
+#if 0
// No need to touch row attributes, unless we
// removed _all_ columns, in this case, we remove
// all row attributes.
// needed data is not available inside UpdateAttrCols.
if ( !GetNumberCols() )
attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
+#endif
}
+
if ( !GetBatchCount() )
{
CalcDimensions();
m_colLabelWin->Refresh();
}
- return TRUE;
}
-#if 0
-// There is no path to this code !!!!!!
- result = TRUE;
+ result = true;
break;
-#endif
}
if (result && !GetBatchCount() )
m_gridWin->Refresh();
+
return result;
}
-
-void wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
- m_rowLabelsExposed.Empty();
+ wxArrayInt rowlabels;
int top, bottom;
while ( iter )
#if defined(__WXMOTIF__)
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
- if ( r.GetTop() > ch ) r.SetTop( 0 );
+ if ( r.GetTop() > ch )
+ r.SetTop( 0 );
r.SetBottom( wxMin( r.GetBottom(), ch ) );
#endif
// find the row labels within these bounds
//
int row;
- for ( row = 0; row < m_numRows; row++ )
+ for ( row = internalYToRow(top); row < m_numRows; row++ )
{
if ( GetRowBottom(row) < top )
continue;
if ( GetRowTop(row) > bottom )
break;
- m_rowLabelsExposed.Add( row );
+ rowlabels.Add( row );
}
- iter++ ;
+ ++iter;
}
-}
+ return rowlabels;
+}
-void wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
- m_colLabelsExposed.Empty();
+ wxArrayInt colLabels;
int left, right;
while ( iter )
#if defined(__WXMOTIF__)
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
- if ( r.GetLeft() > cw ) r.SetLeft( 0 );
+ if ( r.GetLeft() > cw )
+ r.SetLeft( 0 );
r.SetRight( wxMin( r.GetRight(), cw ) );
#endif
// find the cells within these bounds
//
int col;
- for ( col = 0; col < m_numCols; col++ )
+ int colPos;
+ for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
{
+ col = GetColAt( colPos );
+
if ( GetColRight(col) < left )
continue;
if ( GetColLeft(col) > right )
break;
- m_colLabelsExposed.Add( col );
+ colLabels.Add( col );
}
- iter++ ;
+ ++iter;
}
-}
+ return colLabels;
+}
-void wxGrid::CalcCellsExposed( const wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
- m_cellsExposed.Empty();
- m_rowsExposed.Empty();
- m_colsExposed.Empty();
+ wxGridCellCoordsArray cellsExposed;
int left, top, right, bottom;
while ( iter )
// find the cells within these bounds
//
int row, col;
- for ( row = 0; row < m_numRows; row++ )
+ for ( row = internalYToRow(top); row < m_numRows; row++ )
{
if ( GetRowBottom(row) <= top )
continue;
if ( GetRowTop(row) > bottom )
break;
- m_rowsExposed.Add( row );
-
- for ( col = 0; col < m_numCols; col++ )
+ int colPos;
+ for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
{
+ col = GetColAt( colPos );
+
if ( GetColRight(col) <= left )
continue;
if ( GetColLeft(col) > right )
break;
- if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
- m_colsExposed.Add( col );
- m_cellsExposed.Add( wxGridCellCoords( row, col ) );
+ cellsExposed.Add( wxGridCellCoords( row, col ) );
}
}
- iter++;
+ ++iter;
}
+
+ return cellsExposed;
}
if ( event.Dragging() )
{
- m_isDragging = TRUE;
+ if (!m_isDragging)
+ {
+ m_isDragging = true;
+ m_rowLabelWin->CaptureMouse();
+ }
if ( event.LeftIsDown() )
{
- switch( m_cursorMode )
+ switch ( m_cursorMode )
{
case WXGRID_CURSOR_RESIZE_ROW:
{
break;
case WXGRID_CURSOR_SELECT_ROW:
+ {
if ( (row = YToRow( y )) >= 0 )
{
- m_selection->SelectRow( row,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ if ( m_selection )
+ {
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
}
+ }
+ break;
// default label to suppress warnings about "enumeration value
// 'xxx' not handled in switch
return;
}
- m_isDragging = FALSE;
+ if ( m_isDragging && (event.Entering() || event.Leaving()) )
+ return;
+ if (m_isDragging)
+ {
+ if (m_rowLabelWin->HasCapture())
+ m_rowLabelWin->ReleaseMouse();
+ m_isDragging = false;
+ }
// ------------ Entering or leaving the window
//
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
}
-
// ------------ Left button pressed
//
else if ( event.LeftDown() )
if ( YToEdgeOfRow(y) < 0 )
{
row = YToRow(y);
- if ( row >= 0 &&
+ if ( row >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
- if ( !event.ShiftDown() && !event.ControlDown() )
+ if ( !event.ShiftDown() && !event.CmdDown() )
ClearSelection();
- if ( event.ShiftDown() )
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- 0,
- row,
- GetNumberCols() - 1,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- else
- m_selection->SelectRow( row,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ if ( m_selection )
+ {
+ if ( event.ShiftDown() )
+ {
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ 0,
+ row,
+ GetNumberCols() - 1,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ else
+ {
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ }
+
ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
}
}
else
{
// starting to drag-resize a row
- //
if ( CanDragRowSize() )
ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
}
}
-
// ------------ Left double click
//
else if (event.LeftDClick() )
{
- if ( YToEdgeOfRow(y) < 0 )
+ 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;
+ }
+ }
// ------------ Left button released
//
m_dragLastPos = -1;
}
-
// ------------ Right button down
//
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
}
}
-
// ------------ Right double click
//
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
}
}
-
// ------------ No buttons down and mouse moving
//
else if ( event.Moving() )
{
// 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);
}
}
}
-
void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
{
int x, y, col;
if ( event.Dragging() )
{
- m_isDragging = TRUE;
+ if (!m_isDragging)
+ {
+ m_isDragging = true;
+ m_colLabelWin->CaptureMouse();
+
+ if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL )
+ m_dragRowOrCol = XToCol( x );
+ }
if ( event.LeftIsDown() )
{
- switch( m_cursorMode )
+ switch ( m_cursorMode )
{
case WXGRID_CURSOR_RESIZE_COL:
{
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+ dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
}
- dc.DrawLine( x, top, x, top+ch );
+ dc.DrawLine( x, top, x, top + ch );
m_dragLastPos = x;
}
break;
case WXGRID_CURSOR_SELECT_COL:
+ {
if ( (col = XToCol( x )) >= 0 )
{
- m_selection->SelectCol( col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ if ( m_selection )
+ {
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ }
+ }
+ break;
+
+ case WXGRID_CURSOR_MOVE_COL:
+ {
+ if ( x < 0 )
+ m_moveToCol = GetColAt( 0 );
+ else
+ m_moveToCol = XToCol( x );
+
+ int markerX;
+
+ if ( m_moveToCol < 0 )
+ markerX = GetColRight( GetColAt( m_numCols - 1 ) );
+ else
+ markerX = GetColLeft( m_moveToCol );
+
+ if ( markerX != m_dragLastPos )
+ {
+ wxClientDC dc( m_colLabelWin );
+
+ int cw, ch;
+ m_colLabelWin->GetClientSize( &cw, &ch );
+
+ markerX++;
+
+ //Clean up the last indicator
+ if ( m_dragLastPos >= 0 )
+ {
+ wxPen pen( m_colLabelWin->GetBackgroundColour(), 2 );
+ dc.SetPen(pen);
+ dc.DrawLine( m_dragLastPos + 1, 0, m_dragLastPos + 1, ch );
+ dc.SetPen(wxNullPen);
+
+ if ( XToCol( m_dragLastPos ) != -1 )
+ DrawColLabel( dc, XToCol( m_dragLastPos ) );
+ }
+
+ //Moving to the same place? Don't draw a marker
+ if ( (m_moveToCol == m_dragRowOrCol)
+ || (GetColPos( m_moveToCol ) == GetColPos( m_dragRowOrCol ) + 1)
+ || (m_moveToCol < 0 && m_dragRowOrCol == GetColAt( m_numCols - 1 )))
+ {
+ m_dragLastPos = -1;
+ return;
+ }
+
+ //Draw the marker
+ wxPen pen( *wxBLUE, 2 );
+ dc.SetPen(pen);
+
+ dc.DrawLine( markerX, 0, markerX, ch );
+
+ dc.SetPen(wxNullPen);
+
+ m_dragLastPos = markerX - 1;
}
+ }
+ break;
// default label to suppress warnings about "enumeration value
// 'xxx' not handled in switch
return;
}
- m_isDragging = FALSE;
+ if ( m_isDragging && (event.Entering() || event.Leaving()) )
+ return;
+ if (m_isDragging)
+ {
+ if (m_colLabelWin->HasCapture())
+ m_colLabelWin->ReleaseMouse();
+ m_isDragging = false;
+ }
// ------------ Entering or leaving the window
//
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
}
-
// ------------ Left button pressed
//
else if ( event.LeftDown() )
if ( XToEdgeOfCol(x) < 0 )
{
col = XToCol(x);
- if ( col >= 0 &&
+ if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
- if ( !event.ShiftDown() && !event.ControlDown() )
- ClearSelection();
- if ( event.ShiftDown() )
- m_selection->SelectBlock( 0,
- m_currentCellCoords.GetCol(),
- GetNumberRows() - 1, col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ if ( m_canDragColMove )
+ {
+ //Show button as pressed
+ wxClientDC dc( m_colLabelWin );
+ int colLeft = GetColLeft( col );
+ int colRight = GetColRight( col ) - 1;
+ dc.SetPen( wxPen( m_colLabelWin->GetBackgroundColour(), 1 ) );
+ dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+ dc.DrawLine( colLeft, 1, colRight, 1 );
+
+ ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, m_colLabelWin);
+ }
else
- m_selection->SelectCol( col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+ {
+ if ( !event.ShiftDown() && !event.CmdDown() )
+ ClearSelection();
+ if ( m_selection )
+ {
+ if ( event.ShiftDown() )
+ {
+ m_selection->SelectBlock( 0,
+ m_currentCellCoords.GetCol(),
+ GetNumberRows() - 1, col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ else
+ {
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ }
+
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+ }
}
}
else
}
}
-
// ------------ Left double click
//
if ( event.LeftDClick() )
{
- if ( XToEdgeOfCol(x) < 0 )
+ 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;
+ }
+ }
// ------------ Left button released
//
else if ( event.LeftUp() )
{
- if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ switch ( m_cursorMode )
{
- DoEndDragResizeCol();
+ case WXGRID_CURSOR_RESIZE_COL:
+ DoEndDragResizeCol();
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ break;
+
+ case WXGRID_CURSOR_MOVE_COL:
+ DoEndDragMoveCol();
+
+ SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event );
+ break;
+
+ case WXGRID_CURSOR_SELECT_COL:
+ case WXGRID_CURSOR_SELECT_CELL:
+ case WXGRID_CURSOR_RESIZE_ROW:
+ case WXGRID_CURSOR_SELECT_ROW:
+ // nothing to do (?)
+ break;
}
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
- m_dragLastPos = -1;
+ m_dragLastPos = -1;
}
-
// ------------ Right button down
//
else if ( event.RightDown() )
{
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
}
}
-
// ------------ Right double click
//
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
}
}
-
// ------------ No buttons down and mouse moving
//
else if ( event.Moving() )
{
// 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);
}
}
}
-
void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
{
if ( event.LeftDown() )
SelectAll();
}
}
-
else if ( event.LeftDClick() )
{
SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event );
}
-
else if ( event.RightDown() )
{
if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) )
// no default action at the moment
}
}
-
else if ( event.RightDClick() )
{
if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) )
_T("RESIZE_ROW"),
_T("RESIZE_COL"),
_T("SELECT_ROW"),
- _T("SELECT_COL")
+ _T("SELECT_COL"),
+ _T("MOVE_COL"),
};
wxLogTrace(_T("grid"),
: win ? _T("rowLabelWin")
: _T("gridWin"),
cursorModes[m_cursorMode], cursorModes[mode]);
-#endif // __WXDEBUG__
+#endif
- if ( mode == m_cursorMode )
+ if ( mode == m_cursorMode &&
+ win == m_winCapture &&
+ captureMouse == (m_winCapture != NULL))
return;
if ( !win )
if ( m_winCapture )
{
- m_winCapture->ReleaseMouse();
+ if (m_winCapture->HasCapture())
+ m_winCapture->ReleaseMouse();
m_winCapture = (wxWindow *)NULL;
}
win->SetCursor( m_colResizeCursor );
break;
+ case WXGRID_CURSOR_MOVE_COL:
+ win->SetCursor( wxCursor(wxCURSOR_HAND) );
+ break;
+
default:
win->SetCursor( *wxSTANDARD_CURSOR );
+ break;
}
// we need to capture mouse when resizing
wxGridCellCoords coords;
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))
+ {
+ coords.SetRow(coords.GetRow() + cell_rows);
+ coords.SetCol(coords.GetCol() + cell_cols);
+ }
+
if ( event.Dragging() )
{
//wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
- // Don't start doing anything until the mouse has been drug at
+ // Don't start doing anything until the mouse has been dragged at
// least 3 pixels in any direction...
if (! m_isDragging)
{
return;
}
- m_isDragging = TRUE;
+ m_isDragging = true;
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
// Hide the edit control, so it
- // won't interfer with drag-shrinking.
+ // won't interfere with drag-shrinking.
if ( IsCellEditControlShown() )
{
HideCellEditControl();
if ( coords != wxGridNoCellCoords )
{
- if ( event.ControlDown() )
+ if ( event.CmdDown() )
{
if ( m_selectingKeyboard == wxGridNoCellCoords)
m_selectingKeyboard = coords;
- SelectBlock ( 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() )
{
- SelectBlock( coords, coords );
+ HighlightBlock( coords, coords );
}
else
{
- SelectBlock( m_currentCellCoords, coords );
+ HighlightBlock( m_currentCellCoords, coords );
}
}
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+ dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
}
- dc.DrawLine( x, top, x, top+ch );
+ dc.DrawLine( x, top, x, top + ch );
m_dragLastPos = x;
}
return;
}
- m_isDragging = FALSE;
+ m_isDragging = false;
m_startDragPos = wxDefaultPosition;
// VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
coords.GetCol(),
event ) )
{
- if ( !event.ControlDown() )
+ if ( !event.CmdDown() )
ClearSelection();
if ( event.ShiftDown() )
{
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- coords.GetRow(),
- coords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ if ( m_selection )
+ {
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ coords.GetRow(),
+ coords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
}
- else if ( XToEdgeOfCol(x) < 0 &&
+ else if ( XToEdgeOfCol(x) < 0 &&
YToEdgeOfRow(y) < 0 )
{
DisableCellEditControl();
MakeCellVisible( coords );
- // if this is the second click on this cell then start
- // the edit control
- if ( m_waitForSlowClick &&
- (coords == m_currentCellCoords) &&
- CanEnableCellControl())
- {
- EnableCellEditControl();
-
- wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
- wxGridCellEditor *editor = attr->GetEditor(this,
- coords.GetRow(),
- coords.GetCol());
- editor->StartingClick();
- editor->DecRef();
- attr->DecRef();
-
- m_waitForSlowClick = FALSE;
- }
- else
+ if ( event.CmdDown() )
{
- if ( event.ControlDown() )
+ if ( m_selection )
{
m_selection->ToggleCellSelection( coords.GetRow(),
coords.GetCol(),
event.ShiftDown(),
event.AltDown(),
event.MetaDown() );
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
- m_selectingKeyboard = coords;
}
- else
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ m_selectingKeyboard = coords;
+ }
+ else
+ {
+ m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
+ SetCurrentCell( coords );
+ if ( m_selection )
{
- SetCurrentCell( coords );
- if ( m_selection->GetSelectionMode()
- != wxGrid::wxGridSelectCells)
- SelectBlock( coords, coords );
+ if ( m_selection->GetSelectionMode() !=
+ wxGrid::wxGridSelectCells )
+ {
+ HighlightBlock( coords, coords );
+ }
}
- m_waitForSlowClick = TRUE;
}
}
}
}
-
// ------------ Left double click
//
else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
{
DisableCellEditControl();
- if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
+ 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;
+ }
}
}
-
// ------------ Left button released
//
else if ( event.LeftUp() )
{
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- if ( m_selectingTopLeft != wxGridNoCellCoords &&
+ if (m_winCapture)
+ {
+ 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_winCapture)
+ if ( m_selection )
{
- m_winCapture->ReleaseMouse();
- m_winCapture = NULL;
+ m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+ m_selectingTopLeft.GetCol(),
+ m_selectingBottomRight.GetRow(),
+ m_selectingBottomRight.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
- m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
- m_selectingTopLeft.GetCol(),
- m_selectingBottomRight.GetRow(),
- m_selectingBottomRight.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
- }
- // Show the edit control, if it has been hidden for
- // drag-shrinking.
- ShowCellEditControl();
+ // Show the edit control, if it has been hidden for
+ // drag-shrinking.
+ ShowCellEditControl();
+ }
}
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{
m_dragLastPos = -1;
}
-
// ------------ Right button down
//
else if ( event.RightDown() && coords != wxGridNoCellCoords )
}
}
-
// ------------ Right double click
//
else if ( event.RightDClick() && coords != wxGridNoCellCoords )
//
else if ( event.Moving() && !event.IsButton() )
{
+ if ( coords.GetRow() < 0 || coords.GetCol() < 0 )
+ {
+ // out of grid cell area
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ return;
+ }
+
int dragRow = YToEdgeOfRow( y );
int dragCol = XToEdgeOfCol( x );
// Dragging on the corner of a cell to resize in both
// directions is not implemented yet...
//
- if ( dragRow >= 0 && dragCol >= 0 )
+ if ( dragRow >= 0 && dragCol >= 0 )
{
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
return;
if ( CanDragRowSize() && CanDragGridSize() )
ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
}
-
- if ( dragCol >= 0 )
- {
- m_dragRowOrCol = dragCol;
- }
-
- return;
}
-
- if ( dragCol >= 0 )
+ else if ( dragCol >= 0 )
{
m_dragRowOrCol = dragCol;
if ( CanDragColSize() && CanDragGridSize() )
ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
}
-
- return;
}
-
- // Neither on a row or col edge
- //
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+ else // Neither on a row or col edge
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ }
}
}
}
-
void wxGrid::DoEndDragResizeRow()
{
if ( m_dragLastPos >= 0 )
wxClientDC dc( m_gridWin );
PrepareDC( dc );
dc.SetLogicalFunction( wxINVERT );
- dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
+ dc.DrawLine( left, m_dragLastPos, left + cw, m_dragLastPos );
HideCellEditControl();
SaveEditControlValue();
int rowTop = GetRowTop(m_dragRowOrCol);
SetRowSize( m_dragRowOrCol,
- wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+ wxMax( m_dragLastPos - rowTop, m_minAcceptableRowHeight ) );
if ( !GetBatchCount() )
{
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;
- m_gridWin->Refresh( FALSE, &rect );
+
+ // if there is a multicell block, paint all of it
+ if (m_table)
+ {
+ int i, cell_rows, cell_cols, subtract_rows = 0;
+ int leftCol = XToCol(left);
+ int rightCol = internalXToCol(left + cw);
+ if (leftCol >= 0)
+ {
+ for (i=leftCol; i<rightCol; i++)
+ {
+ GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
+ if (cell_rows < subtract_rows)
+ subtract_rows = cell_rows;
+ }
+ rect.y = GetRowTop(m_dragRowOrCol + subtract_rows);
+ CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+ rect.height = ch - rect.y;
+ }
+ }
+ m_gridWin->Refresh( false, &rect );
}
ShowCellEditControl();
wxClientDC dc( m_gridWin );
PrepareDC( dc );
dc.SetLogicalFunction( wxINVERT );
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
+ dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
HideCellEditControl();
SaveEditControlValue();
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;
- m_gridWin->Refresh( FALSE, &rect );
+
+ // if there is a multicell block, paint all of it
+ if (m_table)
+ {
+ int i, cell_rows, cell_cols, subtract_cols = 0;
+ int topRow = YToRow(top);
+ int bottomRow = internalYToRow(top + cw);
+ if (topRow >= 0)
+ {
+ for (i=topRow; i<bottomRow; i++)
+ {
+ GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
+ if (cell_cols < subtract_cols)
+ subtract_cols = cell_cols;
+ }
+
+ rect.x = GetColLeft(m_dragRowOrCol + subtract_cols);
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+ rect.width = cw - rect.x;
+ }
+ }
+
+ m_gridWin->Refresh( false, &rect );
}
ShowCellEditControl();
}
}
+void wxGrid::DoEndDragMoveCol()
+{
+ //The user clicked on the column but didn't actually drag
+ if ( m_dragLastPos < 0 )
+ {
+ m_colLabelWin->Refresh(); //Do this to "unpress" the column
+ return;
+ }
+
+ int newPos;
+ if ( m_moveToCol == -1 )
+ newPos = m_numCols - 1;
+ else
+ {
+ newPos = GetColPos( m_moveToCol );
+ if ( newPos > GetColPos( m_dragRowOrCol ) )
+ newPos--;
+ }
+ SetColPos( m_dragRowOrCol, newPos );
+}
-//
-// ------ interaction with data model
-//
-bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
+void wxGrid::SetColPos( int colID, int newPos )
{
- switch ( msg.GetId() )
+ if ( m_colAt.IsEmpty() )
{
- case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
- return GetModelValues();
+ m_colAt.Alloc( m_numCols );
- case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
- return SetModelValues();
-
- case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
+ int i;
+ for ( i = 0; i < m_numCols; i++ )
+ {
+ m_colAt.Add( i );
+ }
+ }
+
+ int oldPos = GetColPos( colID );
+
+ //Reshuffle the m_colAt array
+ if ( newPos > oldPos )
+ {
+ int i;
+ for ( i = oldPos; i < newPos; i++ )
+ {
+ m_colAt[i] = m_colAt[i+1];
+ }
+ }
+ else
+ {
+ int i;
+ for ( i = oldPos; i > newPos; i-- )
+ {
+ m_colAt[i] = m_colAt[i-1];
+ }
+ }
+
+ m_colAt[newPos] = colID;
+
+ //Recalculate the column rights
+ if ( !m_colWidths.IsEmpty() )
+ {
+ int colRight = 0;
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
+ {
+ int colID = GetColAt( colPos );
+
+ colRight += m_colWidths[colID];
+ m_colRights[colID] = colRight;
+ }
+ }
+
+ m_colLabelWin->Refresh();
+ m_gridWin->Refresh();
+}
+
+
+
+void wxGrid::EnableDragColMove( bool enable )
+{
+ if ( m_canDragColMove == enable )
+ return;
+
+ m_canDragColMove = enable;
+
+ if ( !m_canDragColMove )
+ {
+ m_colAt.Clear();
+
+ //Recalculate the column rights
+ if ( !m_colWidths.IsEmpty() )
+ {
+ int colRight = 0;
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
+ {
+ colRight += m_colWidths[colPos];
+ m_colRights[colPos] = colRight;
+ }
+ }
+
+ m_colLabelWin->Refresh();
+ m_gridWin->Refresh();
+ }
+}
+
+
+//
+// ------ interaction with data model
+//
+bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
+{
+ switch ( msg.GetId() )
+ {
+ case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
+ return GetModelValues();
+
+ case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
+ return SetModelValues();
+
+ case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
return Redimension( msg );
default:
- return FALSE;
+ return false;
}
}
-
-
// The behaviour of this function depends on the grid table class
-// Clear() function. For the default wxGridStringTable class the
+// Clear() function. For the default wxGridStringTable class the
// behavious is to replace all cell contents with wxEmptyString but
// not to change the number of rows or cols.
//
DisableCellEditControl();
m_table->Clear();
- if ( !GetBatchCount() ) m_gridWin->Refresh();
+ if (!GetBatchCount())
+ m_gridWin->Refresh();
}
}
-
bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
{
// TODO: something with updateLabels flag
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
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;
+}
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;
+}
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 )
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;
+}
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 )
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;
+}
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;
+}
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 )
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;
+}
//
// ----- event handlers
// Generate a grid event based on a mouse event and
// return the result of ProcessEvent()
//
-bool wxGrid::SendEvent( const wxEventType type,
+int wxGrid::SendEvent( const wxEventType type,
int row, int col,
wxMouseEvent& mouseEv )
{
- if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
- {
- int rowOrCol = (row == -1 ? col : row);
-
- wxGridSizeEvent gridEvt( GetId(),
- type,
- this,
- rowOrCol,
- mouseEv.GetX(), mouseEv.GetY(),
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
-
- return GetEventHandler()->ProcessEvent(gridEvt);
- }
- else if ( type == wxEVT_GRID_RANGE_SELECT )
- {
- // Right now, it should _never_ end up here!
- wxGridRangeSelectEvent gridEvt( GetId(),
- type,
- this,
- m_selectingTopLeft,
- m_selectingBottomRight,
- TRUE,
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
-
- return GetEventHandler()->ProcessEvent(gridEvt);
- }
- else
- {
- wxGridEvent gridEvt( GetId(),
- type,
- this,
- row, col,
- mouseEv.GetX(), mouseEv.GetY(),
- FALSE,
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
-
- return GetEventHandler()->ProcessEvent(gridEvt);
- }
+ bool claimed, vetoed;
+
+ if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
+ {
+ int rowOrCol = (row == -1 ? col : row);
+
+ wxGridSizeEvent gridEvt( GetId(),
+ type,
+ this,
+ rowOrCol,
+ mouseEv.GetX() + GetRowLabelSize(),
+ mouseEv.GetY() + GetColLabelSize(),
+ mouseEv.ControlDown(),
+ mouseEv.ShiftDown(),
+ mouseEv.AltDown(),
+ mouseEv.MetaDown() );
+
+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
+ vetoed = !gridEvt.IsAllowed();
+ }
+ else if ( type == wxEVT_GRID_RANGE_SELECT )
+ {
+ // Right now, it should _never_ end up here!
+ wxGridRangeSelectEvent gridEvt( GetId(),
+ type,
+ this,
+ m_selectingTopLeft,
+ m_selectingBottomRight,
+ true,
+ mouseEv.ControlDown(),
+ mouseEv.ShiftDown(),
+ mouseEv.AltDown(),
+ mouseEv.MetaDown() );
+
+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
+ vetoed = !gridEvt.IsAllowed();
+ }
+ else
+ {
+ wxGridEvent gridEvt( GetId(),
+ type,
+ this,
+ row, col,
+ mouseEv.GetX() + GetRowLabelSize(),
+ mouseEv.GetY() + GetColLabelSize(),
+ false,
+ mouseEv.ControlDown(),
+ mouseEv.ShiftDown(),
+ mouseEv.AltDown(),
+ mouseEv.MetaDown() );
+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
+ vetoed = !gridEvt.IsAllowed();
+ }
+
+ // A Veto'd event may not be `claimed' so test this first
+ if (vetoed)
+ return -1;
+
+ return claimed ? 1 : 0;
}
-
// Generate a grid event of specified type and return the result
// of ProcessEvent().
//
-bool wxGrid::SendEvent( const wxEventType type,
+int wxGrid::SendEvent( const wxEventType type,
int row, int col )
{
+ bool claimed, vetoed;
+
if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
{
int rowOrCol = (row == -1 ? col : row);
- wxGridSizeEvent gridEvt( GetId(),
- type,
- this,
- rowOrCol );
+ wxGridSizeEvent gridEvt( GetId(), type, this, rowOrCol );
- return GetEventHandler()->ProcessEvent(gridEvt);
+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
+ vetoed = !gridEvt.IsAllowed();
}
else
{
- wxGridEvent gridEvt( GetId(),
- type,
- this,
- row, col );
+ wxGridEvent gridEvt( GetId(), type, this, row, col );
- return GetEventHandler()->ProcessEvent(gridEvt);
- }
-}
+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
+ vetoed = !gridEvt.IsAllowed();
+ }
+
+ // A Veto'd event may not be `claimed' so test this first
+ if (vetoed)
+ return -1;
+ return claimed ? 1 : 0;
+}
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
- wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW
+ // needed to prevent zillions of paint events on MSW
+ wxPaintDC dc(this);
}
+void wxGrid::Refresh(bool eraseb, const wxRect* rect)
+{
+ // Don't do anything if between Begin/EndBatch...
+ // EndBatch() will do all this on the last nested one anyway.
+ if (! GetBatchCount())
+ {
+ // Refresh to get correct scrolled position:
+ wxScrolledWindow::Refresh(eraseb, rect);
+
+ if (rect)
+ {
+ int rect_x, rect_y, rectWidth, rectHeight;
+ int width_label, width_cell, height_label, height_cell;
+ int x, y;
+
+ // Copy rectangle can get scroll offsets..
+ rect_x = rect->GetX();
+ rect_y = rect->GetY();
+ rectWidth = rect->GetWidth();
+ rectHeight = rect->GetHeight();
-// This is just here to make sure that CalcDimensions gets called when
-// the grid view is resized... then the size event is skipped to allow
-// the box sizers to handle everything
-//
-void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) )
+ width_label = m_rowLabelWidth - rect_x;
+ if (width_label > rectWidth)
+ width_label = rectWidth;
+
+ height_label = m_colLabelHeight - rect_y;
+ if (height_label > rectHeight)
+ height_label = rectHeight;
+
+ if (rect_x > m_rowLabelWidth)
+ {
+ x = rect_x - m_rowLabelWidth;
+ width_cell = rectWidth;
+ }
+ else
+ {
+ x = 0;
+ width_cell = rectWidth - (m_rowLabelWidth - rect_x);
+ }
+
+ if (rect_y > m_colLabelHeight)
+ {
+ y = rect_y - m_colLabelHeight;
+ height_cell = rectHeight;
+ }
+ else
+ {
+ y = 0;
+ height_cell = rectHeight - (m_colLabelHeight - rect_y);
+ }
+
+ // Paint corner label part intersecting rect.
+ if ( width_label > 0 && height_label > 0 )
+ {
+ wxRect anotherrect(rect_x, rect_y, width_label, height_label);
+ m_cornerLabelWin->Refresh(eraseb, &anotherrect);
+ }
+
+ // Paint col labels part intersecting rect.
+ if ( width_cell > 0 && height_label > 0 )
+ {
+ wxRect anotherrect(x, rect_y, width_cell, height_label);
+ m_colLabelWin->Refresh(eraseb, &anotherrect);
+ }
+
+ // Paint row labels part intersecting rect.
+ if ( width_label > 0 && height_cell > 0 )
+ {
+ wxRect anotherrect(rect_x, y, width_label, height_cell);
+ m_rowLabelWin->Refresh(eraseb, &anotherrect);
+ }
+
+ // Paint cell area part intersecting rect.
+ if ( width_cell > 0 && height_cell > 0 )
+ {
+ wxRect anotherrect(x, y, width_cell, height_cell);
+ m_gridWin->Refresh(eraseb, &anotherrect);
+ }
+ }
+ else
+ {
+ m_cornerLabelWin->Refresh(eraseb, NULL);
+ m_colLabelWin->Refresh(eraseb, NULL);
+ m_rowLabelWin->Refresh(eraseb, NULL);
+ m_gridWin->Refresh(eraseb, NULL);
+ }
+ }
+}
+
+void wxGrid::OnSize( wxSizeEvent& event )
{
+ // position the child windows
CalcWindowSizes();
- CalcDimensions();
-}
+ // don't call CalcDimensions() from here, the base class handles the size
+ // changes itself
+ event.Skip();
+}
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
- //
wxWindow *parent = GetParent();
wxKeyEvent keyEvt( event );
keyEvt.SetEventObject( parent );
if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
{
-
// try local handlers
- //
- switch ( event.KeyCode() )
+ switch ( event.GetKeyCode() )
{
case WXK_UP:
if ( event.ControlDown() )
- {
MoveCursorUpBlock( event.ShiftDown() );
- }
else
- {
MoveCursorUp( event.ShiftDown() );
- }
break;
case WXK_DOWN:
if ( event.ControlDown() )
- {
MoveCursorDownBlock( event.ShiftDown() );
- }
else
- {
MoveCursorDown( event.ShiftDown() );
- }
break;
case WXK_LEFT:
if ( event.ControlDown() )
- {
MoveCursorLeftBlock( event.ShiftDown() );
- }
else
- {
MoveCursorLeft( event.ShiftDown() );
- }
break;
case WXK_RIGHT:
if ( event.ControlDown() )
- {
MoveCursorRightBlock( event.ShiftDown() );
- }
else
- {
MoveCursorRight( event.ShiftDown() );
- }
break;
case WXK_RETURN:
+ case WXK_NUMPAD_ENTER:
if ( event.ControlDown() )
{
event.Skip(); // to let the edit control have the return
else
{
// at the bottom of a column
- HideCellEditControl();
- SaveEditControlValue();
+ DisableCellEditControl();
}
}
break;
{
if ( GetGridCursorCol() > 0 )
{
- MoveCursorLeft( FALSE );
+ MoveCursorLeft( false );
}
else
{
// at left of grid
- HideCellEditControl();
- SaveEditControlValue();
+ DisableCellEditControl();
}
}
else
{
- if ( GetGridCursorCol() < GetNumberCols()-1 )
+ if ( GetGridCursorCol() < GetNumberCols() - 1 )
{
- MoveCursorRight( FALSE );
+ MoveCursorRight( false );
}
else
{
// at right of grid
- HideCellEditControl();
- SaveEditControlValue();
+ DisableCellEditControl();
}
}
break;
case WXK_END:
if ( event.ControlDown() )
{
- MakeCellVisible( m_numRows-1, m_numCols-1 );
- SetCurrentCell( m_numRows-1, m_numCols-1 );
+ MakeCellVisible( m_numRows - 1, m_numCols - 1 );
+ SetCurrentCell( m_numRows - 1, m_numCols - 1 );
}
else
{
}
break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
MovePageUp();
break;
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
MovePageDown();
break;
case WXK_SPACE:
if ( event.ControlDown() )
{
- m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- break;
- }
- if ( !IsEditable() )
- {
- MoveCursorRight( FALSE );
- break;
- }
- // Otherwise fall through to default
-
- 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);
-
- // <F2> is special and will always start editing, for
- // other keys - ask the editor itself
- if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
- || editor->IsAcceptedKey(event) )
- {
- EnableCellEditControl();
- editor->StartingKey(event);
- }
- else
+ if ( m_selection )
{
- event.Skip();
+ m_selection->ToggleCellSelection(
+ m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
-
- editor->DecRef();
- attr->DecRef();
+ break;
}
+
+ if ( !IsEditable() )
+ MoveCursorRight( false );
else
- {
- // let others process char events with modifiers or all
- // char events for readonly cells
event.Skip();
- }
+ break;
+
+ default:
+ 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 )
- m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
- m_selectingTopLeft.GetCol(),
- m_selectingBottomRight.GetRow(),
- m_selectingBottomRight.GetCol(),
- event.ControlDown(),
- TRUE,
- event.AltDown(),
- event.MetaDown() );
+ {
+ if ( m_selection )
+ {
+ m_selection->SelectBlock(
+ m_selectingTopLeft.GetRow(),
+ m_selectingTopLeft.GetCol(),
+ m_selectingBottomRight.GetRow(),
+ m_selectingBottomRight.GetCol(),
+ event.ControlDown(),
+ true,
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ }
+
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
m_selectingKeyboard = wxGridNoCellCoords;
}
}
+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);
+
+ // <F2> 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&)
{
}
return;
}
- wxClientDC dc(m_gridWin);
- PrepareDC(dc);
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
if ( m_currentCellCoords != wxGridNoCellCoords )
{
- HideCellEditControl();
DisableCellEditControl();
- if ( IsVisible( m_currentCellCoords ) )
+ if ( IsVisible( m_currentCellCoords, false ) )
{
wxRect r;
- r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords );
if ( !m_gridLinesEnabled )
{
r.x--;
r.height++;
}
- CalcCellsExposed( r );
-
+ wxGridCellCoordsArray cells = CalcCellsExposed( r );
+
// Otherwise refresh redraws the highlight!
m_currentCellCoords = coords;
- DrawGridCellArea(dc);
+ DrawGridCellArea( dc, cells );
DrawAllGridLines( dc, r );
}
}
m_currentCellCoords = coords;
- wxGridCellAttr* attr = GetCellAttr(coords);
- DrawCellHighlight(dc, attr);
+ wxGridCellAttr *attr = GetCellAttr( coords );
+ DrawCellHighlight( dc, attr );
attr->DecRef();
}
-
-//
-// ------ functions to get/send data (see also public functions)
-//
-
-bool wxGrid::GetModelValues()
-{
- if ( m_table )
- {
- // all we need to do is repaint the grid
- //
- m_gridWin->Refresh();
- return TRUE;
- }
-
- return FALSE;
-}
-
-
-bool wxGrid::SetModelValues()
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
{
- int row, col;
+ int temp;
+ wxGridCellCoords updateTopLeft, updateBottomRight;
- if ( m_table )
+ if ( m_selection )
{
- for ( row = 0; row < m_numRows; row++ )
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
{
- for ( col = 0; col < m_numCols; col++ )
- {
- m_table->SetValue( row, col, GetCellValue(row, col) );
- }
+ leftCol = 0;
+ rightCol = GetNumberCols() - 1;
+ }
+ else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+ {
+ topRow = 0;
+ bottomRow = GetNumberRows() - 1;
}
-
- return TRUE;
}
- return FALSE;
-}
-
+ if ( topRow > bottomRow )
+ {
+ temp = topRow;
+ topRow = bottomRow;
+ bottomRow = temp;
+ }
+ if ( leftCol > rightCol )
+ {
+ temp = leftCol;
+ leftCol = rightCol;
+ rightCol = temp;
+ }
+
+ updateTopLeft = wxGridCellCoords( topRow, leftCol );
+ updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+ // First the case that we selected a completely new area
+ if ( m_selectingTopLeft == wxGridNoCellCoords ||
+ m_selectingBottomRight == wxGridNoCellCoords )
+ {
+ wxRect rect;
+ rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
+ wxGridCellCoords ( bottomRow, rightCol ) );
+ m_gridWin->Refresh( false, &rect );
+ }
+
+ // Now handle changing an existing selection area.
+ else if ( m_selectingTopLeft != updateTopLeft ||
+ m_selectingBottomRight != updateBottomRight )
+ {
+ // Compute two optimal update rectangles:
+ // Either one rectangle is a real subset of the
+ // other, or they are (almost) disjoint!
+ wxRect rect[4];
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = false;
+ int i;
+
+ // Store intermediate values
+ wxCoord oldLeft = m_selectingTopLeft.GetCol();
+ wxCoord oldTop = m_selectingTopLeft.GetRow();
+ wxCoord oldRight = m_selectingBottomRight.GetCol();
+ wxCoord oldBottom = m_selectingBottomRight.GetRow();
+
+ // Determine the outer/inner coordinates.
+ if (oldLeft > leftCol)
+ {
+ temp = oldLeft;
+ oldLeft = leftCol;
+ leftCol = temp;
+ }
+ if (oldTop > topRow )
+ {
+ temp = oldTop;
+ oldTop = topRow;
+ topRow = temp;
+ }
+ if (oldRight < rightCol )
+ {
+ temp = oldRight;
+ oldRight = rightCol;
+ rightCol = temp;
+ }
+ if (oldBottom < bottomRow)
+ {
+ temp = oldBottom;
+ oldBottom = bottomRow;
+ bottomRow = temp;
+ }
+
+ // Now, either the stuff marked old is the outer
+ // rectangle or we don't have a situation where one
+ // is contained in the other.
+
+ if ( oldLeft < leftCol )
+ {
+ // Refresh the newly selected or deselected
+ // area to the left of the old or new selection.
+ need_refresh[0] = true;
+ rect[0] = BlockToDeviceRect(
+ wxGridCellCoords( oldTop, oldLeft ),
+ wxGridCellCoords( oldBottom, leftCol - 1 ) );
+ }
+
+ if ( oldTop < topRow )
+ {
+ // Refresh the newly selected or deselected
+ // area above the old or new selection.
+ need_refresh[1] = true;
+ rect[1] = BlockToDeviceRect(
+ wxGridCellCoords( oldTop, leftCol ),
+ wxGridCellCoords( topRow - 1, rightCol ) );
+ }
+
+ if ( oldRight > rightCol )
+ {
+ // Refresh the newly selected or deselected
+ // area to the right of the old or new selection.
+ need_refresh[2] = true;
+ rect[2] = BlockToDeviceRect(
+ wxGridCellCoords( oldTop, rightCol + 1 ),
+ wxGridCellCoords( oldBottom, oldRight ) );
+ }
+
+ if ( oldBottom > bottomRow )
+ {
+ // Refresh the newly selected or deselected
+ // area below the old or new selection.
+ need_refresh[3] = true;
+ rect[3] = BlockToDeviceRect(
+ wxGridCellCoords( bottomRow + 1, leftCol ),
+ wxGridCellCoords( oldBottom, rightCol ) );
+ }
+
+ // various Refresh() calls
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( false, &(rect[i]) );
+ }
+
+ // change selection
+ m_selectingTopLeft = updateTopLeft;
+ m_selectingBottomRight = updateBottomRight;
+}
+
+//
+// ------ functions to get/send data (see also public functions)
+//
+
+bool wxGrid::GetModelValues()
+{
+ // Hide the editor, so it won't hide a changed value.
+ HideCellEditControl();
+
+ if ( m_table )
+ {
+ // all we need to do is repaint the grid
+ //
+ m_gridWin->Refresh();
+ return true;
+ }
+
+ return false;
+}
+
+bool wxGrid::SetModelValues()
+{
+ int row, col;
+
+ // Disable the editor, so it won't hide a changed value.
+ // Do we also want to save the current value of the editor first?
+ // I think so ...
+ DisableCellEditControl();
+
+ if ( m_table )
+ {
+ for ( row = 0; row < m_numRows; row++ )
+ {
+ for ( col = 0; col < m_numCols; col++ )
+ {
+ m_table->SetValue( row, col, GetCellValue(row, col) );
+ }
+ }
+
+ return true;
+ }
+
+ return false;
+}
// Note - this function only draws cells that are in the list of
// exposed cells (usually set from the update region by
// CalcExposedCells)
//
-void wxGrid::DrawGridCellArea( wxDC& dc )
+void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
{
- if ( !m_numRows || !m_numCols ) return;
+ if ( !m_numRows || !m_numCols )
+ return;
- size_t i;
- size_t numCells = m_cellsExposed.GetCount();
+ int i, numCells = cells.GetCount();
+ int row, col, cell_rows, cell_cols;
+ wxGridCellCoordsArray redrawCells;
+
+ for ( i = numCells - 1; i >= 0; i-- )
+ {
+ row = cells[i].GetRow();
+ col = cells[i].GetCol();
+ GetCellSize( row, col, &cell_rows, &cell_cols );
+
+ // If this cell is part of a multicell block, find owner for repaint
+ if ( cell_rows <= 0 || cell_cols <= 0 )
+ {
+ wxGridCellCoords cell( row + cell_rows, col + cell_cols );
+ bool marked = false;
+ for ( int j = 0; j < numCells; j++ )
+ {
+ if ( cell == cells[j] )
+ {
+ marked = true;
+ break;
+ }
+ }
+
+ if (!marked)
+ {
+ int count = redrawCells.GetCount();
+ for (int j = 0; j < count; j++)
+ {
+ if ( cell == redrawCells[j] )
+ {
+ marked = true;
+ break;
+ }
+ }
- for ( i = 0; i < numCells; i++ )
+ if (!marked)
+ redrawCells.Add( cell );
+ }
+
+ // don't bother drawing this cell
+ continue;
+ }
+
+ // If this cell is empty, find cell to left that might want to overflow
+ if (m_table && m_table->IsEmptyCell(row, col))
+ {
+ for ( int l = 0; l < cell_rows; l++ )
+ {
+ // find a cell in this row to leave already marked for repaint
+ int left = col;
+ for (int k = 0; k < int(redrawCells.GetCount()); k++)
+ if ((redrawCells[k].GetCol() < left) &&
+ (redrawCells[k].GetRow() == row))
+ {
+ left = redrawCells[k].GetCol();
+ }
+
+ if (left == col)
+ left = 0; // oh well
+
+ for (int j = col - 1; j >= left; j--)
+ {
+ if (!m_table->IsEmptyCell(row + l, j))
+ {
+ if (GetCellOverflow(row + l, j))
+ {
+ wxGridCellCoords cell(row + l, j);
+ bool marked = false;
+
+ for (int k = 0; k < numCells; k++)
+ {
+ if ( cell == cells[k] )
+ {
+ marked = true;
+ break;
+ }
+ }
+
+ if (!marked)
+ {
+ int count = redrawCells.GetCount();
+ for (int k = 0; k < count; k++)
+ {
+ if ( cell == redrawCells[k] )
+ {
+ marked = true;
+ break;
+ }
+ }
+ if (!marked)
+ redrawCells.Add( cell );
+ }
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ DrawCell( dc, cells[i] );
+ }
+
+ numCells = redrawCells.GetCount();
+
+ for ( i = numCells - 1; i >= 0; i-- )
{
- DrawCell( dc, m_cellsExposed[i] );
+ DrawCell( dc, redrawCells[i] );
}
}
-
void wxGrid::DrawGridSpace( wxDC& dc )
{
int cw, ch;
int right, bottom;
CalcUnscrolledPosition( cw, ch, &right, &bottom );
- int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0;
- int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ;
+ int rightCol = m_numCols > 0 ? GetColRight(GetColAt( m_numCols - 1 )) : 0;
+ int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0;
if ( right > rightCol || bottom > bottomRow )
{
if ( right > rightCol )
{
- dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+ dc.DrawRectangle( rightCol, top, right - rightCol, ch );
}
if ( bottom > bottomRow )
{
- dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+ dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow );
}
}
}
-
void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
{
int row = coords.GetRow();
// Note: However, only if it is really _shown_, i.e. not hidden!
if ( isCurrent && IsCellEditControlShown() )
{
+ // NB: this "#if..." is temporary and fixes a problem where the
+ // edit control is erased by this code after being rendered.
+ // On wxMac (QD build only), the cell editor is a wxTextCntl and is rendered
+ // implicitly, causing this out-of order render.
+#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS
wxGridCellEditor *editor = attr->GetEditor(this, row, col);
editor->PaintBackground(rect, attr);
editor->DecRef();
+#endif
}
else
{
- // but all the rest is drawn by the cell renderer and hence may be
- // customized
+ // but all the rest is drawn by the cell renderer and hence may be customized
wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
renderer->DecRef();
// hmmm... what could we do here to show that the cell is disabled?
// for now, I just draw a thinner border than for the other ones, but
// it doesn't look really good
- dc.SetPen(wxPen(m_cellHighlightColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle(rect);
+ int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth;
+
+ if (penWidth > 0)
+ {
+ // The center of the drawn line is where the position/width/height of
+ // the rectangle is actually at (on wxMSW at least), so the
+ // size of the rectangle is reduced to compensate for the thickness of
+ // the line. If this is too strange on non-wxMSW platforms then
+ // please #ifdef this appropriately.
+ rect.x += penWidth / 2;
+ rect.y += penWidth / 2;
+ rect.width -= penWidth - 1;
+ rect.height -= penWidth - 1;
+
+ // Now draw the rectangle
+ // use the cellHighlightColour if the cell is inside a selection, this
+ // will ensure the cell is always visible.
+ dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxSOLID));
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(rect);
+ }
#if 0
- // VZ: my experiments with 3d borders...
+ // VZ: my experiments with 3D borders...
// how to properly set colours for arbitrary bg?
wxCoord x1 = rect.x,
y1 = rect.y,
- x2 = rect.x + rect.width -1,
- y2 = rect.y + rect.height -1;
+ x2 = rect.x + rect.width - 1,
+ y2 = rect.y + rect.height - 1;
dc.SetPen(*wxWHITE_PEN);
dc.DrawLine(x1, y1, x2, y1);
dc.DrawLine(x1, y1, x1, y2);
dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
- dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 );
+ dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2);
dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(x1, y2, x2, y2);
- dc.DrawLine(x2, y1, x2, y2+1);
-#endif // 0
+ dc.DrawLine(x2, y1, x2, y2 + 1);
+#endif
}
-
void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
{
int row = coords.GetRow();
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
+ wxRect rect = CellToRect( row, col );
+
// right hand border
- //
- dc.DrawLine( GetColRight(col), GetRowTop(row),
- GetColRight(col), GetRowBottom(row) );
+ dc.DrawLine( rect.x + rect.width, rect.y,
+ rect.x + rect.width, rect.y + rect.height + 1 );
// bottom border
- //
- dc.DrawLine( GetColLeft(col), GetRowBottom(row),
- GetColRight(col), GetRowBottom(row) );
+ dc.DrawLine( rect.x, rect.y + rect.height,
+ rect.x + rect.width, rect.y + rect.height);
}
-void wxGrid::DrawHighlight(wxDC& dc)
+void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells)
{
// This if block was previously in wxGrid::OnPaint but that doesn't
// seem to get called under wxGTK - MB
//
- if ( m_currentCellCoords == wxGridNoCellCoords &&
+ if ( m_currentCellCoords == wxGridNoCellCoords &&
m_numRows && m_numCols )
{
m_currentCellCoords.Set(0, 0);
// if the active cell was repainted, repaint its highlight too because it
// might have been damaged by the grid lines
- size_t count = m_cellsExposed.GetCount();
+ size_t count = cells.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- if ( m_cellsExposed[n] == m_currentCellCoords )
+ if ( cells[n] == m_currentCellCoords )
{
wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
DrawCellHighlight(dc, attr);
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
-void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
{
- if ( !m_gridLinesEnabled ||
- !m_numRows ||
- !m_numCols ) return;
+#if !WXGRID_DRAW_LINES
+ return;
+#endif
+
+ if ( !m_gridLinesEnabled || !m_numRows || !m_numCols )
+ return;
int top, bottom, left, right;
// avoid drawing grid lines past the last row and col
//
- right = wxMin( right, GetColRight(m_numCols - 1) );
+ right = wxMin( right, GetColRight(GetColAt( m_numCols - 1 )) );
bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
+ // no gridlines inside multicells, clip them out
+ int leftCol = GetColPos( internalXToCol(left) );
+ int topRow = internalYToRow(top);
+ int rightCol = GetColPos( internalXToCol(right) );
+ int bottomRow = internalYToRow(bottom);
+
+#ifndef __WXMAC__
+ // CS: I don't know why suddenly unscrolled coordinates are used for clipping
+ wxRegion clippedcells(0, 0, cw, ch);
+
+ int i, j, cell_rows, cell_cols;
+ wxRect rect;
+
+ for (j=topRow; j<bottomRow; j++)
+ {
+ int colPos;
+ for (colPos=leftCol; colPos<rightCol; colPos++)
+ {
+ i = GetColAt( colPos );
+
+ 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);
+ }
+ }
+ }
+#else
+ wxRegion clippedcells( left, top, right - left, bottom - top );
+
+ int i, j, cell_rows, cell_cols;
+ wxRect rect;
+
+ for (j=topRow; j<bottomRow; j++)
+ {
+ for (i=leftCol; i<rightCol; i++)
+ {
+ GetCellSize( j, i, &cell_rows, &cell_cols );
+ if ((cell_rows > 1) || (cell_cols > 1))
+ {
+ rect = CellToRect(j, i);
+ clippedcells.Subtract(rect);
+ }
+ else if ((cell_rows < 0) || (cell_cols < 0))
+ {
+ rect = CellToRect(j + cell_rows, i + cell_cols);
+ clippedcells.Subtract(rect);
+ }
+ }
+ }
+#endif
+
+ dc.SetClippingRegion( clippedcells );
+
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
// horizontal grid lines
//
- int i;
- for ( i = 0; i < m_numRows; i++ )
+ // already declared above - int i;
+ for ( i = internalYToRow(top); i < m_numRows; i++ )
{
int bot = GetRowBottom(i) - 1;
}
}
-
// vertical grid lines
//
- for ( i = 0; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = leftCol; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
int colRight = GetColRight(i) - 1;
if ( colRight > right )
{
dc.DrawLine( colRight, top, colRight, bottom );
}
}
-}
+ dc.DestroyClippingRegion();
+}
-void wxGrid::DrawRowLabels( wxDC& dc )
+void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)
{
- if ( !m_numRows ) return;
+ if ( !m_numRows )
+ return;
size_t i;
- size_t numLabels = m_rowLabelsExposed.GetCount();
+ size_t numLabels = rows.GetCount();
- for ( i = 0; i < numLabels; i++ )
+ for ( i = 0; i < numLabels; i++ )
{
- DrawRowLabel( dc, m_rowLabelsExposed[i] );
+ DrawRowLabel( dc, rows[i] );
}
}
-
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;
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawLine( m_rowLabelWidth-1, rowTop,
- m_rowLabelWidth-1, rowBottom );
-
- dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
+ dc.DrawLine( m_rowLabelWidth - 1, rowTop, m_rowLabelWidth - 1, rowBottom );
+ dc.DrawLine( 0, rowTop, 0, rowBottom );
+ dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );
dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( 0, rowTop, 0, rowBottom );
- dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+ dc.DrawLine( 1, rowTop, 1, rowBottom );
+ dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );
+#endif
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
int hAlign, vAlign;
GetRowLabelAlignment( &hAlign, &vAlign );
- wxRect rect;
rect.SetX( 2 );
rect.SetY( GetRowTop(row) + 2 );
rect.SetWidth( m_rowLabelWidth - 4 );
DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
}
-
-void wxGrid::DrawColLabels( wxDC& dc )
+void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
{
- if ( !m_numCols ) return;
+ if ( !m_numCols )
+ return;
size_t i;
- size_t numLabels = m_colLabelsExposed.GetCount();
+ size_t numLabels = cols.GetCount();
- for ( i = 0; i < numLabels; i++ )
+ for ( i = 0; i < numLabels; i++ )
{
- DrawColLabel( dc, m_colLabelsExposed[i] );
+ DrawColLabel( dc, cols[i] );
}
}
-
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;
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawLine( colRight, 0,
- colRight, m_colLabelHeight-1 );
+#ifdef __WXGTK20__
+ rect.SetX( colLeft + 1 );
+ rect.SetY( 1 );
+ rect.SetWidth( GetColWidth(col) - 2 );
+ rect.SetHeight( m_colLabelHeight - 2 );
- dc.DrawLine( colLeft, m_colLabelHeight-1,
- colRight, m_colLabelHeight-1 );
+ wxWindowDC *win_dc = (wxWindowDC*) &dc;
- dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
+ wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
+#else
+ int colRight = GetColRight(col) - 1;
+
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
+ dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
dc.DrawLine( colLeft, 0, colRight, 0 );
+ dc.DrawLine( colLeft, m_colLabelHeight - 1,
+ colRight + 1, m_colLabelHeight - 1 );
- dc.SetBackgroundMode( wxTRANSPARENT );
- dc.SetTextForeground( GetLabelTextColour() );
- dc.SetFont( GetLabelFont() );
+ dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
+ dc.DrawLine( colLeft, 1, colRight, 1 );
+#endif
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
- 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 )
{
- long textWidth, textHeight;
- long lineWidth, lineHeight;
wxArrayString lines;
- dc.SetClippingRegion( rect );
StringToLines( value, lines );
- if ( lines.GetCount() )
- {
- GetTextBoxSize( dc, lines, &textWidth, &textHeight );
- dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
- float x, y;
- switch ( horizAlign )
- {
- case wxRIGHT:
- x = rect.x + (rect.width - textWidth - 1);
- break;
+ // Forward to new API.
+ DrawTextRectangle( dc,
+ lines,
+ rect,
+ horizAlign,
+ vertAlign,
+ textOrientation );
+}
+
+// VZ: this should be replaced with wxDC::DrawLabel() to which we just have to
+// add textOrientation support
+void wxGrid::DrawTextRectangle(wxDC& dc,
+ const wxArrayString& lines,
+ const wxRect& rect,
+ int horizAlign,
+ int vertAlign,
+ int textOrientation)
+{
+ if ( lines.empty() )
+ return;
- case wxCENTRE:
- x = rect.x + ((rect.width - textWidth)/2);
- break;
+ wxDCClipper clip(dc, rect);
- case wxLEFT:
- default:
- x = rect.x + 1;
- break;
- }
+ long textWidth,
+ textHeight;
- switch ( vertAlign )
- {
- case wxBOTTOM:
+ if ( textOrientation == wxHORIZONTAL )
+ GetTextBoxSize( dc, lines, &textWidth, &textHeight );
+ else
+ GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+
+ int x = 0,
+ y = 0;
+ switch ( vertAlign )
+ {
+ case wxALIGN_BOTTOM:
+ if ( textOrientation == wxHORIZONTAL )
y = rect.y + (rect.height - textHeight - 1);
- break;
+ else
+ x = rect.x + rect.width - textWidth;
+ break;
- case wxCENTRE:
- y = rect.y + ((rect.height - textHeight)/2);
- break;
+ case wxALIGN_CENTRE:
+ if ( textOrientation == wxHORIZONTAL )
+ y = rect.y + ((rect.height - textHeight) / 2);
+ else
+ x = rect.x + ((rect.width - textWidth) / 2);
+ break;
- case wxTOP:
- default:
+ case wxALIGN_TOP:
+ default:
+ if ( textOrientation == wxHORIZONTAL )
y = rect.y + 1;
- break;
- }
+ else
+ x = rect.x + 1;
+ break;
+ }
+
+ // Align each line of a multi-line label
+ size_t nLines = lines.GetCount();
+ for ( size_t l = 0; l < nLines; l++ )
+ {
+ const wxString& line = lines[l];
+
+ if ( line.empty() )
+ {
+ *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+ continue;
+ }
+
+ long lineWidth,
+ lineHeight;
+ dc.GetTextExtent(line, &lineWidth, &lineHeight);
+
+ switch ( horizAlign )
+ {
+ case wxALIGN_RIGHT:
+ if ( textOrientation == wxHORIZONTAL )
+ x = rect.x + (rect.width - lineWidth - 1);
+ else
+ y = rect.y + lineWidth + 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;
+
+ case wxALIGN_LEFT:
+ default:
+ if ( textOrientation == wxHORIZONTAL )
+ x = rect.x + 1;
+ else
+ y = rect.y + rect.height - 1;
+ break;
+ }
- for ( size_t i = 0; i < lines.GetCount(); i++ )
+ if ( textOrientation == wxHORIZONTAL )
{
- dc.DrawText( lines[i], (int)x, (int)y );
+ dc.DrawText( line, x, y );
y += lineHeight;
}
+ else
+ {
+ dc.DrawRotatedText( line, x, y, 90.0 );
+ x += lineHeight;
+ }
}
-
- dc.DestroyClippingRegion();
}
-
-// Split multi line text up into an array of strings. Any existing
-// contents of the string array are preserved.
+// Split multi-line text up into an array of strings.
+// Any existing contents of the string array are preserved.
//
void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
{
wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
- while ( startPos < (int)tVal.Length() )
+ while ( startPos < (int)tVal.length() )
{
pos = tVal.Mid(startPos).Find( eol );
if ( pos < 0 )
{
lines.Add( value.Mid(startPos, pos) );
}
- startPos += pos+1;
+
+ startPos += pos + 1;
}
- if ( startPos < (int)value.Length() )
+
+ if ( startPos < (int)value.length() )
{
lines.Add( value.Mid( startPos ) );
}
}
-
-void wxGrid::GetTextBoxSize( wxDC& dc,
- wxArrayString& lines,
+void wxGrid::GetTextBoxSize( const wxDC& dc,
+ const wxArrayString& lines,
long *width, long *height )
{
long w = 0;
long h = 0;
- long lineW, lineH;
+ long lineW = 0, lineH = 0;
size_t i;
- for ( i = 0; i < lines.GetCount(); i++ )
+ for ( i = 0; i < lines.GetCount(); i++ )
{
dc.GetTextExtent( lines[i], &lineW, &lineH );
w = wxMax( w, lineW );
}
}
+// Use this, rather than wxWindow::Refresh(), to force an immediate
+// repainting of the grid. Has no effect if you are already inside a
+// BeginBatch / EndBatch block.
+//
+void wxGrid::ForceRefresh()
+{
+ BeginBatch();
+ EndBatch();
+}
+
+bool wxGrid::Enable(bool enable)
+{
+ if ( !wxScrolledWindow::Enable(enable) )
+ return false;
+
+ // redraw in the new state
+ m_gridWin->Refresh();
+
+ return true;
+}
+
//
// ------ Edit control functions
//
-
void wxGrid::EnableEditing( bool edit )
{
// TODO: improve this ?
//
if ( edit != m_editable )
{
+ if (!edit)
+ EnableCellEditControl(edit);
m_editable = edit;
-
- // FIXME IMHO this won't disable the edit control if edit == FALSE
- // because of the check in the beginning of
- // EnableCellEditControl() just below (VZ)
- EnableCellEditControl(m_editable);
}
}
-
void wxGrid::EnableCellEditControl( bool enable )
{
if (! m_editable)
return;
- if ( m_currentCellCoords == wxGridNoCellCoords )
- SetCurrentCell( 0, 0 );
-
if ( enable != m_cellEditCtrlEnabled )
{
- // TODO allow the app to Veto() this event?
- SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN);
-
if ( enable )
{
+ if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0)
+ return;
+
// this should be checked by the caller!
- wxASSERT_MSG( CanEnableCellControl(),
- _T("can't enable editing for this cell!") );
+ wxASSERT_MSG( CanEnableCellControl(), _T("can't enable editing for this cell!") );
// do it before ShowCellEditControl()
m_cellEditCtrlEnabled = enable;
}
else
{
+ //FIXME:add veto support
+ SendEvent( wxEVT_GRID_EDITOR_HIDDEN );
+
HideCellEditControl();
SaveEditControlValue();
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 )
{
{
if ( IsCellEditControlEnabled() )
{
- if ( !IsVisible( m_currentCellCoords ) )
+ if ( !IsVisible( m_currentCellCoords, false ) )
{
+ m_cellEditCtrlEnabled = false;
return;
}
else
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
+ // if this is part of a multicell, find owner (topleft)
+ int cell_rows, cell_cols;
+ GetCellSize( row, col, &cell_rows, &cell_cols );
+ if ( cell_rows <= 0 || cell_cols <= 0 )
+ {
+ row += cell_rows;
+ col += cell_cols;
+ m_currentCellCoords.SetRow( row );
+ m_currentCellCoords.SetCol( col );
+ }
+
// convert to scrolled coords
- //
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
- // done in PaintBackground()
-#if 0
+ int nXMove = 0;
+ if (rect.x < 0)
+ nXMove = rect.x;
+
// erase the highlight and the cell contents because the editor
// might not cover the entire cell
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
+ dc.SetBrush(wxBrush(GetCellAttr(row, col)->GetBackgroundColour(), wxSOLID));
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(rect);
-#endif // 0
// cell is shifted by one pixel
- rect.x--;
- rect.y--;
+ // However, don't allow x or y to become negative
+ // since the SetSize() method interprets that as
+ // "don't change."
+ if (rect.x > 0)
+ rect.x--;
+ if (rect.y > 0)
+ rect.y--;
wxGridCellAttr* attr = GetCellAttr(row, col);
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(),
+ wxEVT_GRID_EDITOR_CREATED,
+ this,
+ row,
+ col,
+ editor->GetControl());
+ GetEventHandler()->ProcessEvent(evt);
+ }
+
+ // resize editor to overflow into righthand cells if allowed
+ int maxWidth = rect.width;
+ wxString value = GetCellValue(row, col);
+ if ( (value != wxEmptyString) && (attr->GetOverflow()) )
+ {
+ int y;
+ GetTextExtent(value, &maxWidth, &y, NULL, NULL, &attr->GetFont());
+ if (maxWidth < rect.width)
+ maxWidth = rect.width;
}
- editor->Show( TRUE, attr );
+ int client_right = m_gridWin->GetClientSize().GetWidth();
+ if (rect.x + maxWidth > client_right)
+ maxWidth = client_right - rect.x;
+
+ if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
+ {
+ GetCellSize( row, col, &cell_rows, &cell_cols );
+ // may have changed earlier
+ for (int i = col + cell_cols; i < m_numCols; i++)
+ {
+ int c_rows, c_cols;
+ GetCellSize( row, i, &c_rows, &c_cols );
+
+ // looks weird going over a multicell
+ if (m_table->IsEmptyCell( row, i ) &&
+ (rect.width < maxWidth) && (c_rows == 1))
+ {
+ rect.width += GetColWidth( i );
+ }
+ else
+ break;
+ }
+
+ if (rect.GetRight() > client_right)
+ rect.SetRight( client_right - 1 );
+ }
+ editor->SetCellAttr( attr );
editor->SetSize( rect );
+ if (nXMove != 0)
+ editor->GetControl()->Move(
+ editor->GetControl()->GetPosition().x + nXMove,
+ editor->GetControl()->GetPosition().y );
+ editor->Show( true, attr );
+
+ // recalc dimensions in case we need to
+ // expand the scrolled window to account for editor
+ CalcDimensions();
editor->BeginEdit(row, col, this);
+ editor->SetCellAttr(NULL);
editor->DecRef();
attr->DecRef();
- }
+ }
}
}
-
void wxGrid::HideCellEditControl()
{
if ( IsCellEditControlEnabled() )
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
- wxGridCellAttr* attr = GetCellAttr(row, col);
+ wxGridCellAttr *attr = GetCellAttr(row, col);
wxGridCellEditor *editor = attr->GetEditor(this, row, col);
- editor->Show( FALSE );
+ editor->Show( false );
editor->DecRef();
attr->DecRef();
+
m_gridWin->SetFocus();
- wxRect rect( CellToRect( row, col ) );
- m_gridWin->Refresh( FALSE, &rect );
+
+ // 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;
+
+#ifdef __WXMAC__
+ // ensure that the pixels under the focus ring get refreshed as well
+ rect.Inflate(10, 10);
+#endif
+
+ m_gridWin->Refresh( false, &rect );
}
}
-
void wxGrid::SaveEditControlValue()
{
if ( IsCellEditControlEnabled() )
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
+ wxString oldval = GetCellValue(row, col);
+
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
bool changed = editor->EndEdit(row, col, this);
if (changed)
{
- SendEvent( wxEVT_GRID_CELL_CHANGE,
+ if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() );
+ m_currentCellCoords.GetCol() ) < 0 )
+ {
+ // Event has been vetoed, set the data back.
+ SetCellValue(row, col, oldval);
+ }
}
}
}
-
//
// ------ Grid location functions
// Note that all of these functions work with the logical coordinates of
int row = YToRow(y);
int col = XToCol(x);
- if ( row == -1 || col == -1 )
+ if ( row == -1 || col == -1 )
{
coords = wxGridNoCellCoords;
}
}
}
+// Internal Helper function for computing row or column from some
+// (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array
+// of m_rowBottoms/m_ColRights to speed up the search!
-int wxGrid::YToRow( int y )
+static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
+ const wxArrayInt& BorderArray, int nMax,
+ bool clipToMinMax)
{
- int i;
+ if (coord < 0)
+ return clipToMinMax && (nMax > 0) ? 0 : -1;
+
+ if (!defaultDist)
+ defaultDist = 1;
- for ( i = 0; i < m_numRows; i++ )
+ size_t i_max = coord / defaultDist,
+ i_min = 0;
+
+ if (BorderArray.IsEmpty())
{
- if ( y < GetRowBottom(i) )
- return i;
+ if ((int) i_max < nMax)
+ return i_max;
+ return clipToMinMax ? nMax - 1 : -1;
}
- return -1;
+ if ( i_max >= BorderArray.GetCount())
+ {
+ i_max = BorderArray.GetCount() - 1;
+ }
+ else
+ {
+ if ( coord >= BorderArray[i_max])
+ {
+ i_min = i_max;
+ if (minDist)
+ i_max = coord / minDist;
+ else
+ i_max = BorderArray.GetCount() - 1;
+ }
+
+ if ( i_max >= BorderArray.GetCount())
+ i_max = BorderArray.GetCount() - 1;
+ }
+
+ if ( coord >= BorderArray[i_max])
+ return clipToMinMax ? (int)i_max : -1;
+ if ( coord < BorderArray[0] )
+ return 0;
+
+ while ( i_max - i_min > 0 )
+ {
+ wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max],
+ 0, _T("wxGrid: internal error in CoordToRowOrCol"));
+ if (coord >= BorderArray[ i_max - 1])
+ return i_max;
+ else
+ i_max--;
+ int median = i_min + (i_max - i_min + 1) / 2;
+ if (coord < BorderArray[median])
+ i_max = median;
+ else
+ i_min = median;
+ }
+
+ return i_max;
}
+int wxGrid::YToRow( int y )
+{
+ return CoordToRowOrCol(y, m_defaultRowHeight,
+ m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
+}
-int wxGrid::XToCol( int x )
+int wxGrid::XToCol( int x, bool clipToMinMax )
{
- int i;
+ if (x < 0)
+ return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;
- for ( i = 0; i < m_numCols; i++ )
+ if (!m_defaultColWidth)
+ m_defaultColWidth = 1;
+
+ int maxPos = x / m_defaultColWidth;
+ int minPos = 0;
+
+ if (m_colRights.IsEmpty())
{
- if ( x < GetColRight(i) )
- return i;
+ if(maxPos < m_numCols)
+ return GetColAt( maxPos );
+ return clipToMinMax ? GetColAt( m_numCols - 1 ) : -1;
}
- return -1;
-}
+ if ( maxPos >= m_numCols)
+ maxPos = m_numCols - 1;
+ else
+ {
+ if ( x >= m_colRights[GetColAt( maxPos )])
+ {
+ minPos = maxPos;
+ if (m_minAcceptableColWidth)
+ maxPos = x / m_minAcceptableColWidth;
+ else
+ maxPos = m_numCols - 1;
+ }
+ if ( maxPos >= m_numCols)
+ maxPos = m_numCols - 1;
+ }
+
+ //X is beyond the last column
+ if ( x >= m_colRights[GetColAt( maxPos )])
+ return clipToMinMax ? GetColAt( maxPos ) : -1;
+ //X is before the first column
+ if ( x < m_colRights[GetColAt( 0 )] )
+ return GetColAt( 0 );
+
+ //Perform a binary search
+ while ( maxPos - minPos > 0 )
+ {
+ wxCHECK_MSG(m_colRights[GetColAt( minPos )] <= x && x < m_colRights[GetColAt( maxPos )],
+ 0, _T("wxGrid: internal error in XToCol"));
+
+ if (x >= m_colRights[GetColAt( maxPos - 1 )])
+ return GetColAt( maxPos );
+ else
+ maxPos--;
+ int median = minPos + (maxPos - minPos + 1) / 2;
+ if (x < m_colRights[GetColAt( median )])
+ maxPos = median;
+ else
+ minPos = median;
+ }
+ return GetColAt( maxPos );
+}
// return the row number that that the y coord is near the edge of, or
// -1 if not near an edge
//
int wxGrid::YToEdgeOfRow( int y )
{
- int i, d;
+ int i;
+ i = internalYToRow(y);
- for ( i = 0; i < m_numRows; i++ )
+ if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
{
- if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
- {
- d = abs( y - GetRowBottom(i) );
- if ( d < WXGRID_LABEL_EDGE_ZONE )
- return i;
- }
+ // We know that we are in row i, test whether we are
+ // close enough to lower or upper border, respectively.
+ if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
+ return i;
+ else if ( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
+ return i - 1;
}
return -1;
}
-
// return the col number that that the x coord is near the edge of, or
// -1 if not near an edge
//
int wxGrid::XToEdgeOfCol( int x )
{
- int i, d;
+ int i;
+ i = internalXToCol(x);
- for ( i = 0; i < m_numCols; i++ )
+ if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
{
- if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
- {
- d = abs( x - GetColRight(i) );
- if ( d < WXGRID_LABEL_EDGE_ZONE )
- return i;
- }
+ // We know that we are in column i; test whether we are
+ // close enough to right or left border, respectively.
+ if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
+ return i;
+ else if ( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
+ return i - 1;
}
return -1;
}
-
wxRect wxGrid::CellToRect( int row, int col )
{
wxRect rect( -1, -1, -1, -1 );
- if ( row >= 0 && row < m_numRows &&
- col >= 0 && col < m_numCols )
+ if ( row >= 0 && row < m_numRows &&
+ col >= 0 && col < m_numCols )
{
+ int i, cell_rows, cell_cols;
+ rect.width = rect.height = 0;
+ GetCellSize( row, col, &cell_rows, &cell_cols );
+ // if negative then find multicell owner
+ if (cell_rows < 0)
+ row += cell_rows;
+ if (cell_cols < 0)
+ col += cell_cols;
+ GetCellSize( row, col, &cell_rows, &cell_cols );
+
rect.x = GetColLeft(col);
rect.y = GetRowTop(row);
- rect.width = GetColWidth(col);
- rect.height = GetRowHeight(row);
+ for (i=col; i < col + cell_cols; i++)
+ rect.width += GetColWidth(i);
+ for (i=row; i < row + cell_rows; i++)
+ rect.height += GetRowHeight(i);
}
// if grid lines are enabled, then the area of the cell is a bit smaller
- if (m_gridLinesEnabled) {
+ if (m_gridLinesEnabled)
+ {
rect.width -= 1;
rect.height -= 1;
}
+
return rect;
}
-
bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
{
// get the cell rectangle in logical coords
CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
// check against the client area of the grid window
- //
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
if ( wholeCellVisible )
{
// is the cell wholly visible ?
- //
- return ( left >= 0 && right <= cw &&
- top >= 0 && bottom <= ch );
+ return ( left >= 0 && right <= cw &&
+ top >= 0 && bottom <= ch );
}
else
{
// is the cell partly visible ?
//
- return ( ((left >=0 && left < cw) || (right > 0 && right <= cw)) &&
- ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) );
+ return ( ((left >= 0 && left < cw) || (right > 0 && right <= cw)) &&
+ ((top >= 0 && top < ch) || (bottom > 0 && bottom <= ch)) );
}
}
-
// make the specified cell location visible by doing a minimal amount
// of scrolling
//
int i;
int xpos = -1, ypos = -1;
- if ( row >= 0 && row < m_numRows &&
- col >= 0 && col < m_numCols )
+ if ( row >= 0 && row < m_numRows &&
+ col >= 0 && col < m_numCols )
{
// get the cell rectangle in logical coords
- //
wxRect r( CellToRect( row, col ) );
// convert to device coords
- //
int left, top, right, bottom;
CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
{
int h = r.GetHeight();
ypos = r.GetTop();
- for ( i = row-1; i >= 0; i-- )
+ for ( i = row - 1; i >= 0; i-- )
{
int rowHeight = GetRowHeight(i);
if ( h + rowHeight > ch )
}
// we divide it later by GRID_SCROLL_LINE, make sure that we don't
- // have rounding errors (this is important, because if we do, we
- // might not scroll at all and some cells won't be redrawn)
- ypos += GRID_SCROLL_LINE / 2;
+ // have rounding errors (this is important, because if we do,
+ // we might not scroll at all and some cells won't be redrawn)
+ //
+ // Sometimes GRID_SCROLL_LINE / 2 is not enough,
+ // so just add a full scroll unit...
+ ypos += m_scrollLineY;
}
- if ( left < 0 )
+ // special handling for wide cells - show always left part of the cell!
+ // Otherwise, e.g. when stepping from row to row, it would jump between
+ // left and right part of the cell on every step!
+// if ( left < 0 )
+ if ( left < 0 || (right - left) >= cw )
{
xpos = r.GetLeft();
}
else if ( right > cw )
{
- int w = r.GetWidth();
- xpos = r.GetLeft();
- for ( i = col-1; i >= 0; i-- )
- {
- int colWidth = GetColWidth(i);
- if ( w + colWidth > cw )
- break;
-
- w += colWidth;
- xpos -= colWidth;
- }
+ // position the view so that the cell is on the right
+ int x0, y0;
+ CalcUnscrolledPosition(0, 0, &x0, &y0);
+ xpos = x0 + (right - cw);
// see comment for ypos above
- xpos += GRID_SCROLL_LINE / 2;
+ xpos += m_scrollLineX;
}
- if ( xpos != -1 || ypos != -1 )
+ if ( xpos != -1 || ypos != -1 )
{
- if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
- if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
+ if ( xpos != -1 )
+ xpos /= m_scrollLineX;
+ if ( ypos != -1 )
+ ypos /= m_scrollLineY;
Scroll( xpos, ypos );
AdjustScrollbars();
}
}
}
-
//
// ------ Grid cursor movement functions
//
bool wxGrid::MoveCursorUp( bool expandSelection )
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
+ if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetRow() >= 0 )
{
- if ( expandSelection)
+ if ( expandSelection )
{
if ( m_selectingKeyboard == wxGridNoCellCoords )
m_selectingKeyboard = m_currentCellCoords;
m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
else if ( m_currentCellCoords.GetRow() > 0 )
{
+ int row = m_currentCellCoords.GetRow() - 1;
+ int col = m_currentCellCoords.GetCol();
ClearSelection();
- MakeCellVisible( m_currentCellCoords.GetRow() - 1,
- m_currentCellCoords.GetCol() );
- SetCurrentCell( m_currentCellCoords.GetRow() - 1,
- m_currentCellCoords.GetCol() );
+ MakeCellVisible( row, col );
+ SetCurrentCell( row, col );
}
else
- return FALSE;
- return TRUE;
+ return false;
+
+ return true;
}
- return FALSE;
+ return false;
}
-
bool wxGrid::MoveCursorDown( bool expandSelection )
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
+ if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetRow() < m_numRows )
{
if ( expandSelection )
{
if ( m_selectingKeyboard == wxGridNoCellCoords )
m_selectingKeyboard = m_currentCellCoords;
- if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
+ if ( m_selectingKeyboard.GetRow() < m_numRows - 1 )
{
m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
{
+ int row = m_currentCellCoords.GetRow() + 1;
+ int col = m_currentCellCoords.GetCol();
ClearSelection();
- MakeCellVisible( m_currentCellCoords.GetRow() + 1,
- m_currentCellCoords.GetCol() );
- SetCurrentCell( m_currentCellCoords.GetRow() + 1,
- m_currentCellCoords.GetCol() );
+ MakeCellVisible( row, col );
+ SetCurrentCell( row, col );
}
else
- return FALSE;
- return TRUE;
+ return false;
+
+ return true;
}
- return FALSE;
+ return false;
}
-
bool wxGrid::MoveCursorLeft( bool expandSelection )
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
+ if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() >= 0 )
{
if ( expandSelection )
m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
- else if ( m_currentCellCoords.GetCol() > 0 )
+ else if ( GetColPos( m_currentCellCoords.GetCol() ) > 0 )
{
+ int row = m_currentCellCoords.GetRow();
+ int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) - 1 );
ClearSelection();
- MakeCellVisible( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() - 1 );
- SetCurrentCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() - 1 );
+
+ MakeCellVisible( row, col );
+ SetCurrentCell( row, col );
}
else
- return FALSE;
- return TRUE;
+ return false;
+
+ return true;
}
- return FALSE;
+ return false;
}
-
bool wxGrid::MoveCursorRight( bool expandSelection )
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
+ if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() < m_numCols )
{
if ( expandSelection )
m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
- else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
+ else if ( GetColPos( m_currentCellCoords.GetCol() ) < m_numCols - 1 )
{
+ int row = m_currentCellCoords.GetRow();
+ int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) + 1 );
ClearSelection();
- MakeCellVisible( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() + 1 );
- SetCurrentCell( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() + 1 );
+
+ MakeCellVisible( row, col );
+ SetCurrentCell( row, col );
}
else
- return FALSE;
- return TRUE;
+ return false;
+
+ return true;
}
- return FALSE;
+ return false;
}
-
bool wxGrid::MovePageUp()
{
- if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ return false;
int row = m_currentCellCoords.GetRow();
if ( row > 0 )
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 )
{
if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
+ m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetRow() > 0 )
{
int row = m_currentCellCoords.GetRow();
//
while ( row > 0 )
{
- row-- ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ row--;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
- else if ( m_table->IsEmptyCell(row-1, col) )
+ else if ( m_table->IsEmptyCell(row - 1, col) )
{
// starting at the top of a block: find the next block
//
row--;
while ( row > 0 )
{
- row-- ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ row--;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
else
//
while ( row > 0 )
{
- row-- ;
+ row--;
if ( m_table->IsEmptyCell(row, col) )
{
- row++ ;
+ row++;
break;
}
}
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
ClearSelection();
SetCurrentCell( row, col );
}
- return TRUE;
+
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorDownBlock( bool expandSelection )
{
if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() < m_numRows-1 )
+ m_currentCellCoords != wxGridNoCellCoords &&
+ m_currentCellCoords.GetRow() < m_numRows - 1 )
{
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
// starting in an empty cell: find the next block of
// non-empty cells
//
- while ( row < m_numRows-1 )
+ while ( row < m_numRows - 1 )
{
- row++ ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ row++;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
- else if ( m_table->IsEmptyCell(row+1, col) )
+ else if ( m_table->IsEmptyCell(row + 1, col) )
{
// starting at the bottom of a block: find the next block
//
row++;
- while ( row < m_numRows-1 )
+ while ( row < m_numRows - 1 )
{
- row++ ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ row++;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
else
{
// starting within a block: find the bottom of the block
//
- while ( row < m_numRows-1 )
+ while ( row < m_numRows - 1 )
{
- row++ ;
+ row++;
if ( m_table->IsEmptyCell(row, col) )
{
- row-- ;
+ row--;
break;
}
}
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
{
if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
+ m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() > 0 )
{
int row = m_currentCellCoords.GetRow();
//
while ( col > 0 )
{
- col-- ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ col--;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
- else if ( m_table->IsEmptyCell(row, col-1) )
+ else if ( m_table->IsEmptyCell(row, col - 1) )
{
// starting at the left of a block: find the next block
//
col--;
while ( col > 0 )
{
- col-- ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ col--;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
else
//
while ( col > 0 )
{
- col-- ;
+ col--;
if ( m_table->IsEmptyCell(row, col) )
{
- col++ ;
+ col++;
break;
}
}
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorRightBlock( bool expandSelection )
{
if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() < m_numCols-1 )
+ m_currentCellCoords != wxGridNoCellCoords &&
+ m_currentCellCoords.GetCol() < m_numCols - 1 )
{
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
// starting in an empty cell: find the next block of
// non-empty cells
//
- while ( col < m_numCols-1 )
+ while ( col < m_numCols - 1 )
{
- col++ ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ col++;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
- else if ( m_table->IsEmptyCell(row, col+1) )
+ else if ( m_table->IsEmptyCell(row, col + 1) )
{
// starting at the right of a block: find the next block
//
col++;
- while ( col < m_numCols-1 )
+ while ( col < m_numCols - 1 )
{
- col++ ;
- if ( !(m_table->IsEmptyCell(row, col)) ) break;
+ col++;
+ if ( !(m_table->IsEmptyCell(row, col)) )
+ break;
}
}
else
{
// starting within a block: find the right of the block
//
- while ( col < m_numCols-1 )
+ while ( col < m_numCols - 1 )
{
- col++ ;
+ col++;
if ( m_table->IsEmptyCell(row, col) )
{
- col-- ;
+ col--;
break;
}
}
if ( expandSelection )
{
m_selectingKeyboard = wxGridCellCoords( row, col );
- SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+ HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
else
{
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-
-
//
// ------ Label values and formatting
//
void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
{
- *horiz = m_rowLabelHorizAlign;
- *vert = m_rowLabelVertAlign;
+ if ( horiz )
+ *horiz = m_rowLabelHorizAlign;
+ if ( vert )
+ *vert = m_rowLabelVertAlign;
}
void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
{
- *horiz = m_colLabelHorizAlign;
- *vert = m_colLabelVertAlign;
+ if ( horiz )
+ *horiz = m_colLabelHorizAlign;
+ if ( vert )
+ *vert = m_colLabelVertAlign;
+}
+
+int wxGrid::GetColLabelTextOrientation()
+{
+ return m_colLabelTextOrientation;
}
wxString wxGrid::GetRowLabelValue( int row )
}
}
-
void wxGrid::SetRowLabelSize( int width )
{
width = wxMax( width, 0 );
{
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();
- Refresh( TRUE );
+ wxScrolledWindow::Refresh( true );
}
}
-
void wxGrid::SetColLabelSize( int height )
{
height = wxMax( height, 0 );
{
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();
- Refresh( TRUE );
+ wxScrolledWindow::Refresh( true );
}
}
-
void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
{
if ( m_labelBackgroundColour != colour )
void wxGrid::SetRowLabelAlignment( int horiz, int vert )
{
- if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+ // allow old (incorrect) defs to be used
+ switch ( horiz )
+ {
+ case wxLEFT: horiz = wxALIGN_LEFT; break;
+ case wxRIGHT: horiz = wxALIGN_RIGHT; break;
+ case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+ }
+
+ switch ( vert )
+ {
+ case wxTOP: vert = wxALIGN_TOP; break;
+ case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+ case wxCENTRE: vert = wxALIGN_CENTRE; break;
+ }
+
+ if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{
m_rowLabelHorizAlign = horiz;
}
- if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+ if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
{
m_rowLabelVertAlign = vert;
}
void wxGrid::SetColLabelAlignment( int horiz, int vert )
{
- if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT )
+ // allow old (incorrect) defs to be used
+ switch ( horiz )
+ {
+ case wxLEFT: horiz = wxALIGN_LEFT; break;
+ case wxRIGHT: horiz = wxALIGN_RIGHT; break;
+ case wxCENTRE: horiz = wxALIGN_CENTRE; break;
+ }
+
+ switch ( vert )
+ {
+ case wxTOP: vert = wxALIGN_TOP; break;
+ case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
+ case wxCENTRE: vert = wxALIGN_CENTRE; break;
+ }
+
+ if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{
m_colLabelHorizAlign = horiz;
}
- if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM )
+ if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
{
m_colLabelVertAlign = vert;
}
}
}
+// 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 )
m_table->SetRowLabelValue( row, s );
if ( !GetBatchCount() )
{
- wxRect rect = CellToRect( row, 0);
+ wxRect rect = CellToRect( row, 0 );
if ( rect.height > 0 )
{
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
- rect.x = m_left;
+ rect.x = 0;
rect.width = m_rowLabelWidth;
- m_rowLabelWin->Refresh( TRUE, &rect );
+ m_rowLabelWin->Refresh( true, &rect );
}
}
}
if ( rect.width > 0 )
{
CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
- rect.y = m_top;
+ rect.y = 0;
rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( TRUE, &rect );
+ m_colLabelWin->Refresh( true, &rect );
}
}
}
}
}
-
void wxGrid::SetCellHighlightColour( const wxColour& colour )
{
if ( m_cellHighlightColour != colour )
}
}
+void wxGrid::SetCellHighlightPenWidth(int width)
+{
+ if (m_cellHighlightPenWidth != width)
+ {
+ m_cellHighlightPenWidth = width;
+
+ // Just redrawing the cell highlight is not enough since that won't
+ // make any visible change if the the thickness is getting smaller.
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ return;
+
+ wxRect rect = CellToRect(row, col);
+ m_gridWin->Refresh(true, &rect);
+ }
+}
+
+void wxGrid::SetCellHighlightROPenWidth(int width)
+{
+ if (m_cellHighlightROPenWidth != width)
+ {
+ m_cellHighlightROPenWidth = width;
+
+ // Just redrawing the cell highlight is not enough since that won't
+ // make any visible change if the the thickness is getting smaller.
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ return;
+
+ wxRect rect = CellToRect(row, col);
+ m_gridWin->Refresh(true, &rect);
+ }
+}
+
void wxGrid::EnableGridLines( bool enable )
{
if ( enable != m_gridLinesEnabled )
}
}
-
int wxGrid::GetDefaultRowSize()
{
return m_defaultRowHeight;
m_defaultCellAttr->SetAlignment(horiz, vert);
}
+void wxGrid::SetDefaultCellOverflow( bool allow )
+{
+ m_defaultCellAttr->SetOverflow(allow);
+}
+
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);
}
// ----------------------------------------------------------------------------
m_defaultCellAttr->GetAlignment(horiz, vert);
}
+bool wxGrid::GetDefaultCellOverflow()
+{
+ return m_defaultCellAttr->GetOverflow();
+}
+
wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
{
return m_defaultCellAttr->GetRenderer(NULL, 0, 0);
wxGridCellEditor *wxGrid::GetDefaultEditor() const
{
- return m_defaultCellAttr->GetEditor(NULL,0,0);
+ return m_defaultCellAttr->GetEditor(NULL, 0, 0);
}
// ----------------------------------------------------------------------------
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetBackgroundColour();
attr->DecRef();
+
return colour;
}
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetTextColour();
attr->DecRef();
+
return colour;
}
wxGridCellAttr *attr = GetCellAttr(row, col);
wxFont font = attr->GetFont();
attr->DecRef();
+
return font;
}
attr->DecRef();
}
-wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+bool wxGrid::GetCellOverflow( int row, int col )
{
- wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+ wxGridCellAttr *attr = GetCellAttr(row, col);
+ bool allow = attr->GetOverflow();
+ attr->DecRef();
+
+ return allow;
+}
+
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+{
+ wxGridCellAttr *attr = GetCellAttr(row, col);
+ attr->GetSize( num_rows, num_cols );
+ attr->DecRef();
+}
+
+wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+{
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
attr->DecRef();
return renderer;
wxGridCellAttr* attr = GetCellAttr(row, col);
bool isReadOnly = attr->IsReadOnly();
attr->DecRef();
+
return isReadOnly;
}
{
if ( !m_table )
{
- return FALSE;
+ return false;
}
return m_table->CanHaveAttributes();
if ( m_attrCache.row != -1 )
{
wxSafeDecRef(m_attrCache.attr);
+ m_attrCache.attr = NULL;
m_attrCache.row = -1;
}
}
void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
{
- wxGrid *self = (wxGrid *)this; // const_cast
+ if ( attr != NULL )
+ {
+ wxGrid *self = (wxGrid *)this; // const_cast
- self->ClearAttrCache();
- self->m_attrCache.row = row;
- self->m_attrCache.col = col;
- self->m_attrCache.attr = attr;
- wxSafeIncRef(attr);
+ self->ClearAttrCache();
+ self->m_attrCache.row = row;
+ self->m_attrCache.col = col;
+ self->m_attrCache.attr = attr;
+ wxSafeIncRef(attr);
+ }
}
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;
}
}
wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
{
- wxGridCellAttr *attr;
- if ( !LookupAttr(row, col, &attr) )
+ wxGridCellAttr *attr = NULL;
+ // Additional test to avoid looking at the cache e.g. for
+ // wxNoCellCoords, as this will confuse memory management.
+ if ( row >= 0 )
{
- attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
- CacheAttr(row, col, attr);
+ if ( !LookupAttr(row, col, &attr) )
+ {
+ attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
+ : (wxGridCellAttr *)NULL;
+ CacheAttr(row, col, attr);
+ }
}
+
if (attr)
{
attr->SetDefAttr(m_defaultCellAttr);
wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
{
- wxGridCellAttr *attr;
- if ( !LookupAttr(row, col, &attr) || !attr )
- {
- wxASSERT_MSG( m_table,
- _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
-
- attr = m_table->GetAttr(row, col);
- if ( !attr )
- {
- attr = new wxGridCellAttr;
+ wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ bool canHave = ((wxGrid*)this)->CanHaveAttributes();
- // artificially inc the ref count to match DecRef() in caller
- attr->IncRef();
+ wxCHECK_MSG( canHave, attr, _T("Cell attributes not allowed"));
+ wxCHECK_MSG( m_table, attr, _T("must have a table") );
- m_table->SetAttr(attr, row, col);
- }
+ attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
+ if ( !attr )
+ {
+ attr = new wxGridCellAttr(m_defaultCellAttr);
- CacheAttr(row, col, attr);
+ // artificially inc the ref count to match DecRef() in caller
+ attr->IncRef();
+ m_table->SetAttr(attr, row, col);
}
- attr->SetDefAttr(m_defaultCellAttr);
+
return attr;
}
void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
{
- wxGridCellAttr *attr = new wxGridCellAttr;
+ wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
+ if (!attr)
+ attr = new wxGridCellAttr;
wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
attr->SetRenderer(renderer);
SetColAttr(col, attr);
+
}
// ----------------------------------------------------------------------------
// setting cell attributes: this is forwarded to the table
// ----------------------------------------------------------------------------
+void wxGrid::SetAttr(int row, int col, wxGridCellAttr *attr)
+{
+ if ( CanHaveAttributes() )
+ {
+ m_table->SetAttr(attr, row, col);
+ ClearAttrCache();
+ }
+ else
+ {
+ wxSafeDecRef(attr);
+ }
+}
+
void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr)
{
if ( CanHaveAttributes() )
{
m_table->SetRowAttr(attr, row);
+ ClearAttrCache();
}
else
{
if ( CanHaveAttributes() )
{
m_table->SetColAttr(attr, col);
+ ClearAttrCache();
}
else
{
}
}
+void wxGrid::SetCellOverflow( int row, int col, bool allow )
+{
+ if ( CanHaveAttributes() )
+ {
+ wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+ attr->SetOverflow(allow);
+ attr->DecRef();
+ }
+}
+
+void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
+{
+ if ( CanHaveAttributes() )
+ {
+ int cell_rows, cell_cols;
+
+ wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+ attr->GetSize(&cell_rows, &cell_cols);
+ attr->SetSize(num_rows, num_cols);
+ attr->DecRef();
+
+ // Cannot set the size of a cell to 0 or negative values
+ // While it is perfectly legal to do that, this function cannot
+ // handle all the possibilies, do it by hand by getting the CellAttr.
+ // You can only set the size of a cell to 1,1 or greater with this fn
+ wxASSERT_MSG( !((cell_rows < 1) || (cell_cols < 1)),
+ wxT("wxGrid::SetCellSize setting cell size that is already part of another cell"));
+ wxASSERT_MSG( !((num_rows < 1) || (num_cols < 1)),
+ wxT("wxGrid::SetCellSize setting cell size to < 1"));
+
+ // if this was already a multicell then "turn off" the other cells first
+ if ((cell_rows > 1) || (cell_rows > 1))
+ {
+ int i, j;
+ for (j=row; j < row + cell_rows; j++)
+ {
+ for (i=col; i < col + cell_cols; i++)
+ {
+ if ((i != col) || (j != row))
+ {
+ wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
+ attr_stub->SetSize( 1, 1 );
+ attr_stub->DecRef();
+ }
+ }
+ }
+ }
+
+ // mark the cells that will be covered by this cell to
+ // negative or zero values to point back at this cell
+ if (((num_rows > 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1))
+ {
+ int i, j;
+ for (j=row; j < row + num_rows; j++)
+ {
+ for (i=col; i < col + num_cols; i++)
+ {
+ if ((i != col) || (j != row))
+ {
+ wxGridCellAttr *attr_stub = GetOrCreateCellAttr(j, i);
+ attr_stub->SetSize( row - j, col - i );
+ attr_stub->DecRef();
+ }
+ }
+ }
+ }
+ }
+}
+
void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
{
if ( CanHaveAttributes() )
}
-wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
+wxGridCellEditor * wxGrid::GetDefaultEditorForCell(int row, int col) const
{
wxString typeName = m_table->GetTypeName(row, col);
return GetDefaultEditorForType(typeName);
}
-wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
+wxGridCellRenderer * wxGrid::GetDefaultRendererForCell(int row, int col) const
{
wxString typeName = m_table->GetTypeName(row, col);
return GetDefaultRendererForType(typeName);
}
-wxGridCellEditor*
-wxGrid::GetDefaultEditorForType(const wxString& typeName) const
+wxGridCellEditor * wxGrid::GetDefaultEditorForType(const wxString& typeName) const
{
int index = m_typeRegistry->FindOrCloneDataType(typeName);
if ( index == wxNOT_FOUND )
{
- wxFAIL_MSG(wxT("Unknown data type name"));
+ wxString errStr;
+
+ errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
+ wxFAIL_MSG(errStr.c_str());
return NULL;
}
return m_typeRegistry->GetEditor(index);
}
-wxGridCellRenderer*
-wxGrid::GetDefaultRendererForType(const wxString& typeName) const
+wxGridCellRenderer * wxGrid::GetDefaultRendererForType(const wxString& typeName) const
{
int index = m_typeRegistry->FindOrCloneDataType(typeName);
if ( index == wxNOT_FOUND )
{
- wxFAIL_MSG(wxT("Unknown data type name"));
+ wxString errStr;
+
+ errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
+ wxFAIL_MSG(errStr.c_str());
return NULL;
}
return m_typeRegistry->GetRenderer(index);
}
-
// ----------------------------------------------------------------------------
// row/col size
// ----------------------------------------------------------------------------
m_canDragRowSize = enable;
}
-
void wxGrid::EnableDragColSize( bool enable )
{
m_canDragColSize = 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 )
{
- InitRowHeights();
-
- CalcDimensions();
+ // since we are resizing all rows to the default row size,
+ // we can simply clear the row heights and row bottoms
+ // arrays (which also allows us to take advantage of
+ // some speed optimisations)
+ m_rowHeights.Empty();
+ m_rowBottoms.Empty();
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
}
{
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
m_rowHeights[row] = h;
int i;
- for ( i = row; i < m_numRows; i++ )
+ for ( i = row; i < m_numRows; i++ )
{
m_rowBottoms[i] += diff;
}
- CalcDimensions();
+
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
{
- m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+ m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
if ( resizeExistingCols )
{
- InitColWidths();
-
- CalcDimensions();
+ // since we are resizing all columns to the default column size,
+ // we can simply clear the col widths and col rights
+ // arrays (which also allows us to take advantage of
+ // some speed optimisations)
+ m_colWidths.Empty();
+ m_colRights.Empty();
+ if ( !GetBatchCount() )
+ CalcDimensions();
}
}
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 we should test against the weaker
+ // constraint of minimalAcceptableWidth, as this breaks rendering
+ //
+ // This test then fixes sf.net bug #645734
+
+ if ( width < GetColMinimalAcceptableWidth() )
+ return;
if ( m_colWidths.IsEmpty() )
{
InitColWidths();
}
+ // if < 0 then calculate new width from label
+ if ( width < 0 )
+ {
+ long w, h;
+ wxArrayString lines;
+ wxClientDC dc(m_colLabelWin);
+ dc.SetFont(GetLabelFont());
+ StringToLines(GetColLabelValue(col), lines);
+ GetTextBoxSize(dc, lines, &w, &h);
+ width = w + 6;
+ }
+
int w = wxMax( 0, width );
int diff = w - m_colWidths[col];
m_colWidths[col] = w;
int i;
- for ( i = col; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = GetColPos( col ); colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
m_colRights[i] += diff;
}
- CalcDimensions();
-}
+ if ( !GetBatchCount() )
+ CalcDimensions();
+}
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 hiding columns.
+ if ( width >= 0 )
+ m_minAcceptableColWidth = width;
+}
+
+void wxGrid::SetRowMinimalAcceptableHeight( int height )
+{
+ // We do allow a height of 0 since this gives us
+ // an easy way to temporarily hiding rows.
+ if ( height >= 0 )
+ m_minAcceptableRowHeight = height;
+}
+
+int wxGrid::GetColMinimalAcceptableWidth() const
+{
+ return m_minAcceptableColWidth;
+}
+
+int wxGrid::GetRowMinimalAcceptableHeight() const
+{
+ return m_minAcceptableRowHeight;
}
// ----------------------------------------------------------------------------
{
wxClientDC dc(m_gridWin);
- // init both of them to avoid compiler warnings, even if weo nly need one
+ // cancel editing of cell
+ HideCellEditControl();
+ SaveEditControlValue();
+
+ // init both of them to avoid compiler warnings, even if we only need one
int row = -1,
col = -1;
if ( column )
else
col = rowOrCol;
- wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+ wxGridCellAttr *attr = GetCellAttr(row, col);
+ wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
if ( renderer )
{
wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
extent = column ? size.x : size.y;
if ( extent > extentMax )
- {
extentMax = extent;
- }
renderer->DecRef();
}
dc.SetFont( GetLabelFont() );
if ( column )
+ {
dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+ if ( GetColLabelTextOrientation() == wxVERTICAL )
+ w = h;
+ }
else
- dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
+ dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
extent = column ? w : h;
if ( extent > extentMax )
- {
extentMax = extent;
- }
if ( !extentMax )
{
// empty column - give default extent (notice that if extentMax is less
- // than default extent but != 0, it's ok)
+ // than default extent but != 0, it's OK)
extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
}
else
{
if ( column )
- {
// leave some space around text
extentMax += 10;
- }
else
- {
extentMax += 6;
- }
}
if ( column )
- SetColSize(col, extentMax);
+ {
+ SetColSize( col, extentMax );
+ if ( !GetBatchCount() )
+ {
+ int cw, ch, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ wxRect rect ( CellToRect( 0, col ) );
+ rect.y = 0;
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+ rect.width = cw - rect.x;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( true, &rect );
+ }
+ }
else
+ {
SetRowSize(row, extentMax);
+ if ( !GetBatchCount() )
+ {
+ int cw, ch, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ wxRect rect( CellToRect( row, 0 ) );
+ rect.x = 0;
+ CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+ rect.width = m_rowLabelWidth;
+ rect.height = ch - rect.y;
+ m_rowLabelWin->Refresh( true, &rect );
+ }
+ }
if ( setAsMin )
{
{
int width = m_rowLabelWidth;
+ if ( !calcOnly )
+ BeginBatch();
+
for ( int col = 0; col < m_numCols; col++ )
{
if ( !calcOnly )
- {
AutoSizeColumn(col, setAsMin);
- }
width += GetColWidth(col);
}
+ if ( !calcOnly )
+ EndBatch();
+
return width;
}
{
int height = m_colLabelHeight;
+ if ( !calcOnly )
+ BeginBatch();
+
for ( int row = 0; row < m_numRows; row++ )
{
if ( !calcOnly )
- {
AutoSizeRow(row, setAsMin);
- }
height += GetRowHeight(row);
}
+ if ( !calcOnly )
+ EndBatch();
+
return height;
}
void wxGrid::AutoSize()
{
- // set the size too
- SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+ BeginBatch();
+
+ 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) * m_scrollLineX,
+ GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY );
+
+ // distribute the extra space between the columns/rows to avoid having
+ // extra white space
+
+ // Remove the extra m_extraWidth + 1 added above
+ wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+ if ( diff && m_numCols )
+ {
+ // try to resize the columns uniformly
+ wxCoord diffPerCol = diff / m_numCols;
+ if ( diffPerCol )
+ {
+ for ( int col = 0; col < m_numCols; col++ )
+ {
+ SetColSize(col, GetColWidth(col) + diffPerCol);
+ }
+ }
+
+ // add remaining amount to the last columns
+ diff -= diffPerCol * m_numCols;
+ if ( diff )
+ {
+ for ( int col = m_numCols - 1; col >= m_numCols - diff; col-- )
+ {
+ SetColSize(col, GetColWidth(col) + 1);
+ }
+ }
+ }
+
+ // same for rows
+ diff = sizeFit.y - size.y - (m_extraHeight + 1);
+ if ( diff && m_numRows )
+ {
+ // try to resize the columns uniformly
+ wxCoord diffPerRow = diff / m_numRows;
+ if ( diffPerRow )
+ {
+ for ( int row = 0; row < m_numRows; row++ )
+ {
+ SetRowSize(row, GetRowHeight(row) + diffPerRow);
+ }
+ }
+
+ // add remaining amount to the last rows
+ diff -= diffPerRow * m_numRows;
+ if ( diff )
+ {
+ for ( int row = m_numRows - 1; row >= m_numRows - diff; row-- )
+ {
+ SetRowSize(row, GetRowHeight(row) + 1);
+ }
+ }
+ }
+
+ EndBatch();
+
+ SetClientSize(sizeFit);
+}
+
+void wxGrid::AutoSizeRowLabelSize( int row )
+{
+ wxArrayString lines;
+ long w, h;
+
+ // Hide the edit control, so it
+ // won't interfere 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 interfere 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
- return wxSize(self->SetOrCalcColumnSizes(TRUE),
- self->SetOrCalcRowSizes(TRUE));
+ int width, height;
+ width = self->SetOrCalcColumnSizes(true);
+ height = self->SetOrCalcRowSizes(true);
+
+ if (!width)
+ width = 100;
+ if (!height)
+ height = 80;
+
+ // Round up to a multiple the scroll rate
+ // NOTE: this still doesn't get rid of the scrollbars;
+ // is there any magic incantation for that?
+ int xpu, ypu;
+ GetScrollPixelsPerUnit(&xpu, &ypu);
+ if (xpu)
+ width += 1 + xpu - (width % xpu);
+ if (ypu)
+ height += 1 + ypu - (height % ypu);
+
+ // limit to 1/4 of the screen size
+ int maxwidth, maxheight;
+ wxDisplaySize( &maxwidth, &maxheight );
+ maxwidth /= 2;
+ maxheight /= 2;
+ if ( width > maxwidth )
+ width = maxwidth;
+ if ( height > maxheight )
+ height = maxheight;
+
+ wxSize best(width, height);
+
+ // 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()
AutoSize();
}
-
wxPen& wxGrid::GetDividerPen() const
{
return wxNullPen;
m_table->SetValue( row, col, s );
if ( !GetBatchCount() )
{
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- DrawCell( dc, wxGridCellCoords(row, col) );
+ int dummy;
+ wxRect rect( CellToRect( row, col ) );
+ rect.x = 0;
+ rect.width = m_gridWin->GetClientSize().GetWidth();
+ CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
+ m_gridWin->Refresh( false, &rect );
}
if ( m_currentCellCoords.GetRow() == row &&
}
}
-
-//
-// ------ Block, row and col selection
-//
+// ----------------------------------------------------------------------------
+// block, row and column selection
+// ----------------------------------------------------------------------------
void wxGrid::SelectRow( int row, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
ClearSelection();
- m_selection->SelectRow( row, FALSE, addToSelected );
+ if ( m_selection )
+ m_selection->SelectRow( row, false, addToSelected );
}
-
void wxGrid::SelectCol( int col, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
ClearSelection();
- m_selection->SelectCol( col, FALSE, addToSelected );
+ if ( m_selection )
+ m_selection->SelectCol( col, false, addToSelected );
}
-
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+ bool addToSelected )
{
- int temp;
- wxGridCellCoords updateTopLeft, updateBottomRight;
+ if ( IsSelection() && !addToSelected )
+ ClearSelection();
- if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
- {
- leftCol = 0;
- rightCol = GetNumberCols() - 1;
- }
- else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
- {
- topRow = 0;
- bottomRow = GetNumberRows() - 1;
- }
- if ( topRow > bottomRow )
- {
- temp = topRow;
- topRow = bottomRow;
- bottomRow = temp;
- }
+ if ( m_selection )
+ m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+ false, addToSelected );
+}
- if ( leftCol > rightCol )
+void wxGrid::SelectAll()
+{
+ if ( m_numRows > 0 && m_numCols > 0 )
{
- temp = leftCol;
- leftCol = rightCol;
- rightCol = temp;
+ if ( m_selection )
+ m_selection->SelectBlock( 0, 0, m_numRows - 1, m_numCols - 1 );
}
+}
- updateTopLeft = wxGridCellCoords( topRow, leftCol );
- updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
-
- if ( m_selectingTopLeft != updateTopLeft ||
- m_selectingBottomRight != updateBottomRight )
- {
- // Compute two optimal update rectangles:
- // Either one rectangle is a real subset of the
- // other, or they are (almost) disjoint!
- wxRect rect[4];
- bool need_refresh[4];
- need_refresh[0] =
- need_refresh[1] =
- need_refresh[2] =
- need_refresh[3] = FALSE;
- int i;
+// ----------------------------------------------------------------------------
+// cell, row and col deselection
+// ----------------------------------------------------------------------------
- // Store intermediate values
- wxCoord oldLeft = m_selectingTopLeft.GetCol();
- wxCoord oldTop = m_selectingTopLeft.GetRow();
- wxCoord oldRight = m_selectingBottomRight.GetCol();
- wxCoord oldBottom = m_selectingBottomRight.GetRow();
+void wxGrid::DeselectRow( int row )
+{
+ if ( !m_selection )
+ return;
- // Determine the outer/inner coordinates.
- if (oldLeft > leftCol)
- {
- temp = oldLeft;
- oldLeft = leftCol;
- leftCol = temp;
- }
- if (oldTop > topRow )
- {
- temp = oldTop;
- oldTop = topRow;
- topRow = temp;
- }
- if (oldRight < rightCol )
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+ {
+ if ( m_selection->IsInSelection(row, 0 ) )
+ m_selection->ToggleCellSelection(row, 0);
+ }
+ else
+ {
+ int nCols = GetNumberCols();
+ for ( int i = 0; i < nCols; i++ )
{
- temp = oldRight;
- oldRight = rightCol;
- rightCol = temp;
- }
- if (oldBottom < bottomRow)
- {
- temp = oldBottom;
- oldBottom = bottomRow;
- bottomRow = temp;
+ if ( m_selection->IsInSelection(row, i ) )
+ m_selection->ToggleCellSelection(row, i);
}
+ }
+}
- // Now, either the stuff marked old is the outer
- // rectangle or we don't have a situation where one
- // is contained in the other.
+void wxGrid::DeselectCol( int col )
+{
+ if ( !m_selection )
+ return;
- if ( oldLeft < leftCol )
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+ {
+ if ( m_selection->IsInSelection(0, col ) )
+ m_selection->ToggleCellSelection(0, col);
+ }
+ else
+ {
+ int nRows = GetNumberRows();
+ for ( int i = 0; i < nRows; i++ )
{
- need_refresh[0] = TRUE;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- oldLeft ),
- wxGridCellCoords ( oldBottom,
- leftCol - 1 ) );
+ if ( m_selection->IsInSelection(i, col ) )
+ m_selection->ToggleCellSelection(i, col);
}
+ }
+}
- if ( oldTop < topRow )
- {
- need_refresh[1] = TRUE;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- leftCol ),
- wxGridCellCoords ( topRow - 1,
- rightCol ) );
- }
+void wxGrid::DeselectCell( int row, int col )
+{
+ if ( m_selection && m_selection->IsInSelection(row, col) )
+ m_selection->ToggleCellSelection(row, col);
+}
- if ( oldRight > rightCol )
- {
- need_refresh[2] = TRUE;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- rightCol + 1 ),
- wxGridCellCoords ( oldBottom,
- oldRight ) );
- }
+bool wxGrid::IsSelection()
+{
+ return ( m_selection && (m_selection->IsSelection() ||
+ ( m_selectingTopLeft != wxGridNoCellCoords &&
+ m_selectingBottomRight != wxGridNoCellCoords) ) );
+}
- if ( oldBottom > bottomRow )
- {
- need_refresh[3] = TRUE;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
- leftCol ),
- wxGridCellCoords ( oldBottom,
- rightCol ) );
- }
+bool wxGrid::IsInSelection( int row, int col ) const
+{
+ return ( m_selection && (m_selection->IsInSelection( row, col ) ||
+ ( row >= m_selectingTopLeft.GetRow() &&
+ col >= m_selectingTopLeft.GetCol() &&
+ row <= m_selectingBottomRight.GetRow() &&
+ col <= m_selectingBottomRight.GetCol() )) );
+}
+wxGridCellCoordsArray wxGrid::GetSelectedCells() const
+{
+ if (!m_selection)
+ {
+ wxGridCellCoordsArray a;
+ return a;
+ }
- // Change Selection
- m_selectingTopLeft = updateTopLeft;
- m_selectingBottomRight = updateBottomRight;
+ return m_selection->m_cellSelection;
+}
- // various Refresh() calls
- for (i = 0; i < 4; i++ )
- if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
+wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
+{
+ if (!m_selection)
+ {
+ wxGridCellCoordsArray a;
+ return a;
}
- // never generate an event as it will be generated from
- // wxGridSelection::SelectBlock!
+ return m_selection->m_blockSelectionTopLeft;
}
-void wxGrid::SelectAll()
+wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
{
- m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+ if (!m_selection)
+ {
+ wxGridCellCoordsArray a;
+ return a;
+ }
+
+ return m_selection->m_blockSelectionBottomRight;
}
-bool wxGrid::IsSelection()
+wxArrayInt wxGrid::GetSelectedRows() const
{
- return ( m_selection->IsSelection() ||
- ( m_selectingTopLeft != wxGridNoCellCoords &&
- m_selectingBottomRight != wxGridNoCellCoords ) );
+ if (!m_selection)
+ {
+ wxArrayInt a;
+ return a;
+ }
+
+ return m_selection->m_rowSelection;
}
-bool wxGrid::IsInSelection( int row, int col )
+wxArrayInt wxGrid::GetSelectedCols() const
{
- return ( m_selection->IsInSelection( row, col ) ||
- ( row >= m_selectingTopLeft.GetRow() &&
- col >= m_selectingTopLeft.GetCol() &&
- row <= m_selectingBottomRight.GetRow() &&
- col <= m_selectingBottomRight.GetCol() ) );
+ if (!m_selection)
+ {
+ wxArrayInt a;
+ return a;
+ }
+
+ return m_selection->m_colSelection;
}
void wxGrid::ClearSelection()
{
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
- m_selection->ClearSelection();
+ if ( m_selection )
+ m_selection->ClearSelection();
}
-
// This function returns the rectangle that encloses the given block
// in device coords clipped to the client size of the grid window.
//
}
else
{
- rect = wxRect( 0, 0, 0, 0 );
+ rect = wxRect(0, 0, 0, 0);
}
cellRect = CellToRect( bottomRight );
return wxGridNoCellRect;
}
+ int i, j;
+ int left = rect.GetLeft();
+ int top = rect.GetTop();
+ int right = rect.GetRight();
+ int bottom = rect.GetBottom();
+
+ int leftCol = topLeft.GetCol();
+ int topRow = topLeft.GetRow();
+ int rightCol = bottomRight.GetCol();
+ int bottomRow = bottomRight.GetRow();
+
+ if (left > right)
+ {
+ i = left;
+ left = right;
+ right = i;
+ i = leftCol;
+ leftCol = rightCol;
+ rightCol = i;
+ }
+
+ if (top > bottom)
+ {
+ i = top;
+ top = bottom;
+ bottom = i;
+ i = topRow;
+ topRow = bottomRow;
+ bottomRow = i;
+ }
+
+ for ( j = topRow; j <= bottomRow; j++ )
+ {
+ for ( i = leftCol; i <= rightCol; i++ )
+ {
+ if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol))
+ {
+ cellRect = CellToRect( j, i );
+
+ if (cellRect.x < left)
+ left = cellRect.x;
+ if (cellRect.y < top)
+ top = cellRect.y;
+ if (cellRect.x + cellRect.width > right)
+ right = cellRect.x + cellRect.width;
+ if (cellRect.y + cellRect.height > bottom)
+ bottom = cellRect.y + cellRect.height;
+ }
+ else
+ {
+ i = rightCol; // jump over inner cells.
+ }
+ }
+ }
+
// convert to scrolled coords
//
- int left, top, right, bottom;
- CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
- CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
+ CalcScrolledPosition( left, top, &left, &top );
+ CalcScrolledPosition( right, bottom, &right, &bottom );
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
if (right < 0 || bottom < 0 || left > cw || top > ch)
- return wxRect( 0, 0, 0, 0);
+ return wxRect(0,0,0,0);
rect.SetLeft( wxMax(0, left) );
rect.SetTop( wxMax(0, top) );
return rect;
}
+// ----------------------------------------------------------------------------
+// grid event classes
+// ----------------------------------------------------------------------------
-
-//
-// ------ Grid event classes
-//
-
-IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
int row, int col, int x, int y, bool sel,
}
-IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent )
wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
int rowOrCol, int x, int y,
}
-IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent )
wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
const wxGridCellCoords& topLeft,
bool shift, bool alt, bool meta )
: wxNotifyEvent( type, id )
{
- m_topLeft = topLeft;
+ m_topLeft = topLeft;
m_bottomRight = bottomRight;
- m_selecting = sel;
- m_control = control;
- m_shift = shift;
- m_alt = alt;
- m_meta = meta;
+ m_selecting = sel;
+ m_control = control;
+ m_shift = shift;
+ m_alt = alt;
+ m_meta = meta;
SetEventObject(obj);
}
-#endif // ifndef wxUSE_NEW_GRID
+IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent)
+
+wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
+ wxObject* obj, int row,
+ int col, wxControl* ctrl)
+ : wxCommandEvent(type, id)
+{
+ SetEventObject(obj);
+ m_row = row;
+ m_col = col;
+ m_ctrl = ctrl;
+}
+
+#endif // wxUSE_GRID
projects / wxWidgets.git / blobdiff