///////////////////////////////////////////////////////////////////////////
-// Name: generic/grid.cpp
+// Name: src/generic/grid.cpp
// Purpose: wxGrid and related classes
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
-// Modified by: Robin Dunn, Vadim Zeitlin
+// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
// Created: 1/08/1999
// RCS-ID: $Id$
// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #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 wxUSE_GRID
+#include "wx/grid.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dcclient.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"
+const wxChar wxGridNameStr[] = wxT("grid");
+
#if defined(__WXMOTIF__)
#define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)
#else
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)
// private classes
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
+// common base class for various grid subwindows
+class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow
+{
+public:
+ wxGridSubwindow() { m_owner = NULL; }
+ wxGridSubwindow(wxGrid *owner,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ int additionalStyle = 0,
+ const wxString& name = wxPanelNameStr)
+ : wxWindow(owner, id, pos, size,
+ wxWANTS_CHARS | wxBORDER_NONE | additionalStyle,
+ name)
+ {
+ m_owner = owner;
+ }
+
+ wxGrid *GetOwner() { return m_owner; }
+
+protected:
+ void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
+
+ wxGrid *m_owner;
+
+ DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridSubwindow)
+};
+
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow
{
public:
- wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
+ wxGridRowLabelWindow() { }
wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size );
private:
- wxGrid *m_owner;
-
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
};
-class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow
{
public:
- wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
+ wxGridColLabelWindow() { }
wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size );
private:
- wxGrid *m_owner;
-
- void OnPaint( wxPaintEvent &event );
+ void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
};
-class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow
{
public:
- wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
+ wxGridCornerLabelWindow() { }
wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size );
private:
- wxGrid *m_owner;
-
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
};
-class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow
{
public:
wxGridWindow()
{
- m_owner = (wxGrid *)NULL;
- m_rowLabelWin = (wxGridRowLabelWindow *)NULL;
- m_colLabelWin = (wxGridColLabelWindow *)NULL;
+ m_rowLabelWin = NULL;
+ m_colLabelWin = NULL;
}
wxGridWindow( wxGrid *parent,
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size );
- ~wxGridWindow(){}
void ScrollWindow( int dx, int dy, const wxRect *rect );
- wxGrid* GetOwner() { return m_owner; }
-
private:
- wxGrid *m_owner;
wxGridRowLabelWindow *m_rowLabelWin;
wxGridColLabelWindow *m_colLabelWin;
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
void OnEraseBackground( wxEraseEvent& );
void OnFocus( wxFocusEvent& );
};
-
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
// ----------------------------------------------------------------------------
{
public:
// empty ctor to suppress warnings
- wxGridRowOrColAttrData() { }
+ wxGridRowOrColAttrData() {}
~wxGridRowOrColAttrData();
void SetAttr(wxGridCellAttr *attr, int rowOrCol);
wxGridCellRenderer* renderer,
wxGridCellEditor* editor)
: m_typeName(typeName), m_renderer(renderer), m_editor(editor)
- { }
+ {}
~wxGridDataTypeInfo()
{
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: this doesn't work at all, grid cells have different sizes and approx
m_attr = NULL;
}
-
wxGridCellEditor::~wxGridCellEditor()
{
Destroy();
{
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
+// 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
+// Workaround for GTK+1 font setting problem on some platforms
#if !defined(__WXGTK__) || defined(__WXGTK20__)
if ( m_fontOld.Ok() )
{
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.ControlDown() || event.AltDown());
+ bool ctrl = event.ControlDown();
+ bool alt = event.AltDown();
+
+#ifdef __WXMAC__
+ // On the Mac the Alt key is more like shift and is used for entry of
+ // valid characters, so check for Ctrl and Meta instead.
+ alt = event.MetaDown();
+#endif
+
+ // Assume it's not a valid char if ctrl or alt is down, but if both are
+ // down then it may be because of an AltGr key combination, so let them
+ // through in that case.
+ if ((ctrl || alt) && !(ctrl && alt))
+ return false;
+
+ 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)
wxWindowID id,
wxEvtHandler* evtHandler)
{
- m_control = new wxTextCtrl(parent, id, wxEmptyString,
- wxDefaultPosition, wxDefaultSize
+ DoCreate(parent, id, evtHandler);
+}
+
+void wxGridCellTextEditor::DoCreate(wxWindow* parent,
+ wxWindowID id,
+ wxEvtHandler* evtHandler,
+ long style)
+{
#if defined(__WXMSW__)
- , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL
+ style |= wxTE_PROCESS_ENTER |
+ wxTE_PROCESS_TAB |
+ wxTE_AUTO_SCROLL |
+ wxNO_BORDER;
#endif
- );
+
+ m_control = new wxTextCtrl(parent, id, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize,
+ style);
// set max length allowed in the textctrl, if the parameter was set
- if (m_maxChars != 0)
+ if ( m_maxChars != 0 )
{
- ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars);
+ Text()->SetMaxLength(m_maxChars);
}
wxGridCellEditor::Create(parent, id, evtHandler);
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;
+#elif defined(__WXMSW__)
+ if ( rect.x == 0 )
+ rect.x += 2;
+ else
+ rect.x += 3;
-// MB: treat MSW separately here otherwise the caret doesn't show
-// when the editor is in the first row.
-#if defined(__WXMSW__)
- int extra_y = 2;
+ if ( rect.y == 0 )
+ rect.y += 2;
+ else
+ rect.y += 3;
+
+ rect.width -= 2;
+ rect.height -= 2;
#else
- int extra_y = ( rect.y > 2 )? 2 : 1;
-#endif // MSW
+ int extra_x = ( rect.x > 2 ) ? 2 : 1;
+ int extra_y = ( rect.y > 2 ) ? 2 : 1;
+
+ #if defined(__WXMOTIF__)
+ extra_x *= 2;
+ extra_y *= 2;
+ #endif
-#if defined(__WXMOTIF__)
- extra_x *= 2;
- extra_y *= 2;
-#endif
rect.SetLeft( wxMax(0, rect.x - extra_x) );
rect.SetTop( wxMax(0, rect.y - extra_y) );
- rect.SetRight( rect.GetRight() + 2*extra_x );
- rect.SetBottom( rect.GetBottom() + 2*extra_y );
-#endif // GTK/!GTK
+ rect.SetRight( rect.GetRight() + 2 * extra_x );
+ rect.SetBottom( rect.GetBottom() + 2 * extra_y );
+#endif
wxGridCellEditor::SetSize(rect);
}
void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
m_startValue = grid->GetTable()->GetValue(row, col);
{
Text()->SetValue(startValue);
Text()->SetInsertionPointEnd();
- Text()->SetSelection(-1,-1);
+ Text()->SetSelection(-1, -1);
Text()->SetFocus();
}
-bool wxGridCellTextEditor::EndEdit(int row, int col,
- wxGrid* grid)
+bool wxGridCellTextEditor::EndEdit(int row, int col, wxGrid* grid)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
bool changed = false;
wxString value = Text()->GetValue();
grid->GetTable()->SetValue(row, col, value);
m_startValue = wxEmptyString;
+
// No point in setting the text of the hidden control
//Text()->SetValue(m_startValue);
return changed;
}
-
void wxGridCellTextEditor::Reset()
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
DoReset(m_startValue);
}
bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
{
- if ( wxGridCellEditor::IsAcceptedKey(event) )
- {
- int keycode = event.GetKeyCode();
- switch ( keycode )
- {
- case WXK_NUMPAD0:
- case WXK_NUMPAD1:
- case WXK_NUMPAD2:
- case WXK_NUMPAD3:
- case WXK_NUMPAD4:
- case WXK_NUMPAD5:
- case WXK_NUMPAD6:
- case WXK_NUMPAD7:
- case WXK_NUMPAD8:
- case WXK_NUMPAD9:
- case WXK_MULTIPLY:
- case WXK_NUMPAD_MULTIPLY:
- case WXK_ADD:
- case WXK_NUMPAD_ADD:
- case WXK_SUBTRACT:
- case WXK_NUMPAD_SUBTRACT:
- case WXK_DECIMAL:
- case WXK_NUMPAD_DECIMAL:
- case WXK_DIVIDE:
- case WXK_NUMPAD_DIVIDE:
- return true;
-
- default:
- // accept 8 bit chars too if isprint() agrees
- if ( (keycode < 255) && (wxIsprint((wxChar)keycode)) )
- return true;
- }
- }
-
- return false;
+ return wxGridCellEditor::IsAcceptedKey(event);
}
void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
{
- if ( !Text()->EmulateKeyPress(event) )
+ // Since this is now happening in the EVT_CHAR event EmulateKeyPress is no
+ // longer an appropriate way to get the character into the text control.
+ // Do it ourselves instead. We know that if we get this far that we have
+ // a valid character, so not a whole lot of testing needs to be done.
+
+ wxTextCtrl* tc = Text();
+ wxChar ch;
+ long pos;
+
+#if wxUSE_UNICODE
+ ch = event.GetUnicodeKey();
+ if (ch <= 127)
+ ch = (wxChar)event.GetKeyCode();
+#else
+ ch = (wxChar)event.GetKeyCode();
+#endif
+
+ switch (ch)
{
- event.Skip();
+ case WXK_DELETE:
+ // delete the character at the cursor
+ pos = tc->GetInsertionPoint();
+ if (pos < tc->GetLastPosition())
+ tc->Remove(pos, pos + 1);
+ break;
+
+ case WXK_BACK:
+ // delete the character before the cursor
+ pos = tc->GetInsertionPoint();
+ if (pos > 0)
+ tc->Remove(pos - 1, pos);
+ break;
+
+ default:
+ tc->WriteText(ch);
+ break;
}
}
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();
+ return Text()->GetValue();
}
// ----------------------------------------------------------------------------
wxWindowID id,
wxEvtHandler* evtHandler)
{
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
// create a spin ctrl
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
}
}
}
}
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
Spin()->SetValue((int)m_valueOld);
Spin()->SetFocus();
}
else
+#endif
{
DoBeginEdit(GetString());
}
long value = 0;
wxString text;
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
value = Spin()->GetValue();
text = wxString::Format(wxT("%ld"), value);
}
else
+#endif
{
text = Text()->GetValue();
changed = (text.empty() || text.ToLong(&value)) && (value != m_valueOld);
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) && wxIsdigit((wxChar)keycode) )
- return true;
+ return true;
}
}
void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
{
+ int keycode = event.GetKeyCode();
if ( !HasRange() )
{
- int keycode = event.GetKeyCode();
- if ( wxIsdigit((wxChar)keycode) || keycode == '+' || keycode == '-'
- || keycode == WXK_NUMPAD0
- || keycode == WXK_NUMPAD1
- || keycode == WXK_NUMPAD2
- || keycode == WXK_NUMPAD3
- || keycode == WXK_NUMPAD4
- || keycode == WXK_NUMPAD5
- || keycode == WXK_NUMPAD6
- || keycode == WXK_NUMPAD7
- || keycode == WXK_NUMPAD8
- || keycode == WXK_NUMPAD9
- || keycode == WXK_ADD
- || keycode == WXK_NUMPAD_ADD
- || keycode == WXK_SUBTRACT
- || keycode == WXK_NUMPAD_SUBTRACT)
+ if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-')
{
wxGridCellTextEditor::StartingKey(event);
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;
+ wxString s;
- if( HasRange() )
- {
- long value = Spin()->GetValue();
- s.Printf(wxT("%ld"), value);
- }
- else
- {
- s = Text()->GetValue();
- }
- return s;
+#if wxUSE_SPINCTRL
+ if ( HasRange() )
+ {
+ long value = Spin()->GetValue();
+ s.Printf(wxT("%ld"), value);
+ }
+ else
+#endif
+ {
+ s = Text()->GetValue();
+ }
+
+ return s;
}
// ----------------------------------------------------------------------------
#if wxUSE_VALIDATORS
Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-#endif // wxUSE_VALIDATORS
+#endif
}
void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
double value = 0.0;
wxString text(Text()->GetValue());
- if ( (text.empty() || text.ToDouble(&value)) && (value != m_valueOld) )
+ if ( (text.empty() || text.ToDouble(&value)) &&
+ !wxIsSameDouble(value, m_valueOld) )
{
if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
grid->GetTable()->SetValueAsDouble(row, col, value);
return true;
}
+
return false;
}
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) );
- if ( wxIsdigit((wxChar)keycode) || keycode == '+' || keycode == '-'
- || is_decimal_point
- || keycode == WXK_NUMPAD0
- || keycode == WXK_NUMPAD1
- || keycode == WXK_NUMPAD2
- || keycode == WXK_NUMPAD3
- || keycode == WXK_NUMPAD4
- || keycode == WXK_NUMPAD5
- || keycode == WXK_NUMPAD6
- || keycode == WXK_NUMPAD7
- || keycode == WXK_NUMPAD8
- || keycode == WXK_NUMPAD9
- || keycode == WXK_ADD
- || keycode == WXK_NUMPAD_ADD
- || keycode == WXK_SUBTRACT
- || keycode == WXK_NUMPAD_SUBTRACT)
+ 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 )
- {
- // default width/precision
- fmt = _T("%f");
- }
- else if ( m_precision == -1 )
+ if ( m_precision == -1 && m_width != -1)
{
// default precision
fmt.Printf(_T("%%%d.f"), m_width);
}
- else
+ else if ( m_precision != -1 && m_width == -1)
+ {
+ // default width
+ fmt.Printf(_T("%%.%df"), m_precision);
+ }
+ else if ( m_precision != -1 && m_width != -1 )
{
fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
}
+ else
+ {
+ // default width/precision
+ fmt = _T("%f");
+ }
return wxString::Format(fmt, m_valueOld);
}
{
if ( wxGridCellEditor::IsAcceptedKey(event) )
{
- int keycode = event.GetKeyCode();
- switch ( keycode )
+ const int keycode = event.GetKeyCode();
+ if ( isascii(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;
+ char tmpbuf[2];
+ tmpbuf[0] = (char) keycode;
+ tmpbuf[1] = '\0';
+ wxString strbuf(tmpbuf, *wxConvCurrent);
- default:
+#if wxUSE_INTL
+ const wxString decimalPoint =
+ wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
+#else
+ const wxString decimalPoint(_T('.'));
+#endif
+
+ // accept digits, 'e' as in '1e+6', also '-', '+', and '.'
+ if ( wxIsdigit(keycode) ||
+ tolower(keycode) == 'e' ||
+ keycode == decimalPoint ||
+ keycode == '+' ||
+ keycode == '-' )
{
- // additionally accept 'e' as in '1e+6', also '-', '+', and '.'
- char tmpbuf[2];
- tmpbuf[0] = (char) keycode;
- tmpbuf[1] = '\0';
- wxString strbuf(tmpbuf, *wxConvCurrent);
- bool is_decimal_point =
- ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
- wxLOCALE_CAT_NUMBER) );
- if ( (keycode < 128) &&
- (wxIsdigit((wxChar)keycode) || tolower(keycode) == 'e' ||
- is_decimal_point || keycode == '+' || keycode == '-') )
- return true;
+ return true;
}
}
}
// wxGridCellBoolEditor
// ----------------------------------------------------------------------------
+// the default values for GetValue()
+wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") };
+
void wxGridCellBoolEditor::Create(wxWindow* parent,
wxWindowID id,
wxEvtHandler* evtHandler)
if (hAlign == wxALIGN_LEFT)
{
x = r.x + 2;
+
#ifdef __WXMSW__
x += 2;
#endif
- y = r.y + r.height/2 - size.y/2;
+
+ y = r.y + r.height / 2 - size.y / 2;
}
else if (hAlign == wxALIGN_RIGHT)
{
x = r.x + r.width - size.x - 2;
- y = r.y + r.height/2 - size.y/2;
+ y = r.y + r.height / 2 - size.y / 2;
}
else if (hAlign == wxALIGN_CENTRE)
{
- x = r.x + r.width/2 - size.x/2;
- y = r.y + r.height/2 - size.y/2;
+ x = r.x + r.width / 2 - size.x / 2;
+ y = r.y + r.height / 2 - size.y / 2;
}
m_control->Move(x, y);
void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
{
wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxT("The wxGridCellEditor must be created first!"));
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
+ {
m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+ }
else
{
wxString cellval( grid->GetTable()->GetValue(row, col) );
- m_startValue = !( !cellval || (cellval == wxT("0")) );
+
+ if ( cellval == ms_stringValues[false] )
+ m_startValue = false;
+ else if ( cellval == ms_stringValues[true] )
+ m_startValue = true;
+ else
+ {
+ // do not try to be smart here and convert it to true or false
+ // because we'll still overwrite it with something different and
+ // this risks to be very surprising for the user code, let them
+ // know about it
+ wxFAIL_MSG( _T("invalid value for a cell with bool editor!") );
+ }
}
+
CBox()->SetValue(m_startValue);
CBox()->SetFocus();
}
wxGrid* grid)
{
wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ wxT("The wxGridCellEditor must be created first!"));
bool changed = false;
bool value = CBox()->GetValue();
if ( changed )
{
- if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
- grid->GetTable()->SetValueAsBool(row, col, value);
+ wxGridTableBase * const table = grid->GetTable();
+ if ( table->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+ table->SetValueAsBool(row, col, value);
else
- grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString);
+ table->SetValue(row, col, GetValue());
}
return changed;
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 false;
}
-// return the value as "1" for true and the empty string for 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;
+ }
+}
+
wxString wxGridCellBoolEditor::GetValue() const
{
- bool bSet = CBox()->GetValue();
- return bSet ? _T("1") : wxEmptyString;
+ return ms_stringValues[CBox()->GetValue()];
+}
+
+/* static */ void
+wxGridCellBoolEditor::UseStringValues(const wxString& valueTrue,
+ const wxString& valueFalse)
+{
+ ms_stringValues[false] = valueFalse;
+ ms_stringValues[true] = valueTrue;
+}
+
+/* static */ bool
+wxGridCellBoolEditor::IsTrueValue(const wxString& value)
+{
+ return value == ms_stringValues[true];
}
#endif // wxUSE_CHECKBOX
// 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);
if (m_allowOthers)
+ {
Combo()->SetValue(m_startValue);
- else
+ Combo()->SetInsertionPointEnd();
+ }
+ else // the combobox is read-only
{
// find the right position, or default to the first if not found
int pos = Combo()->FindString(m_startValue);
- if (pos == -1)
+ if (pos == wxNOT_FOUND)
pos = 0;
Combo()->SetSelection(pos);
}
- Combo()->SetInsertionPointEnd();
+
Combo()->SetFocus();
+
+ if (evtHandler)
+ {
+ // When dropping down the menu, a kill focus event
+ // happens after this point, so we can't reset the flag yet.
+#if !defined(__WXGTK20__)
+ evtHandler->SetInSetFocus(false);
+#endif
+ }
}
bool wxGridCellChoiceEditor::EndEdit(int row, int col,
// wxGridCellEditorEvtHandler
// ----------------------------------------------------------------------------
+void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
+{
+ // Don't disable the cell if we're just starting to edit it
+ if (m_inSetFocus)
+ return;
+
+ // accept changes
+ m_grid->DisableCellEditControl();
+
+ event.Skip();
+}
+
void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
{
switch ( event.GetKeyCode() )
m_editor->HandleReturn(event);
break;
-
default:
event.Skip();
+ break;
}
}
void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
{
+ int row = m_grid->GetGridCursorRow();
+ int col = m_grid->GetGridCursorCol();
+ wxRect rect = m_grid->CellToRect( row, col );
+ int cw, ch;
+ m_grid->GetGridWindow()->GetClientSize( &cw, &ch );
+
+ // if cell width is smaller than grid client area, cell is wholly visible
+ bool wholeCellVisible = (rect.GetWidth() < cw);
+
switch ( event.GetKeyCode() )
{
case WXK_ESCAPE:
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 );
// grey out fields if the grid is disabled
- if( grid.IsEnabled() )
+ if ( grid.IsEnabled() )
{
- if ( isSelected )
- {
- dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
- }
- else
- {
- dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
- }
+ if ( isSelected )
+ {
+ dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ }
+ else
+ {
+ dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ }
}
else
{
- dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
+ dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
}
dc.SetPen( *wxTRANSPARENT_PEN );
// 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?
// different coloured text when the grid is disabled
- if( grid.IsEnabled() )
- {
- if ( isSelected )
- {
- dc.SetTextBackground( grid.GetSelectionBackground() );
- dc.SetTextForeground( grid.GetSelectionForeground() );
- }
- else
- {
- dc.SetTextBackground( attr.GetBackgroundColour() );
- dc.SetTextForeground( attr.GetTextColour() );
- }
+ if ( grid.IsEnabled() )
+ {
+ if ( isSelected )
+ {
+ dc.SetTextBackground( grid.GetSelectionBackground() );
+ dc.SetTextForeground( grid.GetSelectionForeground() );
+ }
+ else
+ {
+ dc.SetTextBackground( attr.GetBackgroundColour() );
+ dc.SetTextForeground( attr.GetTextColour() );
+ }
}
else
{
- dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
- dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT));
+ dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+ dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
}
dc.SetFont( attr.GetFont() );
}
-wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr,
+wxSize wxGridCellStringRenderer::DoGetBestSize(const wxGridCellAttr& attr,
wxDC& dc,
const wxString& text)
{
int cols = grid.GetNumberCols();
int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth();
int cell_rows, cell_cols;
- attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <=0
+ attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <= 0
if ((best_width > rectCell.width) && (col < cols) && grid.GetTable())
{
int i, c_cols, c_rows;
for (i = col+cell_cols; i < cols; i++)
{
bool is_empty = true;
- for (int j=row; j<row+cell_rows; j++)
+ 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))
+ 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;
+
+ if (rect.width >= best_width)
+ break;
}
+
overflowCols = i - col - cell_cols + 1;
- if (overflowCols >= cols) overflowCols = cols - 1;
+ if (overflowCols >= cols)
+ overflowCols = cols - 1;
}
if (overflowCols > 0) // redraw overflow cells w/ proper hilight
wxRect clip = rect;
clip.x += rectCell.width;
// draw each overflow cell individually
- int col_end = col+cell_cols+overflowCols;
+ int col_end = col + cell_cols + overflowCols;
if (col_end >= grid.GetNumberCols())
col_end = grid.GetNumberCols() - 1;
- for (int i = col+cell_cols; i <= col_end; i++)
+ for (int i = col + cell_cols; i <= col_end; i++)
{
clip.width = grid.GetColSize(i) - 1;
dc.DestroyClippingRegion();
// 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;
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();
else
{
wxString tmp = params.BeforeFirst(_T(','));
- if ( !!tmp )
+ if ( !tmp.empty() )
{
long width;
if ( tmp.ToLong(&width) )
{
wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
}
-
}
- tmp = params.AfterFirst(_T(','));
- if ( !!tmp )
- {
- long precision;
+
+ tmp = params.AfterFirst(_T(','));
+ if ( !tmp.empty() )
+ {
+ long precision;
if ( tmp.ToLong(&precision) )
- {
+ {
SetPrecision((int)precision);
- }
- else
- {
+ }
+ else
+ {
wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
- }
-
+ }
}
}
}
-
// ----------------------------------------------------------------------------
// wxGridCellBoolRenderer
// ----------------------------------------------------------------------------
// get checkbox size
wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString);
wxSize size = checkbox->GetBestSize();
- wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
+ wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
// FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
#if defined(__WXGTK__) || defined(__WXMOTIF__)
// draw a border around checkmark
int vAlign, hAlign;
- attr.GetAlignment(& hAlign, &vAlign);
+ attr.GetAlignment(&hAlign, &vAlign);
wxRect rectBorder;
if (hAlign == wxALIGN_CENTRE)
{
- rectBorder.x = rect.x + rect.width/2 - size.x/2;
- rectBorder.y = rect.y + rect.height/2 - size.y/2;
+ rectBorder.x = rect.x + rect.width / 2 - size.x / 2;
+ rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
rectBorder.width = size.x;
rectBorder.height = size.y;
}
else if (hAlign == wxALIGN_LEFT)
{
rectBorder.x = rect.x + 2;
- rectBorder.y = rect.y + rect.height/2 - size.y/2;
+ rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
rectBorder.width = size.x;
rectBorder.height = size.y;
}
else if (hAlign == wxALIGN_RIGHT)
{
rectBorder.x = rect.x + rect.width - size.x - 2;
- rectBorder.y = rect.y + rect.height/2 - size.y/2;
+ rectBorder.y = rect.y + rect.height / 2 - size.y / 2;
rectBorder.width = size.x;
rectBorder.height = size.y;
}
bool value;
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
+ {
value = grid.GetTable()->GetValueAsBool(row, col);
+ }
else
{
wxString cellval( grid.GetTable()->GetValue(row, col) );
- value = !( !cellval || (cellval == wxT("0")) );
+ value = wxGridCellBoolEditor::IsTrueValue(cellval);
}
if ( value )
{
wxRect rectMark = rectBorder;
+
#ifdef __WXMSW__
// MSW DrawCheckMark() is weird (and should probably be changed...)
- rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+ rectMark.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);
if ( IsReadOnly() )
attr->SetReadOnly();
+ attr->SetOverflow( m_overflow == Overflow );
attr->SetKind( m_attrkind );
return attr;
SetBackgroundColour(mergefrom->GetBackgroundColour());
if ( !HasFont() && mergefrom->HasFont() )
SetFont(mergefrom->GetFont());
- if ( !HasAlignment() && mergefrom->HasAlignment() ){
+ if ( !HasAlignment() && mergefrom->HasAlignment() )
+ {
int hAlign, vAlign;
mergefrom->GetAlignment( &hAlign, &vAlign);
SetAlignment(hAlign, vAlign);
}
-
- mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
+ if ( !HasSize() && mergefrom->HasSize() )
+ mergefrom->GetSize( &m_sizeRows, &m_sizeCols );
// Directly access member functions as GetRender/Editor don't just return
// m_renderer/m_editor
m_editor = mergefrom->m_editor;
m_editor->IncRef();
}
- if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
+ if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
SetReadOnly(mergefrom->IsReadOnly());
- if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
+ if (!HasOverflowMode() && mergefrom->HasOverflowMode() )
SetOverflow(mergefrom->GetOverflow());
SetDefAttr(mergefrom->m_defGridAttr);
// Size of 0,0 is NOT valid, neither is <=0 and any positive value
- wxASSERT_MSG( (!((num_rows>0)&&(num_cols<=0)) ||
- !((num_rows<=0)&&(num_cols>0)) ||
- !((num_rows==0)&&(num_cols==0))),
+ wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) ||
+ !((num_rows <= 0) && (num_cols > 0)) ||
+ !((num_rows == 0) && (num_cols == 0))),
wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
m_sizeRows = num_rows;
}
}
-
const wxColour& wxGridCellAttr::GetBackgroundColour() const
{
if (HasBackgroundColour())
+ {
return m_colBack;
+ }
else if (m_defGridAttr && m_defGridAttr != this)
+ {
return m_defGridAttr->GetBackgroundColour();
+ }
else
{
wxFAIL_MSG(wxT("Missing default cell attribute"));
}
}
-
const wxFont& wxGridCellAttr::GetFont() const
{
if (HasFont())
+ {
return m_font;
+ }
else if (m_defGridAttr && m_defGridAttr != this)
+ {
return m_defGridAttr->GetFont();
+ }
else
{
wxFAIL_MSG(wxT("Missing default cell attribute"));
}
}
-
void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
{
if (HasAlignment())
{
- if ( hAlign ) *hAlign = m_hAlign;
- if ( vAlign ) *vAlign = m_vAlign;
+ if ( hAlign )
+ *hAlign = m_hAlign;
+ if ( vAlign )
+ *vAlign = m_vAlign;
}
else if (m_defGridAttr && m_defGridAttr != this)
+ {
m_defGridAttr->GetAlignment(hAlign, vAlign);
+ }
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;
+ if ( num_rows )
+ *num_rows = m_sizeRows;
+ if ( num_cols )
+ *num_cols = m_sizeCols;
}
// GetRenderer and GetEditor use a slightly different decision path about
// used, otherwise the default editor or renderer is fetched from the grid and
// used. It should be the default for the data type of the cell. If it is
// NULL (because the table has a type that the grid does not have in its
-// registry,) then the grid's default editor or renderer is used.
+// registry), then the grid's default editor or renderer is used.
-wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(const wxGrid* grid, int row, int col) const
{
- wxGridCellRenderer *renderer;
+ wxGridCellRenderer *renderer = NULL;
if ( m_renderer && this != m_defGridAttr )
{
renderer = m_renderer;
renderer->IncRef();
}
- else // no non default cell renderer
+ else // no non-default cell renderer
{
// get default renderer for the data type
if ( grid )
// GetDefaultRendererForCell() will do IncRef() for us
renderer = grid->GetDefaultRendererForCell(row, col);
}
- else
- {
- renderer = NULL;
- }
- if ( !renderer )
+ if ( renderer == NULL )
{
- if (m_defGridAttr && this != m_defGridAttr )
+ if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
{
// if we still don't have one then use the grid default
// (no need for IncRef() here neither)
}
// same as above, except for s/renderer/editor/g
-wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
+wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const
{
- wxGridCellEditor *editor;
+ wxGridCellEditor *editor = NULL;
if ( m_editor && this != m_defGridAttr )
{
// GetDefaultEditorForCell() will do IncRef() for us
editor = grid->GetDefaultEditorForCell(row, col);
}
- else
- {
- editor = NULL;
- }
- if ( !editor )
+ if ( editor == NULL )
{
- if ( m_defGridAttr && this != m_defGridAttr )
+ if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
{
// if we still don't have one then use the grid default
// (no need for IncRef() here neither)
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--;
}
}
}
wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
{
- size_t count = m_attrs.Count();
+ size_t count = m_attrs.GetCount();
for ( size_t n = 0; n < count; n++ )
{
m_attrs[n]->DecRef();
int i = m_rowsOrCols.Index(rowOrCol);
if ( i == wxNOT_FOUND )
{
- // add the attribute
- m_rowsOrCols.Add(rowOrCol);
- m_attrs.Add(attr);
+ if ( attr )
+ {
+ // add the attribute
+ m_rowsOrCols.Add(rowOrCol);
+ m_attrs.Add(attr);
+ }
+ // nothing to remove
}
else
{
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--;
}
}
}
wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
if ( m_data )
{
- switch(kind)
+ switch (kind)
{
case (wxGridCellAttr::Any):
- //Get cached merge attributes.
- // Currenlty not used as no cache implemented as not mutiable
+ // Get cached merge attributes.
+ // Currently not used as no cache implemented as not mutable
// attr = m_data->m_mergeAttr.GetAttr(row, col);
- if(!attr)
+ if (!attr)
{
- //Basicaly implement old version.
- //Also check merge cache, so we don't have to re-merge every time..
+ // Basically implement old version.
+ // Also check merge cache, so we don't have to re-merge every time..
wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col);
wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
- if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){
+ if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol))
+ {
// Two or more are non NULL
attr = new wxGridCellAttr;
attr->SetKind(wxGridCellAttr::Merged);
- //Order important..
- if(attrcell){
+ // Order is important..
+ if (attrcell)
+ {
attr->MergeWith(attrcell);
attrcell->DecRef();
}
- if(attrcol){
+ if (attrcol)
+ {
attr->MergeWith(attrcol);
attrcol->DecRef();
}
- if(attrrow){
+ if (attrrow)
+ {
attr->MergeWith(attrrow);
attrrow->DecRef();
}
- //store merge attr if cache implemented
+
+ // store merge attr if cache implemented
//attr->IncRef();
//m_data->m_mergeAttr.SetAttr(attr, row, col);
}
else
{
// one or none is non null return it or null.
- if(attrrow) attr = attrrow;
- if(attrcol)
+ if (attrrow)
+ attr = attrrow;
+ if (attrcol)
{
- if(attr)
+ if (attr)
attr->DecRef();
attr = attrcol;
}
- if(attrcell)
+ if (attrcell)
{
- if(attr)
+ if (attr)
attr->DecRef();
attr = attrcell;
}
}
}
- break;
+ break;
+
case (wxGridCellAttr::Cell):
attr = m_data->m_cellAttrs.GetAttr(row, col);
- break;
+ break;
+
case (wxGridCellAttr::Col):
attr = m_data->m_colAttrs.GetAttr(col);
- break;
+ break;
+
case (wxGridCellAttr::Row):
attr = m_data->m_rowAttrs.GetAttr(row);
- break;
+ break;
+
default:
// unused as yet...
// (wxGridCellAttr::Default):
// (wxGridCellAttr::Merged):
- break;
+ break;
}
}
+
return attr;
}
wxGridTypeRegistry::~wxGridTypeRegistry()
{
- size_t count = m_typeinfo.Count();
+ size_t count = m_typeinfo.GetCount();
for ( size_t i = 0; i < count; i++ )
delete m_typeinfo[i];
}
-
void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
wxGridCellRenderer* renderer,
wxGridCellEditor* editor)
RegisterDataType(wxGRID_VALUE_STRING,
new wxGridCellStringRenderer,
new wxGridCellTextEditor);
- } else
+ }
+ else
#endif // wxUSE_TEXTCTRL
#if wxUSE_CHECKBOX
if ( typeName == wxGRID_VALUE_BOOL )
RegisterDataType(wxGRID_VALUE_BOOL,
new wxGridCellBoolRenderer,
new wxGridCellBoolEditor);
- } else
+ }
+ else
#endif // wxUSE_CHECKBOX
#if wxUSE_TEXTCTRL
if ( typeName == wxGRID_VALUE_NUMBER )
RegisterDataType(wxGRID_VALUE_FLOAT,
new wxGridCellFloatRenderer,
new wxGridCellFloatEditor);
- } else
+ }
+ else
#endif // wxUSE_TEXTCTRL
#if wxUSE_COMBOBOX
if ( typeName == wxGRID_VALUE_CHOICE )
RegisterDataType(wxGRID_VALUE_CHOICE,
new wxGridCellStringRenderer,
new wxGridCellChoiceEditor);
- } else
+ }
+ else
#endif // wxUSE_COMBOBOX
{
return wxNOT_FOUND;
wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
if (renderer)
renderer->IncRef();
+
return renderer;
}
wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
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 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 += (wxChar) (_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;
{
}
-
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
{
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 curNumRows = m_data.GetCount();
sa.Alloc( curNumCols );
sa.Add( wxEmptyString, curNumCols );
m_data.Insert( sa, pos, numRows );
+
if ( GetView() )
{
wxGridTableMessage msg( this,
bool wxGridStringTable::AppendRows( size_t numRows )
{
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
- ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+ size_t curNumCols = ( curNumRows > 0
+ ? m_data[0].GetCount()
+ : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
wxArrayString sa;
if ( curNumCols > 0 )
{
m_data.RemoveAt( pos, numRows );
}
+
if ( GetView() )
{
wxGridTableMessage msg( this,
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,
size_t row;
size_t curNumRows = m_data.GetCount();
+
#if 0
if ( !curNumRows )
{
}
#endif
- for ( row = 0; row < curNumRows; row++ )
+ for ( row = 0; row < curNumRows; row++ )
{
m_data[row].Add( wxEmptyString, numCols );
}
return false;
}
- if ( numCols > curNumCols - pos )
+ int colID;
+ if ( GetView() )
+ colID = GetView()->GetColAt( pos );
+ else
+ colID = pos;
+
+ if ( numCols > curNumCols - colID )
+ {
+ numCols = curNumCols - colID;
+ }
+
+ if ( !m_colLabels.IsEmpty() )
{
- numCols = curNumCols - pos;
+ // m_colLabels stores just as many elements as it needs, e.g. if only
+ // the label of the first column had been set it would have only one
+ // element and not numCols, so account for it
+ int nToRm = m_colLabels.size() - colID;
+ if ( nToRm > 0 )
+ m_colLabels.RemoveAt( colID, nToRm );
}
- for ( row = 0; row < curNumRows; row++ )
+ for ( row = 0; row < curNumRows; row++ )
{
if ( numCols >= curNumCols )
{
}
else
{
- m_data[row].RemoveAt( pos, numCols );
+ m_data[row].RemoveAt( colID, numCols );
}
}
+
if ( GetView() )
{
wxGridTableMessage msg( this,
}
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(wxGridSubwindow, wxWindow)
+ EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
+END_EVENT_TABLE()
+
+void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+ m_owner->CancelMouseCapture();
+}
+
IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
- EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel)
+ EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
+ EVT_CHAR( wxGridRowLabelWindow::OnChar )
END_EVENT_TABLE()
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+ : wxGridSubwindow(parent, id, pos, size)
{
m_owner = parent;
}
int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
- dc.SetDeviceOrigin( 0, -y );
+ wxPoint pt = dc.GetDeviceOrigin();
+ dc.SetDeviceOrigin( pt.x, pt.y-y );
wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() );
- m_owner->DrawRowLabels( dc , rows );
+ m_owner->DrawRowLabels( dc, rows );
}
-
void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
{
m_owner->ProcessRowLabelMouseEvent( event );
}
-
void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
{
- m_owner->GetEventHandler()->ProcessEvent(event);
+ m_owner->GetEventHandler()->ProcessEvent( event );
}
-
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->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();
+}
//////////////////////////////////////////////////////////////////////
IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
EVT_PAINT( wxGridColLabelWindow::OnPaint )
- EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel)
+ EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
+ EVT_CHAR( wxGridColLabelWindow::OnChar )
END_EVENT_TABLE()
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+ : wxGridSubwindow(parent, id, pos, size)
{
m_owner = parent;
}
int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
- dc.SetDeviceOrigin( -x, 0 );
+ wxPoint pt = dc.GetDeviceOrigin();
+ if (GetLayoutDirection() == wxLayout_RightToLeft)
+ dc.SetDeviceOrigin( pt.x+x, pt.y );
+ else
+ dc.SetDeviceOrigin( pt.x-x, pt.y );
wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
- m_owner->DrawColLabels( dc , cols );
+ m_owner->DrawColLabels( dc, cols );
}
-
void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
{
m_owner->ProcessColLabelMouseEvent( event );
void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
{
- m_owner->GetEventHandler()->ProcessEvent(event);
+ m_owner->GetEventHandler()->ProcessEvent( event );
}
-
// This seems to be required for wxMotif otherwise the mouse
// cursor must be in the cell edit control to get key events
//
void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
-
+void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
//////////////////////////////////////////////////////////////////////
IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
- EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel)
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
+ EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
- EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
+ EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
+ EVT_CHAR( wxGridCornerLabelWindow::OnChar )
END_EVENT_TABLE()
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )
+ : wxGridSubwindow(parent, id, pos, size)
{
m_owner = parent;
}
int client_width = 0;
GetClientSize( &client_width, &client_height );
- dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
- dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
- dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
+ // VZ: any reason for this ifdef? (FIXME)
+#if 0
+def __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 );
+ 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);
//
void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->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, wxWindow )
-BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
EVT_PAINT( wxGridWindow::OnPaint )
- EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
+ EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
EVT_KEY_UP( wxGridWindow::OnKeyUp )
+ EVT_CHAR( wxGridWindow::OnChar )
EVT_SET_FOCUS( wxGridWindow::OnFocus )
EVT_KILL_FOCUS( wxGridWindow::OnFocus )
EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
wxWindowID id,
const wxPoint &pos,
const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE,
- wxT("grid window") )
-
+ : wxGridSubwindow(parent, id, pos, size,
+ wxCLIP_CHILDREN, wxT("grid window") )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
m_colLabelWin = colLblWin;
}
-
void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
wxPaintDC dc( this );
m_owner->PrepareDC( dc );
wxRegion reg = GetUpdateRegion();
- wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg );
- m_owner->DrawGridCellArea( dc , DirtyCells);
+ wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
+ m_owner->DrawGridCellArea( dc, dirtyCells );
+
#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
+
m_owner->DrawGridSpace( dc );
- m_owner->DrawHighlight( dc , DirtyCells );
+ m_owner->DrawHighlight( dc, dirtyCells );
}
-
void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
{
wxWindow::ScrollWindow( dx, 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);
+ m_owner->GetEventHandler()->ProcessEvent( event );
}
// This seems to be required for wxMotif/wxGTK otherwise the mouse
//
void wxGridWindow::OnKeyDown( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridWindow::OnKeyUp( wxKeyEvent& event )
{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
+}
+
+void wxGridWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ event.Skip();
}
void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
const wxArrayInt& BorderArray, int nMax,
bool clipToMinMax);
-#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
- m_minAcceptableColWidth, \
- m_colRights, m_numCols, true)
+#define internalXToCol(x) XToCol(x, true)
#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
m_minAcceptableRowHeight, \
m_rowBottoms, m_numRows, true)
+
/////////////////////////////////////////////////////////////////////
#if wxUSE_EXTENDED_RTTI
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
wxFLAGS_MEMBER(wxWANTS_CHARS)
wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB)
wxFLAGS_MEMBER(wxVSCROLL)
wxFLAGS_MEMBER(wxHSCROLL)
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 (\81Ã la NotebookPageInfo)
+ TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo)
*/
#else
IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
EVT_SIZE( wxGrid::OnSize )
EVT_KEY_DOWN( wxGrid::OnKeyDown )
EVT_KEY_UP( wxGrid::OnKeyUp )
+ EVT_CHAR ( wxGrid::OnChar )
EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
END_EVENT_TABLE()
{
// 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 ;
+ m_cornerLabelWin = NULL;
+ m_rowLabelWin = NULL;
+ m_colLabelWin = NULL;
+ m_gridWin = NULL;
}
wxGrid::wxGrid( wxWindow *parent,
m_rowMinHeights(GRID_HASH_SIZE)
{
Create();
- SetBestFittingSize(size);
+ SetInitialSize(size);
}
bool wxGrid::Create(wxWindow *parent, wxWindowID id,
long style, const wxString& name)
{
if (!wxScrolledWindow::Create(parent, id, pos, size,
- style | wxWANTS_CHARS , name))
+ style | wxWANTS_CHARS, name))
return false;
- m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
- m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+ m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE);
+ m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE);
- Create() ;
- SetBestFittingSize(size);
+ Create();
+ SetInitialSize(size);
+ CalcDimensions();
return true;
}
-
wxGrid::~wxGrid()
{
// Must do this or ~wxScrollHelper will pop the wrong event handler
total ? (gs_nAttrCacheHits*100) / total : 0);
#endif
- if (m_ownTable)
+ // if we own the table, just delete it, otherwise at least don't leave it
+ // with dangling view pointer
+ if ( m_ownTable )
delete m_table;
+ else if ( m_table && m_table->GetView() == this )
+ m_table->SetView(NULL);
delete m_typeRegistry;
delete m_selection;
}
-
//
// ----- internal init and update functions
//
// be removed as well as the #else cases below.
#define _USE_VISATTR 0
-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-
void wxGrid::Create()
{
- m_created = false; // set to true by CreateGrid
+ // 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_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
- // create the type registry
- m_typeRegistry = new wxGridTypeRegistry;
- m_selection = NULL;
-
// subwindow components that make up the wxGrid
- m_cornerLabelWin = new wxGridCornerLabelWindow( this,
- wxID_ANY,
- wxDefaultPosition,
- wxDefaultSize );
-
m_rowLabelWin = new wxGridRowLabelWindow( this,
wxID_ANY,
wxDefaultPosition,
wxDefaultPosition,
wxDefaultSize );
+ m_cornerLabelWin = new wxGridCornerLabelWindow( this,
+ wxID_ANY,
+ wxDefaultPosition,
+ wxDefaultSize );
+
m_gridWin = new wxGridWindow( this,
m_rowLabelWin,
m_colLabelWin,
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);
Init();
}
-
bool wxGrid::CreateGrid( int numRows, int numCols,
wxGrid::wxGridSelectionModes selmode )
{
bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
wxGrid::wxGridSelectionModes selmode )
{
+ bool checkSelection = false;
if ( m_created )
{
// stop all processing
m_created = false;
- if (m_ownTable)
+ if (m_table)
{
- wxGridTableBase *t=m_table;
- m_table=0;
- delete t;
+ m_table->SetView(0);
+ if( m_ownTable )
+ delete m_table;
+ m_table = NULL;
}
+
delete m_selection;
+ m_selection = NULL;
- m_table=0;
- m_selection=0;
- m_numRows=0;
- m_numCols=0;
+ m_ownTable = false;
+ m_numRows = 0;
+ m_numCols = 0;
+ checkSelection = true;
+
+ // kill row and column size arrays
+ m_colWidths.Empty();
+ m_colRights.Empty();
+ m_rowHeights.Empty();
+ m_rowBottoms.Empty();
}
+
if (table)
{
m_numRows = table->GetNumberRows();
m_table = table;
m_table->SetView( this );
- if (takeOwnership)
- m_ownTable = true;
+ m_ownTable = takeOwnership;
m_selection = new wxGridSelection( this, selmode );
-
+ if (checkSelection)
+ {
+ // If the newly set table is smaller than the
+ // original one current cell and selection regions
+ // might be invalid,
+ m_selectingKeyboard = wxGridNoCellCoords;
+ m_currentCellCoords =
+ wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
+ wxMin(m_numCols, m_currentCellCoords.GetCol()));
+ if (m_selectingTopLeft.GetRow() >= m_numRows ||
+ m_selectingTopLeft.GetCol() >= m_numCols)
+ {
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ }
+ else
+ m_selectingBottomRight =
+ wxGridCellCoords(wxMin(m_numRows,
+ m_selectingBottomRight.GetRow()),
+ wxMin(m_numCols,
+ m_selectingBottomRight.GetCol()));
+ }
CalcDimensions();
m_created = true;
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_cellHighlightPenWidth = 2;
m_cellHighlightROPenWidth = 1;
+ m_canDragColMove = false;
+
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_winCapture = (wxWindow *)NULL;
m_canDragRowSize = true;
m_currentCellCoords = wxGridNoCellCoords;
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
+ ClearSelection();
+
m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
// default widths/heights are used for all rows/columns, we may not use these
// arrays at all
//
-// with some extra code, it should be possible to only store the
-// widths/heights different from default ones but this will be done later...
+// with some extra code, it should be possible to only store the widths/heights
+// different from default ones (resulting in space savings for huge grids) but
+// this is not done currently
// ----------------------------------------------------------------------------
void wxGrid::InitRowHeights()
m_rowHeights.Alloc( m_numRows );
m_rowBottoms.Alloc( m_numRows );
- int rowBottom = 0;
-
m_rowHeights.Add( m_defaultRowHeight, m_numRows );
- for ( int i = 0; i < m_numRows; i++ )
+ int rowBottom = 0;
+ for ( int i = 0; i < m_numRows; i++ )
{
rowBottom += m_defaultRowHeight;
m_rowBottoms.Add( rowBottom );
m_colWidths.Alloc( m_numCols );
m_colRights.Alloc( m_numCols );
- int colRight = 0;
m_colWidths.Add( m_defaultColWidth, m_numCols );
- for ( int i = 0; i < m_numCols; i++ )
+ int colRight = 0;
+ for ( int i = 0; i < m_numCols; i++ )
{
- colRight += m_defaultColWidth;
+ colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
m_colRights.Add( colRight );
}
}
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];
}
void wxGrid::CalcDimensions()
{
- int cw, ch;
- GetClientSize( &cw, &ch );
-
- if ( m_rowLabelWin->IsShown() )
- cw -= m_rowLabelWidth;
- if ( m_colLabelWin->IsShown() )
- ch -= m_colLabelHeight;
+ // compute the size of the scrollable area
+ int w = m_numCols > 0 ? GetColRight(GetColAt(m_numCols - 1)) : 0;
+ int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0;
- // grid total size
- int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
- int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
+ w += m_extraWidth;
+ h += m_extraHeight;
// take into account editor if shown
- if( IsCellEditControlShown() )
- {
- int w2, h2;
- int r = m_currentCellCoords.GetRow();
- int c = m_currentCellCoords.GetCol();
- int x = GetColLeft(c);
- int y = GetRowTop(r);
-
- // how big is the editor
- wxGridCellAttr* attr = GetCellAttr(r, c);
- wxGridCellEditor* editor = attr->GetEditor(this, r, c);
- editor->GetControl()->GetSize(&w2, &h2);
- w2 += x;
- h2 += y;
- if( w2 > w ) w = w2;
- if( h2 > h ) h = h2;
- editor->DecRef();
- attr->DecRef();
+ 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
y = wxMax( h - 1, 0 );
// do set scrollbar parameters
- SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
- GetScrollX(w), GetScrollY(h), x, y,
+ 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
CalcWindowSizes();
}
-
void wxGrid::CalcWindowSizes()
{
// escape if the window is has not been fully created yet
- if ( m_cornerLabelWin == NULL )
- return ;
+ if ( m_cornerLabelWin == NULL )
+ return;
+
+ int cw, ch;
+ GetClientSize( &cw, &ch );
+
+ // this block of code tries to work around the following problem: the grid
+ // could have been just resized to have enough space to show the full grid
+ // window contents without the scrollbars, but its client size could be
+ // not big enough because the grid has the scrollbars right now and so the
+ // scrollbars would remain even though we don't need them any more
+ //
+ // to prevent this from happening, check if we have enough space for
+ // everything without the scrollbars and explicitly disable them then
+ wxSize size = GetSize() - GetWindowBorderSize();
+ if ( size != wxSize(cw, ch) )
+ {
+ // check if we have enough space for grid window after accounting for
+ // the fixed size elements
+ size.x -= m_rowLabelWidth;
+ size.y -= m_colLabelHeight;
+
+ const wxSize vsize = m_gridWin->GetVirtualSize();
- int cw, ch;
- GetClientSize( &cw, &ch );
+ if ( size.x >= vsize.x && size.y >= vsize.y )
+ {
+ // yes, we do, so remove the scrollbars and use the new client size
+ // (which should be the same as full window size - borders now)
+ SetScrollbars(0, 0, 0, 0);
+ GetClientSize(&cw, &ch);
+ }
+ }
if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
- if ( m_colLabelWin && m_colLabelWin->IsShown() )
- m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
+ if ( m_colLabelWin && m_colLabelWin->IsShown() )
+ m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw - m_rowLabelWidth, m_colLabelHeight );
if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
- m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
+ m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch - m_colLabelHeight );
if ( m_gridWin && m_gridWin->IsShown() )
- m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
+ m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, 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 )
{
// Clear the attribute cache as the attribute might refer to a different
// cell than stored in the cache after adding/removing rows/columns.
ClearAttrCache();
+
// By the same reasoning, the editor should be dismissed if columns are
// added or removed. And for consistency, it should IMHO always be
// removed, not only if the cell "underneath" it actually changes.
// For now, I intentionally do not save the editor's content as the
// cell it might want to save that stuff to might no longer exist.
HideCellEditControl();
+
#if 0
// if we were using the default widths/heights so far, we must change them
// now
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
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_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_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
attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
#endif
}
+
if ( !GetBatchCount() )
{
CalcDimensions();
int numCols = msg.GetCommandInt2();
m_numCols += numCols;
+ if ( !m_colAt.IsEmpty() )
+ {
+ //Shift the column IDs
+ int i;
+ for ( i = 0; i < m_numCols - numCols; i++ )
+ {
+ if ( m_colAt[i] >= (int)pos )
+ m_colAt[i] += numCols;
+ }
+
+ m_colAt.Insert( pos, pos, numCols );
+
+ //Set the new columns' positions
+ for ( i = pos + 1; i < (int)pos + numCols; i++ )
+ {
+ m_colAt[i] = i;
+ }
+ }
+
if ( !m_colWidths.IsEmpty() )
{
m_colWidths.Insert( m_defaultColWidth, pos, numCols );
m_colRights.Insert( 0, pos, numCols );
int right = 0;
- if ( pos > 0 ) right = m_colRights[pos-1];
+ if ( pos > 0 )
+ right = m_colRights[GetColAt( pos - 1 )];
- for ( i = pos; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = pos; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
right += m_colWidths[i];
m_colRights[i] = right;
}
}
+
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
CalcDimensions();
m_colLabelWin->Refresh();
}
-
}
result = true;
break;
int numCols = msg.GetCommandInt();
int oldNumCols = m_numCols;
m_numCols += numCols;
+
+ if ( !m_colAt.IsEmpty() )
+ {
+ m_colAt.Add( 0, numCols );
+
+ //Set the new columns' positions
+ int i;
+ for ( i = oldNumCols; i < m_numCols; i++ )
+ {
+ m_colAt[i] = i;
+ }
+ }
+
if ( !m_colWidths.IsEmpty() )
{
m_colWidths.Add( m_defaultColWidth, numCols );
m_colRights.Add( 0, numCols );
int right = 0;
- if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+ if ( oldNumCols > 0 )
+ right = m_colRights[GetColAt( oldNumCols - 1 )];
- for ( i = oldNumCols; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = oldNumCols; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
right += m_colWidths[i];
m_colRights[i] = right;
}
}
+
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
int numCols = msg.GetCommandInt2();
m_numCols -= numCols;
+ if ( !m_colAt.IsEmpty() )
+ {
+ int colID = GetColAt( pos );
+
+ m_colAt.RemoveAt( pos, numCols );
+
+ //Shift the column IDs
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
+ {
+ if ( m_colAt[colPos] > colID )
+ m_colAt[colPos] -= numCols;
+ }
+ }
+
if ( !m_colWidths.IsEmpty() )
{
m_colWidths.RemoveAt( pos, numCols );
m_colRights.RemoveAt( pos, numCols );
int w = 0;
- for ( i = 0; i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
{
+ i = GetColAt( colPos );
+
w += m_colWidths[i];
m_colRights[i] = w;
}
}
+
if ( !m_numCols )
{
m_currentCellCoords = wxGridNoCellCoords;
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
attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
#endif
}
+
if ( !GetBatchCount() )
{
CalcDimensions();
if (result && !GetBatchCount() )
m_gridWin->Refresh();
+
return result;
}
-
-wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const
{
wxRegionIterator iter( reg );
wxRect r;
#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 = internalYToRow(top); row < m_numRows; row++ )
+ for ( row = internalYToRow(top); row < m_numRows; row++ )
{
if ( GetRowBottom(row) < top )
continue;
rowlabels.Add( row );
}
- iter++ ;
+ ++iter;
}
return rowlabels;
}
-
-wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const
{
wxRegionIterator iter( reg );
wxRect r;
#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 = internalXToCol(left); col < m_numCols; col++ )
+ int colPos;
+ for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
{
+ col = GetColAt( colPos );
+
if ( GetColRight(col) < left )
continue;
colLabels.Add( col );
}
- iter++ ;
+ ++iter;
}
+
return colLabels;
}
-
-wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const
{
wxRegionIterator iter( reg );
wxRect r;
// find the cells within these bounds
//
int row, col;
- for ( row = internalYToRow(top); row < m_numRows; row++ )
+ for ( row = internalYToRow(top); row < m_numRows; row++ )
{
if ( GetRowBottom(row) <= top )
continue;
if ( GetRowTop(row) > bottom )
break;
- for ( col = internalXToCol(left); col < m_numCols; col++ )
+ int colPos;
+ for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
{
+ col = GetColAt( colPos );
+
if ( GetColRight(col) <= left )
continue;
}
}
- iter++;
+ ++iter;
}
return cellsExposed;
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 )
{
if ( m_selection )
event.MetaDown() );
}
}
+ }
+ break;
// default label to suppress warnings about "enumeration value
// 'xxx' not handled in switch
if (m_isDragging)
{
- if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();
+ if (m_rowLabelWin->HasCapture())
+ m_rowLabelWin->ReleaseMouse();
m_isDragging = false;
}
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 ( m_selection )
{
else
{
// starting to drag-resize a row
- //
if ( CanDragRowSize() )
ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
}
}
-
// ------------ Left double click
//
else if (event.LeftDClick() )
{
- int row = YToEdgeOfRow(y);
+ row = YToEdgeOfRow(y);
if ( row < 0 )
{
row = YToRow(y);
AutoSizeRowLabelSize( row );
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
- m_dragLastPos = -1;
+ m_dragLastPos = -1;
}
}
-
// ------------ Left button released
//
else if ( event.LeftUp() )
m_dragLastPos = -1;
}
-
// ------------ Right button down
//
else if ( event.RightDown() )
}
}
-
// ------------ Right double click
//
else if ( event.RightDClick() )
}
}
-
// ------------ No buttons down and mouse moving
//
else if ( event.Moving() )
}
}
-
void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
{
int x, y, col;
{
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 )
{
if ( m_selection )
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
if (m_isDragging)
{
- if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
+ if (m_colLabelWin->HasCapture())
+ m_colLabelWin->ReleaseMouse();
m_isDragging = false;
}
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 ( m_selection )
+ if ( m_canDragColMove )
{
- if ( event.ShiftDown() )
- {
- m_selection->SelectBlock( 0,
- m_currentCellCoords.GetCol(),
- GetNumberRows() - 1, col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
- else
+ //Show button as pressed
+ wxClientDC dc( m_colLabelWin );
+ int colLeft = GetColLeft( col );
+ int colRight = GetColRight( col ) - 1;
+ dc.SetPen( wxPen( m_colLabelWin->GetBackgroundColour(), 1 ) );
+ dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+ dc.DrawLine( colLeft, 1, colRight, 1 );
+
+ ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, m_colLabelWin);
+ }
+ else
+ {
+ if ( !event.ShiftDown() && !event.CmdDown() )
+ ClearSelection();
+ if ( m_selection )
{
- m_selection->SelectCol( col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ if ( event.ShiftDown() )
+ {
+ m_selection->SelectBlock( 0,
+ m_currentCellCoords.GetCol(),
+ GetNumberRows() - 1, col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
+ else
+ {
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ }
}
- }
- ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+ }
}
}
else
}
}
-
// ------------ Left double click
//
if ( event.LeftDClick() )
{
- int col = XToEdgeOfCol(x);
+ col = XToEdgeOfCol(x);
if ( col < 0 )
{
col = XToCol(x);
AutoSizeColLabelSize( col );
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
- m_dragLastPos = -1;
+ m_dragLastPos = -1;
}
}
-
// ------------ Left button released
//
else if ( event.LeftUp() )
{
- if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ switch ( m_cursorMode )
{
- DoEndDragResizeCol();
+ case WXGRID_CURSOR_RESIZE_COL:
+ DoEndDragResizeCol();
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ break;
+
+ case WXGRID_CURSOR_MOVE_COL:
+ DoEndDragMoveCol();
+
+ SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event );
+ break;
+
+ case WXGRID_CURSOR_SELECT_COL:
+ case WXGRID_CURSOR_SELECT_CELL:
+ case WXGRID_CURSOR_RESIZE_ROW:
+ case WXGRID_CURSOR_SELECT_ROW:
+ // nothing to do (?)
+ break;
}
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
- m_dragLastPos = -1;
+ m_dragLastPos = -1;
}
-
// ------------ Right button down
//
else if ( event.RightDown() )
}
}
-
// ------------ Right double click
//
else if ( event.RightDClick() )
}
}
-
// ------------ No buttons down and mouse moving
//
else if ( event.Moving() )
}
}
-
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 ) )
}
}
+void wxGrid::CancelMouseCapture()
+{
+ // cancel operation currently in progress, whatever it is
+ if ( m_winCapture )
+ {
+ m_isDragging = false;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
+ m_winCapture = NULL;
+
+ // remove traces of whatever we drew on screen
+ Refresh();
+ }
+}
+
void wxGrid::ChangeCursorMode(CursorMode mode,
wxWindow *win,
bool captureMouse)
_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 &&
win == m_winCapture &&
if ( m_winCapture )
{
- if (m_winCapture->HasCapture()) 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
{
//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)
{
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();
SaveEditControlValue();
}
- // Have we captured the mouse yet?
- if (! m_winCapture)
- {
- m_winCapture = m_gridWin;
- m_winCapture->CaptureMouse();
- }
-
if ( coords != wxGridNoCellCoords )
{
- if ( event.ControlDown() )
+ if ( event.CmdDown() )
{
if ( m_selectingKeyboard == wxGridNoCellCoords)
m_selectingKeyboard = coords;
- HighlightBlock ( m_selectingKeyboard, coords );
+ HighlightBlock( m_selectingKeyboard, coords );
}
else if ( CanDragCell() )
{
coords.GetRow(),
coords.GetCol(),
event );
+ return;
}
}
else
// scrolling is way to fast, at least on MSW - also on GTK.
}
}
+ // Have we captured the mouse yet?
+ if (! m_winCapture)
+ {
+ m_winCapture = m_gridWin;
+ m_winCapture->CaptureMouse();
+ }
+
+
}
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{
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;
}
coords.GetCol(),
event ) )
{
- if ( !event.ControlDown() )
+ if ( !event.CmdDown() )
ClearSelection();
if ( event.ShiftDown() )
{
event.MetaDown() );
}
}
- else if ( XToEdgeOfCol(x) < 0 &&
+ else if ( XToEdgeOfCol(x) < 0 &&
YToEdgeOfRow(y) < 0 )
{
DisableCellEditControl();
MakeCellVisible( coords );
- if ( event.ControlDown() )
+ if ( event.CmdDown() )
{
if ( m_selection )
{
}
}
-
// ------------ Left double click
//
else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
{
DisableCellEditControl();
- if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
+ if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
{
if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
coords.GetRow(),
m_waitForSlowClick = true;
}
}
-
}
-
// ------------ Left button released
//
else if ( event.LeftUp() )
{
if (m_winCapture)
{
- if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+ if (m_winCapture->HasCapture())
+ m_winCapture->ReleaseMouse();
m_winCapture = NULL;
}
- if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl())
+ if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
{
ClearSelection();
EnableCellEditControl();
- wxGridCellAttr* attr = GetCellAttr(coords);
+ wxGridCellAttr *attr = GetCellAttr(coords);
wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
editor->StartingClick();
editor->DecRef();
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 )
+ if ( coords.GetRow() < 0 || coords.GetCol() < 0 )
{
// out of grid cell area
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
// 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();
rect.height = ch - rect.y;
m_rowLabelWin->Refresh( true, &rect );
rect.width = cw;
+
// if there is a multicell block, paint all of it
if (m_table)
{
int i, cell_rows, cell_cols, subtract_rows = 0;
int leftCol = XToCol(left);
- int rightCol = internalXToCol(left+cw);
+ int rightCol = internalXToCol(left + cw);
if (leftCol >= 0)
{
for (i=leftCol; i<rightCol; i++)
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();
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( true, &rect );
rect.height = ch;
+
// if there is a multicell block, paint all of it
if (m_table)
{
int i, cell_rows, cell_cols, subtract_cols = 0;
int topRow = YToRow(top);
- int bottomRow = internalYToRow(top+cw);
+ int bottomRow = internalYToRow(top + cw);
if (topRow >= 0)
{
for (i=topRow; i<bottomRow; i++)
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 );
+
+ 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 );
+}
+
+void wxGrid::SetColPos( int colID, int newPos )
+{
+ if ( m_colAt.IsEmpty() )
+ {
+ m_colAt.Alloc( m_numCols );
+
+ int i;
+ for ( i = 0; i < m_numCols; i++ )
+ {
+ m_colAt.Add( i );
+ }
+ }
+
+ int oldPos = GetColPos( colID );
+
+ //Reshuffle the m_colAt array
+ if ( newPos > oldPos )
+ {
+ int i;
+ for ( i = oldPos; i < newPos; i++ )
+ {
+ m_colAt[i] = m_colAt[i+1];
+ }
+ }
+ else
+ {
+ int i;
+ for ( i = oldPos; i > newPos; i-- )
+ {
+ m_colAt[i] = m_colAt[i-1];
+ }
+ }
+
+ m_colAt[newPos] = colID;
+
+ //Recalculate the column rights
+ if ( !m_colWidths.IsEmpty() )
+ {
+ int colRight = 0;
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
+ {
+ int colID = GetColAt( colPos );
+
+ colRight += m_colWidths[colID];
+ m_colRights[colID] = colRight;
+ }
+ }
+
+ m_colLabelWin->Refresh();
+ m_gridWin->Refresh();
+}
+
+
+
+void wxGrid::EnableDragColMove( bool enable )
+{
+ if ( m_canDragColMove == enable )
+ return;
+
+ m_canDragColMove = enable;
+
+ if ( !m_canDragColMove )
+ {
+ m_colAt.Clear();
+
+ //Recalculate the column rights
+ if ( !m_colWidths.IsEmpty() )
+ {
+ int colRight = 0;
+ int colPos;
+ for ( colPos = 0; colPos < m_numCols; colPos++ )
+ {
+ colRight += m_colWidths[colPos];
+ m_colRights[colPos] = colRight;
+ }
}
- ShowCellEditControl();
+ m_colLabelWin->Refresh();
+ m_gridWin->Refresh();
}
}
-
//
// ------ interaction with data model
//
}
}
-
-
// 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
// the table will have sent the results of the insert row
// operation to this view object as a grid table message
}
+
return false;
}
-
bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
{
// TODO: something with updateLabels flag
{
bool done = m_table && m_table->AppendRows( numRows );
return done;
+
// the table will have sent the results of the append row
// operation to this view object as a grid table message
}
+
return false;
}
-
bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
{
// TODO: something with updateLabels flag
// the table will have sent the results of the delete row
// operation to this view object as a grid table message
}
+
return false;
}
-
bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
{
// TODO: something with updateLabels flag
// the table will have sent the results of the insert col
// operation to this view object as a grid table message
}
+
return false;
}
-
bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
{
// TODO: something with updateLabels flag
// the table will have sent the results of the append col
// operation to this view object as a grid table message
}
+
return false;
}
-
bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
{
// TODO: something with updateLabels flag
// the table will have sent the results of the delete col
// operation to this view object as a grid table message
}
+
return false;
}
-
-
//
// ----- event handlers
//
int row, int col,
wxMouseEvent& mouseEv )
{
- bool claimed;
- bool vetoed;
+ bool claimed, vetoed;
if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
{
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
}
+ else if ( type == wxEVT_GRID_LABEL_LEFT_CLICK ||
+ type == wxEVT_GRID_LABEL_LEFT_DCLICK ||
+ type == wxEVT_GRID_LABEL_RIGHT_CLICK ||
+ type == wxEVT_GRID_LABEL_RIGHT_DCLICK )
+ {
+ wxPoint pos = mouseEv.GetPosition();
+
+ if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() )
+ pos.y += GetColLabelSize();
+ if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
+ pos.x += GetRowLabelSize();
+
+ wxGridEvent gridEvt( GetId(),
+ type,
+ this,
+ row, col,
+ pos.x,
+ pos.y,
+ false,
+ mouseEv.ControlDown(),
+ mouseEv.ShiftDown(),
+ mouseEv.AltDown(),
+ mouseEv.MetaDown() );
+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
+ vetoed = !gridEvt.IsAllowed();
+ }
else
{
wxGridEvent gridEvt( GetId(),
}
// A Veto'd event may not be `claimed' so test this first
- if (vetoed) return -1;
+ if (vetoed)
+ return -1;
+
return claimed ? 1 : 0;
}
-
// Generate a grid event of specified type and return the result
// of ProcessEvent().
//
int wxGrid::SendEvent( const wxEventType type,
int row, int col )
{
- bool claimed;
- bool vetoed;
+ bool claimed, vetoed;
if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
{
int rowOrCol = (row == -1 ? col : row);
- wxGridSizeEvent gridEvt( GetId(),
- type,
- this,
- rowOrCol );
+ wxGridSizeEvent gridEvt( GetId(), type, this, rowOrCol );
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
}
else
{
- wxGridEvent gridEvt( GetId(),
- type,
- this,
- row, col );
+ wxGridEvent gridEvt( GetId(), type, this, row, col );
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
}
// A Veto'd event may not be `claimed' so test this first
- if (vetoed) return -1;
+ if (vetoed)
+ return -1;
+
return claimed ? 1 : 0;
}
-
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
- wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW
+ // needed to prevent zillions of paint events on MSW
+ wxPaintDC dc(this);
}
void wxGrid::Refresh(bool eraseb, const wxRect* rect)
if (! GetBatchCount())
{
// Refresh to get correct scrolled position:
- wxScrolledWindow::Refresh(eraseb,rect);
+ wxScrolledWindow::Refresh(eraseb, rect);
if (rect)
{
int width_label, width_cell, height_label, height_cell;
int x, y;
- //Copy rectangle can get scroll offsets..
+ // Copy rectangle can get scroll offsets..
rect_x = rect->GetX();
rect_y = rect->GetY();
rectWidth = rect->GetWidth();
rectHeight = rect->GetHeight();
width_label = m_rowLabelWidth - rect_x;
- if (width_label > rectWidth) width_label = rectWidth;
+ if (width_label > rectWidth)
+ width_label = rectWidth;
height_label = m_colLabelHeight - rect_y;
- if (height_label > rectHeight) height_label = rectHeight;
+ if (height_label > rectHeight)
+ height_label = rectHeight;
if (rect_x > m_rowLabelWidth)
{
}
}
-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event))
{
- // position the child windows
- CalcWindowSizes();
-
- // don't call CalcDimensions() from here, the base class handles the size
- // changes itself
- event.Skip();
+ if (m_targetWindow != this) // check whether initialisation has been done
+ {
+ // update our children window positions and scrollbars
+ CalcDimensions();
+ }
}
-
void wxGrid::OnKeyDown( wxKeyEvent& event )
{
if ( m_inOnKeyDown )
m_inOnKeyDown = true;
// propagate the event up and see if it gets processed
- //
wxWindow *parent = GetParent();
wxKeyEvent keyEvt( event );
keyEvt.SetEventObject( parent );
if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
{
+ if (GetLayoutDirection() == wxLayout_RightToLeft)
+ {
+ if (event.GetKeyCode() == WXK_RIGHT)
+ event.m_keyCode = WXK_LEFT;
+ else if (event.GetKeyCode() == WXK_LEFT)
+ event.m_keyCode = WXK_RIGHT;
+ }
// try local handlers
- //
switch ( event.GetKeyCode() )
{
case WXK_UP:
if ( event.ControlDown() )
- {
MoveCursorUpBlock( event.ShiftDown() );
- }
else
- {
MoveCursorUp( event.ShiftDown() );
- }
break;
case WXK_DOWN:
if ( event.ControlDown() )
- {
MoveCursorDownBlock( event.ShiftDown() );
- }
else
- {
MoveCursorDown( event.ShiftDown() );
- }
break;
case WXK_LEFT:
if ( event.ControlDown() )
- {
MoveCursorLeftBlock( event.ShiftDown() );
- }
else
- {
MoveCursorLeft( event.ShiftDown() );
- }
break;
case WXK_RIGHT:
if ( event.ControlDown() )
- {
MoveCursorRightBlock( event.ShiftDown() );
- }
else
- {
MoveCursorRight( event.ShiftDown() );
- }
break;
case WXK_RETURN:
}
else
{
- if ( GetGridCursorCol() < GetNumberCols()-1 )
+ if ( GetGridCursorCol() < GetNumberCols() - 1 )
{
MoveCursorRight( false );
}
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;
{
if ( m_selection )
{
- m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ m_selection->ToggleCellSelection(
+ m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
break;
}
+
if ( !IsEditable() )
- {
MoveCursorRight( false );
- break;
- }
- // Otherwise fall through to default
-
- 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.GetKeyCode() == WXK_F2 && !event.HasModifiers())
- || editor->IsAcceptedKey(event) )
- {
- // ensure cell is visble
- MakeCellVisible(row, col);
- EnableCellEditControl();
-
- // a problem can arise if the cell is not completely
- // visible (even after calling MakeCellVisible the
- // control is not created and calling StartingKey will
- // crash the app
- if( editor->IsCreated() && m_cellEditCtrlEnabled ) editor->StartingKey(event);
- }
- else
- {
- event.Skip();
- }
-
- editor->DecRef();
- attr->DecRef();
- }
else
- {
- // let others process char events with modifiers or all
- // char events for readonly cells
event.Skip();
- }
+ break;
+
+ default:
+ event.Skip();
break;
}
}
{
if ( m_selection )
{
- m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
- m_selectingTopLeft.GetCol(),
- m_selectingBottomRight.GetRow(),
- m_selectingBottomRight.GetCol(),
- event.ControlDown(),
- true,
- event.AltDown(),
- event.MetaDown() );
+ m_selection->SelectBlock(
+ m_selectingTopLeft.GetRow(),
+ m_selectingTopLeft.GetCol(),
+ m_selectingBottomRight.GetRow(),
+ m_selectingBottomRight.GetCol(),
+ event.ControlDown(),
+ true,
+ event.AltDown(),
+ event.MetaDown() );
}
}
}
}
+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);
+#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+#endif
if ( m_currentCellCoords != wxGridNoCellCoords )
{
if ( IsVisible( m_currentCellCoords, false ) )
{
wxRect r;
- r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ r = BlockToDeviceRect( m_currentCellCoords, m_currentCellCoords );
if ( !m_gridLinesEnabled )
{
r.x--;
// Otherwise refresh redraws the highlight!
m_currentCellCoords = coords;
- DrawGridCellArea(dc,cells);
+#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
+ m_gridWin->Refresh(true /*, & r */);
+#else
+ DrawGridCellArea( dc, cells );
DrawAllGridLines( dc, r );
+#endif
}
}
m_currentCellCoords = coords;
- wxGridCellAttr* attr = GetCellAttr(coords);
- DrawCellHighlight(dc, attr);
+ wxGridCellAttr *attr = GetCellAttr( coords );
+#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+ DrawCellHighlight( dc, attr );
+#endif
attr->DecRef();
}
-
void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
{
int temp;
wxGridCellCoords ( bottomRow, rightCol ) );
m_gridWin->Refresh( false, &rect );
}
+
// Now handle changing an existing selection area.
else if ( m_selectingTopLeft != updateTopLeft ||
m_selectingBottomRight != updateBottomRight )
int i;
// Store intermediate values
- wxCoord oldLeft = m_selectingTopLeft.GetCol();
- wxCoord oldTop = m_selectingTopLeft.GetRow();
- wxCoord oldRight = m_selectingBottomRight.GetCol();
+ wxCoord oldLeft = m_selectingTopLeft.GetCol();
+ wxCoord oldTop = m_selectingTopLeft.GetRow();
+ wxCoord oldRight = m_selectingBottomRight.GetCol();
wxCoord oldBottom = m_selectingBottomRight.GetRow();
// Determine the outer/inner coordinates.
// Refresh the newly selected or deselected
// area to the left of the old or new selection.
need_refresh[0] = true;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- oldLeft ),
- wxGridCellCoords ( oldBottom,
- leftCol - 1 ) );
+ rect[0] = BlockToDeviceRect(
+ wxGridCellCoords( oldTop, oldLeft ),
+ wxGridCellCoords( oldBottom, leftCol - 1 ) );
}
- if ( oldTop < topRow )
+ if ( oldTop < topRow )
{
// Refresh the newly selected or deselected
// area above the old or new selection.
need_refresh[1] = true;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- leftCol ),
- wxGridCellCoords ( topRow - 1,
- rightCol ) );
+ rect[1] = BlockToDeviceRect(
+ wxGridCellCoords( oldTop, leftCol ),
+ wxGridCellCoords( topRow - 1, rightCol ) );
}
if ( oldRight > rightCol )
// Refresh the newly selected or deselected
// area to the right of the old or new selection.
need_refresh[2] = true;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- rightCol + 1 ),
- wxGridCellCoords ( oldBottom,
- oldRight ) );
+ rect[2] = BlockToDeviceRect(
+ wxGridCellCoords( oldTop, rightCol + 1 ),
+ wxGridCellCoords( oldBottom, oldRight ) );
}
if ( oldBottom > bottomRow )
// Refresh the newly selected or deselected
// area below the old or new selection.
need_refresh[3] = true;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
- leftCol ),
- wxGridCellCoords ( oldBottom,
- rightCol ) );
+ rect[3] = BlockToDeviceRect(
+ wxGridCellCoords( bottomRow + 1, leftCol ),
+ wxGridCellCoords( oldBottom, rightCol ) );
}
// various Refresh() calls
if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
m_gridWin->Refresh( false, &(rect[i]) );
}
- // Change Selection
+
+ // change selection
m_selectingTopLeft = updateTopLeft;
m_selectingBottomRight = updateBottomRight;
}
return false;
}
-
bool wxGrid::SetModelValues()
{
int row, col;
if ( m_table )
{
- for ( row = 0; row < m_numRows; row++ )
+ for ( row = 0; row < m_numRows; row++ )
{
- for ( col = 0; col < m_numCols; col++ )
+ for ( col = 0; col < m_numCols; col++ )
{
m_table->SetValue( row, col, GetCellValue(row, col) );
}
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, const wxGridCellCoordsArray& cells )
{
- if ( !m_numRows || !m_numCols ) return;
+ if ( !m_numRows || !m_numCols )
+ return;
int i, numCells = cells.GetCount();
int row, col, cell_rows, cell_cols;
wxGridCellCoordsArray redrawCells;
- for ( i = numCells-1; i >= 0; i-- )
+ for ( i = numCells - 1; i >= 0; i-- )
{
row = cells[i].GetRow();
col = cells[i].GetCol();
// If this cell is part of a multicell block, find owner for repaint
if ( cell_rows <= 0 || cell_cols <= 0 )
{
- wxGridCellCoords cell(row+cell_rows, col+cell_cols);
+ wxGridCellCoords cell( row + cell_rows, col + cell_cols );
bool marked = false;
- for ( int j = 0; j < numCells; j++ )
+ for ( int j = 0; j < numCells; j++ )
{
if ( cell == cells[j] )
{
break;
}
}
+
if (!marked)
{
int count = redrawCells.GetCount();
break;
}
}
- if (!marked) redrawCells.Add( cell );
+
+ if (!marked)
+ redrawCells.Add( cell );
}
- continue; // don't bother drawing this cell
+
+ // don't bother drawing this cell
+ continue;
}
// If this cell is empty, find cell to left that might want to overflow
{
for ( int l = 0; l < cell_rows; l++ )
{
- // find a cell in this row to left alreay marked for repaint
+ // find a cell in this row to leave already marked for repaint
int left = col;
for (int k = 0; k < int(redrawCells.GetCount()); k++)
if ((redrawCells[k].GetCol() < left) &&
(redrawCells[k].GetRow() == row))
- left=redrawCells[k].GetCol();
+ {
+ left = redrawCells[k].GetCol();
+ }
- if (left == col) left = 0; // oh well
+ if (left == col)
+ left = 0; // oh well
- for (int j = col-1; j >= left; j--)
+ for (int j = col - 1; j >= left; j--)
{
- if (!m_table->IsEmptyCell(row+l, j))
+ if (!m_table->IsEmptyCell(row + l, j))
{
- if (GetCellOverflow(row+l, j))
+ if (GetCellOverflow(row + l, j))
{
- wxGridCellCoords cell(row+l, j);
+ wxGridCellCoords cell(row + l, j);
bool marked = false;
for (int k = 0; k < numCells; k++)
break;
}
}
+
if (!marked)
{
int count = redrawCells.GetCount();
break;
}
}
- if (!marked) redrawCells.Add( cell );
+ if (!marked)
+ redrawCells.Add( cell );
}
}
break;
}
}
}
+
DrawCell( dc, cells[i] );
}
numCells = redrawCells.GetCount();
- for ( i = numCells - 1; i >= 0; i-- )
+ for ( i = numCells - 1; i >= 0; i-- )
{
DrawCell( dc, redrawCells[i] );
}
}
-
void wxGrid::DrawGridSpace( wxDC& dc )
{
int cw, ch;
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__)
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();
if (penWidth > 0)
{
- // The center of th drawn line is where the position/width/height of
- // the rectangle is actually at, (on wxMSW atr least,) so we will
- // reduce the size of the rectangle to compensate for the thickness of
- // the line. If this is too strange on non wxMSW platforms then
+ // The center of the drawn line is where the position/width/height of
+ // the rectangle is actually at (on wxMSW at least), so the
+ // size of the rectangle is reduced to compensate for the thickness of
+ // the line. If this is too strange on non-wxMSW platforms then
// please #ifdef this appropriately.
- rect.x += penWidth/2;
- rect.y += penWidth/2;
- rect.width -= penWidth-1;
- rect.height -= penWidth-1;
-
+ rect.x += penWidth / 2;
+ rect.y += penWidth / 2;
+ rect.width -= penWidth - 1;
+ rect.height -= penWidth - 1;
// Now draw the rectangle
// use the cellHighlightColour if the cell is inside a selection, this
// will ensure the cell is always visible.
- dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));
+ dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxSOLID));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
}
#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
+}
+
+wxPen wxGrid::GetDefaultGridLinePen()
+{
+ return wxPen(GetGridLineColour(), 1, wxSOLID);
+}
+
+wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))
+{
+ return GetDefaultGridLinePen();
}
+wxPen wxGrid::GetColGridLinePen(int WXUNUSED(col))
+{
+ return GetDefaultGridLinePen();
+}
void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
{
if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
- dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
wxRect rect = CellToRect( row, col );
// right hand border
- //
+ dc.SetPen( GetColGridLinePen(col) );
dc.DrawLine( rect.x + rect.width, rect.y,
rect.x + rect.width, rect.y + rect.height + 1 );
// bottom border
- //
- dc.DrawLine( rect.x, rect.y + rect.height,
+ dc.SetPen( GetRowGridLinePen(row) );
+ dc.DrawLine( rect.x, rect.y + rect.height,
rect.x + rect.width, rect.y + rect.height);
}
-void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells)
+void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells)
{
// This if block was previously in wxGrid::OnPaint but that doesn't
// seem to get called under wxGTK - MB
//
- if ( m_currentCellCoords == wxGridNoCellCoords &&
+ if ( m_currentCellCoords == wxGridNoCellCoords &&
m_numRows && m_numCols )
{
m_currentCellCoords.Set(0, 0);
return;
#endif
- if ( !m_gridLinesEnabled ||
- !m_numRows ||
- !m_numCols ) return;
+ 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 = internalXToCol(left);
- int topRow = internalYToRow(top);
- int rightCol = internalXToCol(right);
+ int leftCol = GetColPos( internalXToCol(left) );
+ int topRow = internalYToRow(top);
+ int rightCol = GetColPos( internalXToCol(right) );
int bottomRow = internalYToRow(bottom);
- wxRegion clippedcells(0, 0, cw, ch);
+#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS
+ wxRegion clippedcells(0, 0, cw, ch);
int i, j, cell_rows, cell_cols;
wxRect rect;
- for (j=topRow; j<bottomRow; j++)
+ for (j=topRow; j<=bottomRow; j++)
{
- for (i=leftCol; i<rightCol; i++)
+ 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))
{
}
else if ((cell_rows < 0) || (cell_cols < 0))
{
- rect = CellToRect(j+cell_rows, i+cell_cols);
+ rect = CellToRect(j + cell_rows, i + cell_cols);
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
clippedcells.Subtract(rect);
}
}
}
+#else
+ wxRegion clippedcells( left, top, right - left, bottom - top );
+
+ int i, j, cell_rows, cell_cols;
+ wxRect rect;
+
+ for (j=topRow; j<=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
//
if ( bot >= top )
{
+ dc.SetPen( GetRowGridLinePen(i) );
dc.DrawLine( left, bot, right, bot );
}
}
-
// vertical grid lines
//
- for ( i = internalXToCol(left); i < m_numCols; i++ )
+ int colPos;
+ for ( colPos = leftCol; colPos < m_numCols; colPos++ )
{
- int colRight = GetColRight(i) - 1;
+ i = GetColAt( colPos );
+
+ int colRight = GetColRight(i);
+#ifdef __WXGTK__
+ if (GetLayoutDirection() != wxLayout_RightToLeft)
+#endif
+ colRight--;
+
if ( colRight > right )
{
break;
if ( colRight >= left )
{
+ dc.SetPen( GetColGridLinePen(i) );
dc.DrawLine( colRight, top, colRight, bottom );
}
}
+
dc.DestroyClippingRegion();
}
-
-void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows)
+void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)
{
- if ( !m_numRows ) return;
+ if ( !m_numRows )
+ return;
size_t i;
size_t numLabels = rows.GetCount();
- for ( i = 0; i < numLabels; i++ )
+ for ( i = 0; i < numLabels; 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;
+
+#if 0
+def __WXGTK20__
+ rect.SetX( 1 );
+ rect.SetY( GetRowTop(row) + 1 );
+ rect.SetWidth( m_rowLabelWidth - 2 );
+ rect.SetHeight( GetRowHeight(row) - 2 );
+
+ CalcScrolledPosition( 0, rect.y, NULL, &rect.y );
+
+ wxWindowDC *win_dc = (wxWindowDC*) &dc;
+
+ wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
+#else
int rowTop = GetRowTop(row),
rowBottom = GetRowBottom(row) - 1;
- dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
- dc.DrawLine( m_rowLabelWidth-1, rowTop,
- m_rowLabelWidth-1, rowBottom );
-
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, 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( 1, rowTop, 1, rowBottom );
- dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );
+ 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,const wxArrayInt& cols )
{
- if ( !m_numCols ) return;
+ if ( !m_numCols )
+ return;
size_t i;
size_t numLabels = cols.GetCount();
- for ( i = 0; i < numLabels; i++ )
+ for ( i = 0; i < numLabels; 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);
- dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
- dc.DrawLine( colRight, 0,
- colRight, m_colLabelHeight-1 );
+ wxRect rect;
- dc.DrawLine( colLeft, 0, colRight, 0 );
+#if 0
+def __WXGTK20__
+ rect.SetX( colLeft + 1 );
+ rect.SetY( 1 );
+ rect.SetWidth( GetColWidth(col) - 2 );
+ rect.SetHeight( m_colLabelHeight - 2 );
+
+ wxWindowDC *win_dc = (wxWindowDC*) &dc;
- dc.DrawLine( colLeft, m_colLabelHeight-1,
- colRight+1, 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.SetPen( *wxWHITE_PEN );
- dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+ dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
dc.DrawLine( colLeft, 1, colRight, 1 );
+#endif
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
GetColLabelAlignment( &hAlign, &vAlign );
orient = GetColLabelTextOrientation();
- wxRect rect;
rect.SetX( colLeft + 2 );
rect.SetY( 2 );
rect.SetWidth( GetColWidth(col) - 4 );
StringToLines( value, lines );
-
- //Forward to new API.
- DrawTextRectangle( dc,
+ // Forward to new API.
+ DrawTextRectangle( dc,
lines,
rect,
horizAlign,
vertAlign,
textOrientation );
-
}
-void wxGrid::DrawTextRectangle( wxDC& dc,
+// VZ: this should be replaced with wxDC::DrawLabel() to which we just have to
+// add textOrientation support
+void wxGrid::DrawTextRectangle(wxDC& dc,
const wxArrayString& lines,
const wxRect& rect,
int horizAlign,
int vertAlign,
- int textOrientation )
+ int textOrientation)
{
- long textWidth, textHeight;
- long lineWidth, lineHeight;
- int nLines;
+ if ( lines.empty() )
+ return;
- dc.SetClippingRegion( rect );
+ wxDCClipper clip(dc, rect);
- nLines = lines.GetCount();
- if( nLines > 0 )
- {
- int l;
- float x = 0.0, y = 0.0;
+ long textWidth,
+ textHeight;
- if( textOrientation == wxHORIZONTAL )
- GetTextBoxSize(dc, lines, &textWidth, &textHeight);
- else
- GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+ if ( textOrientation == wxHORIZONTAL )
+ GetTextBoxSize( dc, lines, &textWidth, &textHeight );
+ else
+ GetTextBoxSize( dc, lines, &textHeight, &textWidth );
- switch( vertAlign )
- {
+ int x = 0,
+ y = 0;
+ switch ( vertAlign )
+ {
case wxALIGN_BOTTOM:
- if( textOrientation == wxHORIZONTAL )
+ if ( textOrientation == wxHORIZONTAL )
y = rect.y + (rect.height - textHeight - 1);
else
x = rect.x + rect.width - textWidth;
break;
case wxALIGN_CENTRE:
- if( textOrientation == wxHORIZONTAL )
- y = rect.y + ((rect.height - textHeight)/2);
+ if ( textOrientation == wxHORIZONTAL )
+ y = rect.y + ((rect.height - textHeight) / 2);
else
- x = rect.x + ((rect.width - textWidth)/2);
+ x = rect.x + ((rect.width - textWidth) / 2);
break;
case wxALIGN_TOP:
default:
- if( textOrientation == wxHORIZONTAL )
+ if ( textOrientation == wxHORIZONTAL )
y = rect.y + 1;
else
x = rect.x + 1;
break;
- }
+ }
- // Align each line of a multi-line label
- for( l = 0; l < nLines; l++ )
+ // 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() )
{
- dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+ *(textOrientation == wxHORIZONTAL ? &y : &x) += dc.GetCharHeight();
+ continue;
+ }
- switch( horizAlign )
- {
+ wxCoord lineWidth = 0,
+ lineHeight = 0;
+ dc.GetTextExtent(line, &lineWidth, &lineHeight);
+
+ switch ( horizAlign )
+ {
case wxALIGN_RIGHT:
- if( textOrientation == wxHORIZONTAL )
+ 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);
+ if ( textOrientation == wxHORIZONTAL )
+ x = rect.x + ((rect.width - lineWidth) / 2);
else
- y = rect.y + rect.height - ((rect.height - lineWidth)/2);
+ y = rect.y + rect.height - ((rect.height - lineWidth) / 2);
break;
case wxALIGN_LEFT:
default:
- if( textOrientation == wxHORIZONTAL )
+ if ( textOrientation == wxHORIZONTAL )
x = rect.x + 1;
else
y = rect.y + rect.height - 1;
break;
- }
+ }
- if( textOrientation == wxHORIZONTAL )
- {
- dc.DrawText( lines[l], (int)x, (int)y );
- y += lineHeight;
- }
- else
- {
- dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
- x += lineHeight;
- }
+ if ( textOrientation == wxHORIZONTAL )
+ {
+ dc.DrawText( line, x, y );
+ y += lineHeight;
+ }
+ else
+ {
+ dc.DrawRotatedText( line, x, y, 90.0 );
+ x += lineHeight;
}
}
- dc.DestroyClippingRegion();
}
-
-// Split multi line text up into an array of strings. Any existing
-// contents of the string array are preserved.
+// Split multi-line text up into an array of strings.
+// Any existing contents of the string array are preserved.
//
-void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
+void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
{
int startPos = 0;
int pos;
wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
- while ( startPos < (int)tVal.Length() )
+ while ( startPos < (int)tVal.length() )
{
pos = tVal.Mid(startPos).Find( eol );
if ( pos < 0 )
{
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,
+void wxGrid::GetTextBoxSize( const wxDC& dc,
const wxArrayString& lines,
- long *width, long *height )
+ long *width, long *height ) const
{
- long w = 0;
- long h = 0;
- long lineW, lineH;
+ wxCoord w = 0;
+ wxCoord h = 0;
+ wxCoord lineW = 0, lineH = 0;
size_t i;
- for ( i = 0; i < lines.GetCount(); i++ )
+ for ( i = 0; i < lines.GetCount(); i++ )
{
dc.GetTextExtent( lines[i], &lineW, &lineH );
w = wxMax( w, lineW );
EndBatch();
}
+bool wxGrid::Enable(bool enable)
+{
+ if ( !wxScrolledWindow::Enable(enable) )
+ return false;
+
+ // redraw in the new state
+ m_gridWin->Refresh();
+
+ return true;
+}
//
// ------ Edit control functions
//
-
void wxGrid::EnableEditing( bool edit )
{
// TODO: improve this ?
//
if ( edit != m_editable )
{
- if(!edit) EnableCellEditControl(edit);
+ if (!edit)
+ EnableCellEditControl(edit);
m_editable = edit;
}
}
-
void wxGrid::EnableCellEditControl( bool enable )
{
if (! m_editable)
return;
- if ( m_currentCellCoords == wxGridNoCellCoords )
- SetCurrentCell( 0, 0 );
-
if ( enable != m_cellEditCtrlEnabled )
{
if ( enable )
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);
+ SendEvent( wxEVT_GRID_EDITOR_HIDDEN );
HideCellEditControl();
SaveEditControlValue();
{
return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
!IsCurrentCellReadOnly();
-
}
bool wxGrid::IsCellEditControlEnabled() const
{
if ( IsCellEditControlEnabled() )
{
- if ( !IsVisible( m_currentCellCoords ) )
+ if ( !IsVisible( m_currentCellCoords, false ) )
{
m_cellEditCtrlEnabled = false;
return;
m_currentCellCoords.SetCol( col );
}
- // convert to scrolled coords
- //
- CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-
- // done in PaintBackground()
-#if 0
// erase the highlight and the cell contents because the editor
// might not cover the entire cell
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(rect);
-#endif // 0
+
+ // convert to scrolled coords
+ CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+
+ int nXMove = 0;
+ if (rect.x < 0)
+ nXMove = rect.x;
// cell is shifted by one pixel
// However, don't allow x or y to become negative
if (rect.y > 0)
rect.y--;
- wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
if ( !editor->IsCreated() )
{
GetEventHandler()->ProcessEvent(evt);
}
-
// resize editor to overflow into righthand cells if allowed
int maxWidth = rect.width;
wxString value = GetCellValue(row, col);
if ( (value != wxEmptyString) && (attr->GetOverflow()) )
{
int y;
- GetTextExtent(value, &maxWidth, &y,
- NULL, NULL, &attr->GetFont());
- if (maxWidth < rect.width) maxWidth = rect.width;
+ GetTextExtent(value, &maxWidth, &y, NULL, NULL, &attr->GetFont());
+ if (maxWidth < rect.width)
+ maxWidth = rect.width;
}
+
int client_right = m_gridWin->GetClientSize().GetWidth();
- if (rect.x+maxWidth > client_right)
+ if (rect.x + maxWidth > client_right)
maxWidth = client_right - rect.x;
if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
{
GetCellSize( row, col, &cell_rows, &cell_cols );
// may have changed earlier
- for (int i = col+cell_cols; i < m_numCols; i++)
+ for (int i = col + cell_cols; i < m_numCols; i++)
{
int c_rows, c_cols;
GetCellSize( row, i, &c_rows, &c_cols );
+
// looks weird going over a multicell
- if (m_table->IsEmptyCell(row,i) &&
+ if (m_table->IsEmptyCell( row, i ) &&
(rect.width < maxWidth) && (c_rows == 1))
- rect.width += GetColWidth(i);
+ {
+ rect.width += GetColWidth( i );
+ }
else
break;
}
+
if (rect.GetRight() > client_right)
- rect.SetRight(client_right-1);
+ rect.SetRight( client_right - 1 );
}
- editor->SetCellAttr(attr);
+ editor->SetCellAttr( attr );
editor->SetSize( rect );
+ if (nXMove != 0)
+ editor->GetControl()->Move(
+ editor->GetControl()->GetPosition().x + nXMove,
+ editor->GetControl()->GetPosition().y );
editor->Show( true, attr );
// recalc dimensions in case we need to
}
}
-
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->DecRef();
attr->DecRef();
+
m_gridWin->SetFocus();
+
// refresh whole row to the right
wxRect rect( CellToRect(row, col) );
CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;
+
+#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);
+ wxString oldval = GetCellValue(row, col);
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
{
if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() ) < 0 ) {
-
+ m_currentCellCoords.GetCol() ) < 0 )
+ {
// Event has been vetoed, set the data back.
- SetCellValue(row,col,oldval);
+ SetCellValue(row, col, oldval);
}
}
}
}
-
//
// ------ Grid location functions
// Note that all of these functions work with the logical coordinates of
// coordinates for mouse events etc.
//
-void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
+void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) const
{
int row = YToRow(y);
int col = XToCol(x);
- if ( row == -1 || col == -1 )
+ if ( row == -1 || col == -1 )
{
coords = wxGridNoCellCoords;
}
}
}
-
// Internal Helper function for computing row or column from some
// (unscrolled) coordinate value, using either
// m_defaultRowHeight/m_defaultColWidth or binary search on array
const wxArrayInt& BorderArray, int nMax,
bool clipToMinMax)
{
-
if (coord < 0)
return clipToMinMax && (nMax > 0) ? 0 : -1;
-
if (!defaultDist)
defaultDist = 1;
if (BorderArray.IsEmpty())
{
- if((int) i_max < nMax)
+ if ((int) i_max < nMax)
return i_max;
return clipToMinMax ? nMax - 1 : -1;
}
if ( i_max >= BorderArray.GetCount())
+ {
i_max = BorderArray.GetCount() - 1;
+ }
else
{
if ( coord >= BorderArray[i_max])
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] )
else
i_min = median;
}
+
return i_max;
}
-int wxGrid::YToRow( int y )
+int wxGrid::YToRow( int y ) const
{
return CoordToRowOrCol(y, m_defaultRowHeight,
m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
}
-
-int wxGrid::XToCol( int x )
+int wxGrid::XToCol( int x, bool clipToMinMax ) const
{
- return CoordToRowOrCol(x, m_defaultColWidth,
- m_minAcceptableColWidth, m_colRights, m_numCols, false);
-}
+ if (x < 0)
+ return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;
+ wxASSERT_MSG(m_defaultColWidth > 0, wxT("Default column width can not be zero"));
-// return the row number that that the y coord is near the edge of, or
-// -1 if not near an edge
+ int maxPos = x / m_defaultColWidth;
+ int minPos = 0;
+
+ if (m_colRights.IsEmpty())
+ {
+ if(maxPos < m_numCols)
+ return GetColAt( maxPos );
+ return clipToMinMax ? GetColAt( m_numCols - 1 ) : -1;
+ }
+
+ if ( maxPos >= m_numCols)
+ maxPos = m_numCols - 1;
+ else
+ {
+ if ( x >= m_colRights[GetColAt( maxPos )])
+ {
+ minPos = maxPos;
+ if (m_minAcceptableColWidth)
+ maxPos = x / m_minAcceptableColWidth;
+ else
+ maxPos = m_numCols - 1;
+ }
+ if ( maxPos >= m_numCols)
+ maxPos = m_numCols - 1;
+ }
+
+ //X is beyond the last column
+ if ( x >= m_colRights[GetColAt( maxPos )])
+ return clipToMinMax ? GetColAt( maxPos ) : -1;
+
+ //X is before the first column
+ if ( x < m_colRights[GetColAt( 0 )] )
+ return GetColAt( 0 );
+
+ //Perform a binary search
+ while ( maxPos - minPos > 0 )
+ {
+ wxCHECK_MSG(m_colRights[GetColAt( minPos )] <= x && x < m_colRights[GetColAt( maxPos )],
+ 0, _T("wxGrid: internal error in XToCol"));
+
+ if (x >= m_colRights[GetColAt( maxPos - 1 )])
+ return GetColAt( maxPos );
+ else
+ maxPos--;
+ int median = minPos + (maxPos - minPos + 1) / 2;
+ if (x < m_colRights[GetColAt( median )])
+ maxPos = median;
+ else
+ minPos = median;
+ }
+ return GetColAt( maxPos );
+}
+
+// return the row number that that the y coord is near
+// the edge of, or -1 if not near an edge.
+// coords can only possibly be near an edge if
+// (a) the row/column is large enough to still allow for an "inner" area
+// that is _not_ nead the edge (i.e., if the height/width is smaller
+// than WXGRID_LABEL_EDGE_ZONE, coords are _never_ considered to be
+// near the edge).
+// and
+// (b) resizing rows/columns (the thing for which edge detection is
+// relevant at all) is enabled.
//
-int wxGrid::YToEdgeOfRow( int y )
+int wxGrid::YToEdgeOfRow( int y ) const
{
int i;
i = internalYToRow(y);
- if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
+ if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE && CanDragRowSize() )
{
// We know that we are in row i, test whether we are
// close enough to lower or upper border, respectively.
if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
return i;
- else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
+ else if ( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
return i - 1;
}
return -1;
}
-
// return the col number that that the x coord is near the edge of, or
// -1 if not near an edge
+// See comment at YToEdgeOfRow for conditions on edge detection.
//
-int wxGrid::XToEdgeOfCol( int x )
+int wxGrid::XToEdgeOfCol( int x ) const
{
int i;
i = internalXToCol(x);
- if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
+ if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE && CanDragColSize() )
{
- // We know that we are in column i, test whether we are
+ // We know that we are in column i; test whether we are
// close enough to right or left border, respectively.
if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
return i;
- else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
+ else if ( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
return i - 1;
}
return -1;
}
-
-wxRect wxGrid::CellToRect( int row, int col )
+wxRect wxGrid::CellToRect( int row, int col ) const
{
wxRect rect( -1, -1, -1, -1 );
- if ( row >= 0 && row < m_numRows &&
- col >= 0 && col < m_numCols )
+ if ( row >= 0 && row < m_numRows &&
+ col >= 0 && col < m_numCols )
{
int i, cell_rows, cell_cols;
rect.width = rect.height = 0;
GetCellSize( row, col, &cell_rows, &cell_cols );
// if negative then find multicell owner
- if (cell_rows < 0) row += cell_rows;
- if (cell_cols < 0) col += cell_cols;
+ if (cell_rows < 0)
+ row += cell_rows;
+ if (cell_cols < 0)
+ col += cell_cols;
GetCellSize( row, col, &cell_rows, &cell_cols );
rect.x = GetColLeft(col);
rect.y = GetRowTop(row);
- for (i=col; i<col+cell_cols; i++)
- rect.width += GetColWidth(i);
- for (i=row; i<row+cell_rows; i++)
+ 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 )
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const
{
// 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
//
void wxGrid::MakeCellVisible( int row, int col )
{
-
int i;
int xpos = -1, ypos = -1;
- if ( row >= 0 && row < m_numRows &&
- col >= 0 && col < m_numCols )
+ if ( row >= 0 && row < m_numRows &&
+ col >= 0 && col < m_numCols )
{
// get the cell rectangle in logical coords
- //
wxRect r( CellToRect( row, col ) );
// convert to device coords
- //
int left, top, right, bottom;
CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top );
CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
{
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)
+ // 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 += GRID_SCROLL_LINE_Y;
+ // 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();
}
xpos = x0 + (right - cw);
// see comment for ypos above
- xpos += GRID_SCROLL_LINE_X;
+ xpos += m_scrollLineX;
}
- if ( xpos != -1 || ypos != -1 )
+ if ( xpos != -1 || ypos != -1 )
{
if ( xpos != -1 )
- xpos /= GRID_SCROLL_LINE_X;
+ xpos /= m_scrollLineX;
if ( ypos != -1 )
- ypos /= GRID_SCROLL_LINE_Y;
+ ypos /= m_scrollLineY;
Scroll( xpos, ypos );
AdjustScrollbars();
}
}
}
-
//
// ------ 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;
}
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;
}
-
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(),
}
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;
}
-
bool wxGrid::MoveCursorLeft( bool expandSelection )
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
+ if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() >= 0 )
{
if ( expandSelection )
HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
- else if ( m_currentCellCoords.GetCol() > 0 )
+ else if ( GetColPos( m_currentCellCoords.GetCol() ) > 0 )
{
+ int row = m_currentCellCoords.GetRow();
+ int col = 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;
}
-
bool wxGrid::MoveCursorRight( bool expandSelection )
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
+ if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetCol() < m_numCols )
{
if ( expandSelection )
HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
}
}
- else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
+ else if ( GetColPos( m_currentCellCoords.GetCol() ) < m_numCols - 1 )
{
+ int row = m_currentCellCoords.GetRow();
+ int col = 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;
}
-
bool wxGrid::MovePageUp()
{
- if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ return false;
int row = m_currentCellCoords.GetRow();
if ( row > 0 )
if ( newRow == row )
{
- //row > 0 , so newrow can never be less than 0 here.
+ // row > 0, so newRow can never be less than 0 here.
newRow = row - 1;
}
bool wxGrid::MovePageDown()
{
- if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ return false;
int row = m_currentCellCoords.GetRow();
- if ( (row+1) < m_numRows )
+ if ( (row + 1) < m_numRows )
{
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
int newRow = internalYToRow( y + ch );
if ( newRow == row )
{
- // row < m_numRows , so newrow can't overflow here.
+ // row < m_numRows, so newRow can't overflow here.
newRow = row + 1;
}
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;
}
}
ClearSelection();
SetCurrentCell( row, col );
}
+
return true;
}
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;
}
}
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;
}
}
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;
}
}
return false;
}
-
-
//
// ------ Label values and formatting
//
-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const
{
- *horiz = m_rowLabelHorizAlign;
- *vert = m_rowLabelVertAlign;
+ if ( horiz )
+ *horiz = m_rowLabelHorizAlign;
+ if ( vert )
+ *vert = m_rowLabelVertAlign;
}
-void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) const
{
- *horiz = m_colLabelHorizAlign;
- *vert = m_colLabelVertAlign;
+ if ( horiz )
+ *horiz = m_colLabelHorizAlign;
+ if ( vert )
+ *vert = m_colLabelVertAlign;
}
-int wxGrid::GetColLabelTextOrientation()
+int wxGrid::GetColLabelTextOrientation() const
{
return m_colLabelTextOrientation;
}
-wxString wxGrid::GetRowLabelValue( int row )
+wxString wxGrid::GetRowLabelValue( int row ) const
{
if ( m_table )
{
}
}
-wxString wxGrid::GetColLabelValue( int col )
+wxString wxGrid::GetColLabelValue( int col ) const
{
if ( m_table )
{
}
}
-
void wxGrid::SetRowLabelSize( int width )
{
- width = wxMax( width, 0 );
+ wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE );
+
+ if ( width == wxGRID_AUTOSIZE )
+ {
+ width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW);
+ }
+
if ( width != m_rowLabelWidth )
{
if ( width == 0 )
else if ( m_rowLabelWidth == 0 )
{
m_rowLabelWin->Show( true );
- if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true );
+ if ( m_colLabelHeight > 0 )
+ m_cornerLabelWin->Show( true );
}
m_rowLabelWidth = width;
}
}
-
void wxGrid::SetColLabelSize( int height )
{
- height = wxMax( height, 0 );
+ wxASSERT( height >=0 || height == wxGRID_AUTOSIZE );
+
+ if ( height == wxGRID_AUTOSIZE )
+ {
+ height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN);
+ }
+
if ( height != m_colLabelHeight )
{
if ( height == 0 )
else if ( m_colLabelHeight == 0 )
{
m_colLabelWin->Show( true );
- if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true );
+ if ( m_rowLabelWidth > 0 )
+ m_cornerLabelWin->Show( true );
}
m_colLabelHeight = height;
}
}
-
void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
{
if ( m_labelBackgroundColour != colour )
//
void wxGrid::SetColLabelTextOrientation( int textOrientation )
{
- if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
- {
+ if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
m_colLabelTextOrientation = textOrientation;
- }
if ( !GetBatchCount() )
- {
m_colLabelWin->Refresh();
- }
}
void wxGrid::SetRowLabelValue( int row, const wxString& s )
m_table->SetRowLabelValue( row, s );
if ( !GetBatchCount() )
{
- wxRect rect = CellToRect( row, 0);
+ wxRect rect = CellToRect( row, 0 );
if ( rect.height > 0 )
{
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
}
}
-
void wxGrid::SetCellHighlightColour( const wxColour& colour )
{
if ( m_cellHighlightColour != colour )
void wxGrid::SetCellHighlightPenWidth(int width)
{
- if (m_cellHighlightPenWidth != width) {
+ if (m_cellHighlightPenWidth != width)
+ {
m_cellHighlightPenWidth = width;
// Just redrawing the cell highlight is not enough since that won't
// make any visible change if the the thickness is getting smaller.
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
- if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
+
wxRect rect = CellToRect(row, col);
m_gridWin->Refresh(true, &rect);
}
void wxGrid::SetCellHighlightROPenWidth(int width)
{
- if (m_cellHighlightROPenWidth != width) {
+ if (m_cellHighlightROPenWidth != width)
+ {
m_cellHighlightROPenWidth = width;
// Just redrawing the cell highlight is not enough since that won't
int col = m_currentCellCoords.GetCol();
if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
+
wxRect rect = CellToRect(row, col);
m_gridWin->Refresh(true, &rect);
}
}
}
-
-int wxGrid::GetDefaultRowSize()
+int wxGrid::GetDefaultRowSize() const
{
return m_defaultRowHeight;
}
-int wxGrid::GetRowSize( int row )
+int wxGrid::GetRowSize( int row ) const
{
wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
return GetRowHeight(row);
}
-int wxGrid::GetDefaultColSize()
+int wxGrid::GetDefaultColSize() const
{
return m_defaultColWidth;
}
-int wxGrid::GetColSize( int col )
+int wxGrid::GetColSize( int col ) const
{
wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
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
}
// ----------------------------------------------------------------------------
-// access to the default attrbiutes
+// access to the default attributes
// ----------------------------------------------------------------------------
-wxColour wxGrid::GetDefaultCellBackgroundColour()
+wxColour wxGrid::GetDefaultCellBackgroundColour() const
{
return m_defaultCellAttr->GetBackgroundColour();
}
-wxColour wxGrid::GetDefaultCellTextColour()
+wxColour wxGrid::GetDefaultCellTextColour() const
{
return m_defaultCellAttr->GetTextColour();
}
-wxFont wxGrid::GetDefaultCellFont()
+wxFont wxGrid::GetDefaultCellFont() const
{
return m_defaultCellAttr->GetFont();
}
-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const
{
m_defaultCellAttr->GetAlignment(horiz, vert);
}
-bool wxGrid::GetDefaultCellOverflow()
+bool wxGrid::GetDefaultCellOverflow() const
{
return m_defaultCellAttr->GetOverflow();
}
wxGridCellEditor *wxGrid::GetDefaultEditor() const
{
- return m_defaultCellAttr->GetEditor(NULL,0,0);
+ return m_defaultCellAttr->GetEditor(NULL, 0, 0);
}
// ----------------------------------------------------------------------------
// access to cell attributes
// ----------------------------------------------------------------------------
-wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+wxColour wxGrid::GetCellBackgroundColour(int row, int col) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetBackgroundColour();
attr->DecRef();
+
return colour;
}
-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxColour wxGrid::GetCellTextColour( int row, int col ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetTextColour();
attr->DecRef();
+
return colour;
}
-wxFont wxGrid::GetCellFont( int row, int col )
+wxFont wxGrid::GetCellFont( int row, int col ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxFont font = attr->GetFont();
attr->DecRef();
+
return font;
}
-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
attr->GetAlignment(horiz, vert);
attr->DecRef();
}
-bool wxGrid::GetCellOverflow( int row, int col )
+bool wxGrid::GetCellOverflow( int row, int col ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
bool allow = attr->GetOverflow();
attr->DecRef();
+
return allow;
}
-void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
attr->GetSize( num_rows, num_cols );
attr->DecRef();
}
-wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) const
{
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
return renderer;
}
-wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const
{
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
wxGridCellAttr* attr = GetCellAttr(row, col);
bool isReadOnly = attr->IsReadOnly();
attr->DecRef();
+
return isReadOnly;
}
// attribute support: cache, automatic provider creation, ...
// ----------------------------------------------------------------------------
-bool wxGrid::CanHaveAttributes()
+bool wxGrid::CanHaveAttributes() const
{
if ( !m_table )
{
#ifdef DEBUG_ATTR_CACHE
gs_nAttrCacheMisses++;
#endif
+
return false;
}
}
{
if ( !LookupAttr(row, col, &attr) )
{
- attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any)
+ attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
: (wxGridCellAttr *)NULL;
CacheAttr(row, col, attr);
}
}
+
if (attr)
{
attr->SetDefAttr(m_defaultCellAttr);
void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
{
wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
- if(!attr)
+ if (!attr)
attr = new wxGridCellAttr;
wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
attr->SetRenderer(renderer);
if ((cell_rows > 1) || (cell_rows > 1))
{
int i, j;
- for (j=row; j<row+cell_rows; j++)
+ for (j=row; j < row + cell_rows; j++)
{
- for (i=col; i<col+cell_cols; i++)
+ for (i=col; i < col + cell_cols; i++)
{
if ((i != col) || (j != row))
{
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 (j=row; j < row + num_rows; j++)
{
- for (i=col; i<col+num_cols; i++)
+ 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->SetSize( row - j, col - i );
attr_stub->DecRef();
}
}
}
-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"));
+ wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.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"));
+ wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
return NULL;
}
return m_typeRegistry->GetRenderer(index);
}
-
// ----------------------------------------------------------------------------
// row/col size
// ----------------------------------------------------------------------------
m_canDragRowSize = enable;
}
-
void wxGrid::EnableDragColSize( bool enable )
{
m_canDragColSize = enable;
wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
// See comment in SetColSize
- if ( height < GetRowMinimalAcceptableHeight()) { return; }
+ if ( height < GetRowMinimalAcceptableHeight())
+ return;
if ( m_rowHeights.IsEmpty() )
{
int diff = h - m_rowHeights[row];
m_rowHeights[row] = h;
- int i;
- for ( i = row; i < m_numRows; i++ )
+ for ( int i = row; i < m_numRows; i++ )
{
m_rowBottoms[i] += diff;
}
+
if ( !GetBatchCount() )
CalcDimensions();
}
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
{
- m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
+ // we dont allow zero default column width
+ m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 );
if ( resizeExistingCols )
{
// should we check that it's bigger than GetColMinimalWidth(col) here?
// (VZ)
// No, because it is reasonable to assume the library user know's
- // what he is doing. However whe should test against the weaker
- // constariant of minimalAcceptableWidth, as this breaks rendering
+ // what he is doing. However we should test against the weaker
+ // constraint of minimalAcceptableWidth, as this breaks rendering
//
// This test then fixes sf.net bug #645734
- if ( width < GetColMinimalAcceptableWidth()) { return; }
+ if ( width < GetColMinimalAcceptableWidth() )
+ return;
if ( m_colWidths.IsEmpty() )
{
InitColWidths();
}
- // if < 0 calc new width from label
- if( width < 0 )
+ // if < 0 then calculate new width from label
+ if ( width < 0 )
{
- long w, h;
- wxArrayString lines;
- wxClientDC dc(m_colLabelWin);
- dc.SetFont(GetLabelFont());
- StringToLines(GetColLabelValue(col), lines);
- GetTextBoxSize(dc, lines, &w, &h);
- width = w + 6;
+ long w, h;
+ wxArrayString lines;
+ wxClientDC dc(m_colLabelWin);
+ dc.SetFont(GetLabelFont());
+ StringToLines(GetColLabelValue(col), lines);
+ GetTextBoxSize(dc, lines, &w, &h);
+ width = w + 6;
}
+
int w = wxMax( 0, width );
int diff = w - m_colWidths[col];
m_colWidths[col] = w;
- int i;
- for ( i = col; i < m_numCols; i++ )
+ for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ )
{
- m_colRights[i] += diff;
+ m_colRights[GetColAt(colPos)] += diff;
}
+
if ( !GetBatchCount() )
CalcDimensions();
}
-
void wxGrid::SetColMinimalWidth( int col, int width )
{
- if (width > GetColMinimalAcceptableWidth()) {
+ if (width > GetColMinimalAcceptableWidth())
+ {
wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
m_colMinWidths[key] = width;
}
void wxGrid::SetRowMinimalHeight( int row, int width )
{
- if (width > GetRowMinimalAcceptableHeight()) {
+ if (width > GetRowMinimalAcceptableHeight())
+ {
wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
m_rowMinHeights[key] = 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;
}
{
wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
+
return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
}
void wxGrid::SetColMinimalAcceptableWidth( int width )
{
// We do allow a width of 0 since this gives us
- // an easy way to temporarily hidding columns.
- if ( width<0 )
- return;
- m_minAcceptableColWidth = width;
+ // 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 hidding rows.
- if ( height<0 )
- return;
- m_minAcceptableRowHeight = height;
-};
+ // an easy way to temporarily hiding rows.
+ if ( height >= 0 )
+ m_minAcceptableRowHeight = height;
+}
int wxGrid::GetColMinimalAcceptableWidth() const
{
// auto sizing
// ----------------------------------------------------------------------------
-void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
+void
+wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
{
+ const bool column = direction == wxGRID_COLUMN;
+
wxClientDC dc(m_gridWin);
- //Cancel editting of cell
+ // cancel editing of cell
HideCellEditControl();
SaveEditControlValue();
- // init both of them to avoid compiler warnings, even if weo nly need one
+ // 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();
}
if ( column )
{
- dc.GetTextExtent( GetColLabelValue(col), &w, &h );
- if( GetColLabelTextOrientation() == wxVERTICAL )
+ dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h );
+ if ( GetColLabelTextOrientation() == wxVERTICAL )
w = h;
}
else
- dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
+ dc.GetMultiLineTextExtent( GetRowLabelValue(row), &w, &h );
extent = column ? w : h;
if ( extent > extentMax )
- {
extentMax = extent;
- }
if ( !extentMax )
{
// empty column - give default extent (notice that if extentMax is less
- // than default extent but != 0, it's ok)
+ // than default extent but != 0, it's OK)
extentMax = column ? m_defaultColWidth : m_defaultRowHeight;
}
else
{
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;
{
int cw, ch, dummy;
m_gridWin->GetClientSize( &cw, &ch );
- wxRect rect ( CellToRect( row, 0 ) );
+ wxRect rect( CellToRect( row, 0 ) );
rect.x = 0;
CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
rect.width = m_rowLabelWidth;
m_rowLabelWin->Refresh( true, &rect );
}
}
+
if ( setAsMin )
{
if ( column )
}
}
+wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(wxGridDirection direction)
+{
+ // calculate size for the rows or columns?
+ const bool calcRows = direction == wxGRID_ROW;
+
+ wxClientDC dc(calcRows ? GetGridRowLabelWindow()
+ : GetGridColLabelWindow());
+ dc.SetFont(GetLabelFont());
+
+ // which dimension should we take into account for calculations?
+ //
+ // for columns, the text can be only horizontal so it's easy but for rows
+ // we also have to take into account the text orientation
+ const bool
+ useWidth = calcRows || (GetColLabelTextOrientation() == wxVERTICAL);
+
+ wxArrayString lines;
+ wxCoord extentMax = 0;
+
+ const int numRowsOrCols = calcRows ? m_numRows : m_numCols;
+ for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ )
+ {
+ lines.Clear();
+
+ wxString label = calcRows ? GetRowLabelValue(rowOrCol)
+ : GetColLabelValue(rowOrCol);
+ StringToLines(label, lines);
+
+ long w, h;
+ GetTextBoxSize(dc, lines, &w, &h);
+
+ const wxCoord extent = useWidth ? w : h;
+ if ( extent > extentMax )
+ extentMax = extent;
+ }
+
+ if ( !extentMax )
+ {
+ // empty column - give default extent (notice that if extentMax is less
+ // than default extent but != 0, it's OK)
+ extentMax = calcRows ? GetDefaultRowLabelSize()
+ : GetDefaultColLabelSize();
+ }
+
+ // leave some space around text (taken from AutoSizeColOrRow)
+ if ( calcRows )
+ extentMax += 10;
+ else
+ extentMax += 6;
+
+ return extentMax;
+}
+
int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
{
int width = m_rowLabelWidth;
- if ( !calcOnly )
- BeginBatch();
+ wxGridUpdateLocker locker;
+ if(!calcOnly)
+ locker.Create(this);
for ( int col = 0; col < m_numCols; col++ )
{
if ( !calcOnly )
- {
AutoSizeColumn(col, setAsMin);
- }
width += GetColWidth(col);
}
- if ( !calcOnly )
- EndBatch();
-
return width;
}
{
int height = m_colLabelHeight;
- if ( !calcOnly )
- BeginBatch();
+ wxGridUpdateLocker locker;
+ if(!calcOnly)
+ locker.Create(this);
for ( int row = 0; row < m_numRows; row++ )
{
if ( !calcOnly )
- {
AutoSizeRow(row, setAsMin);
- }
height += GetRowHeight(row);
}
- if ( !calcOnly )
- EndBatch();
-
return height;
}
void wxGrid::AutoSize()
{
- BeginBatch();
+ wxGridUpdateLocker locker(this);
- wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false));
-
- // round up the size to a multiple of scroll step - this ensures that we
- // won't get the scrollbars if we're sized exactly to this width
- // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
- // scrollbar steps
- wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
- GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);
+ // we need to round up the size of the scrollable area to a multiple of
+ // scroll step to ensure that we don't get the scrollbars when we're sized
+ // exactly to fit our contents
+ wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth,
+ SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight);
+ wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
+ GetScrollY(size.y) * GetScrollLineY());
// distribute the extra space between the columns/rows to avoid having
// extra white space
-
- // Remove the extra m_extraWidth + 1 added above
- wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+ wxCoord diff = sizeFit.x - size.x;
if ( diff && m_numCols )
{
// try to resize the columns uniformly
}
// same for rows
- diff = sizeFit.y - size.y - (m_extraHeight + 1);
+ diff = sizeFit.y - size.y;
if ( diff && m_numRows )
{
// try to resize the columns uniformly
}
}
- EndBatch();
-
- SetClientSize(sizeFit);
+ // we know that we're not going to have scrollbars so disable them now to
+ // avoid trouble in SetClientSize() which can otherwise set the correct
+ // client size but also leave space for (not needed any more) scrollbars
+ SetScrollbars(0, 0, 0, 0, 0, 0, true);
+ SetClientSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight);
}
void wxGrid::AutoSizeRowLabelSize( int row )
long w, h;
// Hide the edit control, so it
- // won't interfer with drag-shrinking.
- if( IsCellEditControlShown() )
+ // won't interfere with drag-shrinking.
+ if ( IsCellEditControlShown() )
{
HideCellEditControl();
SaveEditControlValue();
// autosize row height depending on label text
StringToLines( GetRowLabelValue( row ), lines );
wxClientDC dc( m_rowLabelWin );
- GetTextBoxSize( dc, lines, &w, &h);
- if( h < m_defaultRowHeight )
+ GetTextBoxSize( dc, lines, &w, &h );
+ if ( h < m_defaultRowHeight )
h = m_defaultRowHeight;
SetRowSize(row, h);
ForceRefresh();
long w, h;
// Hide the edit control, so it
- // won't interfer with drag-shrinking.
- if( IsCellEditControlShown() )
+ // won't interfere with drag-shrinking.
+ if ( IsCellEditControlShown() )
{
HideCellEditControl();
SaveEditControlValue();
// autosize column width depending on label text
StringToLines( GetColLabelValue( col ), lines );
wxClientDC dc( m_colLabelWin );
- if( GetColLabelTextOrientation() == wxHORIZONTAL )
- GetTextBoxSize( dc, lines, &w, &h);
+ if ( GetColLabelTextOrientation() == wxHORIZONTAL )
+ GetTextBoxSize( dc, lines, &w, &h );
else
- GetTextBoxSize( dc, lines, &h, &w);
- if( w < m_defaultColWidth )
+ GetTextBoxSize( dc, lines, &h, &w );
+ if ( w < m_defaultColWidth )
w = m_defaultColWidth;
SetColSize(col, w);
ForceRefresh();
wxSize wxGrid::DoGetBestSize() const
{
- // don't set sizes, only calculate them
wxGrid *self = (wxGrid *)this; // const_cast
- int width, height;
- width = self->SetOrCalcColumnSizes(true);
- height = self->SetOrCalcRowSizes(true);
-
- if (!width) width=100;
- if (!height) height=80;
-
- // Round up to a multiple the scroll rate NOTE: this still doesn't get rid
- // of the scrollbars, is there any magic incantaion for that?
- int xpu, ypu;
- GetScrollPixelsPerUnit(&xpu, &ypu);
- if (xpu)
- width += 1 + xpu - (width % xpu);
- if (ypu)
- height += 1 + ypu - (height % ypu);
+ // we do the same as in AutoSize() here with the exception that we don't
+ // change the column/row sizes, only calculate them
+ wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth,
+ self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight);
+ wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
+ GetScrollY(size.y) * GetScrollLineY());
- // 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;
+
+ return wxSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight)
+ + GetWindowBorderSize();
}
void wxGrid::Fit()
AutoSize();
}
-
wxPen& wxGrid::GetDividerPen() const
{
return wxNullPen;
}
}
-
-//
-// ------ Block, row and col selection
-//
+// ----------------------------------------------------------------------------
+// block, row and column selection
+// ----------------------------------------------------------------------------
void wxGrid::SelectRow( int row, bool addToSelected )
{
m_selection->SelectRow( row, false, addToSelected );
}
-
void wxGrid::SelectCol( int col, bool addToSelected )
{
if ( IsSelection() && !addToSelected )
m_selection->SelectCol( col, false, addToSelected );
}
-
void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
bool addToSelected )
{
false, addToSelected );
}
-
void wxGrid::SelectAll()
{
if ( m_numRows > 0 && m_numCols > 0 )
{
if ( m_selection )
- m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+ m_selection->SelectBlock( 0, 0, m_numRows - 1, m_numCols - 1 );
}
}
-//
-// ------ Cell, row and col deselection
-//
+// ----------------------------------------------------------------------------
+// cell, row and col deselection
+// ----------------------------------------------------------------------------
void wxGrid::DeselectRow( int row )
{
if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
{
if ( m_selection->IsInSelection(row, 0 ) )
- m_selection->ToggleCellSelection( row, 0);
+ m_selection->ToggleCellSelection(row, 0);
}
else
{
int nCols = GetNumberCols();
- for ( int i = 0; i < nCols ; i++ )
+ for ( int i = 0; i < nCols; i++ )
{
if ( m_selection->IsInSelection(row, i ) )
- m_selection->ToggleCellSelection( row, i);
+ m_selection->ToggleCellSelection(row, i);
}
}
}
if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
{
if ( m_selection->IsInSelection(0, col ) )
- m_selection->ToggleCellSelection( 0, col);
+ m_selection->ToggleCellSelection(0, col);
}
else
{
int nRows = GetNumberRows();
- for ( int i = 0; i < nRows ; i++ )
+ for ( int i = 0; i < nRows; i++ )
{
if ( m_selection->IsInSelection(i, col ) )
m_selection->ToggleCellSelection(i, col);
m_selection->ToggleCellSelection(row, col);
}
-bool wxGrid::IsSelection()
+bool wxGrid::IsSelection() const
{
return ( m_selection && (m_selection->IsSelection() ||
( m_selectingTopLeft != wxGridNoCellCoords &&
wxGridCellCoordsArray wxGrid::GetSelectedCells() const
{
- if (!m_selection) { wxGridCellCoordsArray a; return a; }
+ if (!m_selection)
+ {
+ wxGridCellCoordsArray a;
+ return a;
+ }
+
return m_selection->m_cellSelection;
}
+
wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
{
- if (!m_selection) { wxGridCellCoordsArray a; return a; }
+ if (!m_selection)
+ {
+ wxGridCellCoordsArray a;
+ return a;
+ }
+
return m_selection->m_blockSelectionTopLeft;
}
+
wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
{
- if (!m_selection) { wxGridCellCoordsArray a; return a; }
+ if (!m_selection)
+ {
+ wxGridCellCoordsArray a;
+ return a;
+ }
+
return m_selection->m_blockSelectionBottomRight;
}
+
wxArrayInt wxGrid::GetSelectedRows() const
{
- if (!m_selection) { wxArrayInt a; return a; }
+ if (!m_selection)
+ {
+ wxArrayInt a;
+ return a;
+ }
+
return m_selection->m_rowSelection;
}
+
wxArrayInt wxGrid::GetSelectedCols() const
{
- if (!m_selection) { wxArrayInt a; return a; }
+ if (!m_selection)
+ {
+ wxArrayInt a;
+ return a;
+ }
+
return m_selection->m_colSelection;
}
-
void wxGrid::ClearSelection()
{
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
+ m_selectingTopLeft =
+ m_selectingBottomRight =
+ m_selectingKeyboard = wxGridNoCellCoords;
if ( m_selection )
m_selection->ClearSelection();
}
-
// This function returns the rectangle that encloses the given block
// in device coords clipped to the client size of the grid window.
//
wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
- const wxGridCellCoords &bottomRight )
+ const wxGridCellCoords &bottomRight ) const
{
wxRect rect( wxGridNoCellRect );
wxRect cellRect;
}
else
{
- rect = wxRect( 0, 0, 0, 0 );
+ rect = wxRect(0, 0, 0, 0);
}
cellRect = CellToRect( bottomRight );
left = right;
right = i;
i = leftCol;
- leftCol=rightCol;
+ leftCol = rightCol;
rightCol = i;
}
bottomRow = i;
}
-
for ( j = topRow; j <= bottomRow; j++ )
{
for ( i = leftCol; i <= rightCol; i++ )
{
- if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol))
+ if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol))
{
cellRect = CellToRect( j, i );
if (cellRect.y + cellRect.height > bottom)
bottom = cellRect.y + cellRect.height;
}
- else i = rightCol; // jump over inner cells.
+ else
+ {
+ i = rightCol; // jump over inner cells.
+ }
}
}
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, wxNotifyEvent )
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 // wxUSE_GRID
-
projects / wxWidgets.git / blobdiff