// Created: 1/08/1999
// RCS-ID: $Id$
// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au)
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "grid.h"
-#endif
-
// For compilers that support precompilatixon, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/combobox.h"
#include "wx/valtext.h"
#include "wx/intl.h"
+ #include "wx/math.h"
#endif
#include "wx/textfile.h"
#include "wx/spinctrl.h"
#include "wx/tokenzr.h"
+#include "wx/renderer.h"
#include "wx/grid.h"
#include "wx/generic/gridsel.h"
DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_BEGIN_DRAG)
DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
void OnKeyUp( wxKeyEvent& );
+ void OnChar( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size );
- ~wxGridWindow();
+ ~wxGridWindow(){}
void ScrollWindow( int dx, int dy, const wxRect *rect );
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)
+
+ // 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()
// in these hash tables is the number of rows/columns)
static const int GRID_HASH_SIZE = 100;
+#if 0
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
{
return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
}
+#endif
// ============================================================================
// implementation
{
if (m_control)
{
- m_control->PopEventHandler(TRUE /* delete it*/);
+ m_control->PopEventHandler(true /* delete it*/);
m_control->Destroy();
m_control = NULL;
m_colBgOld = m_control->GetBackgroundColour();
m_control->SetBackgroundColour(attr->GetBackgroundColour());
+// Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
m_fontOld = m_control->GetFont();
m_control->SetFont(attr->GetFont());
-
+#endif
// can't do anything more in the base class version, the other
// attributes may only be used by the derived classes
}
m_control->SetBackgroundColour(m_colBgOld);
m_colBgOld = wxNullColour;
}
-
+// Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
if ( m_fontOld.Ok() )
{
m_control->SetFont(m_fontOld);
m_fontOld = wxNullFont;
}
+#endif
}
}
bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
{
- // accept the simple key presses, not anything with Ctrl/Alt/Meta
- return !(event.ControlDown() || event.AltDown());
+ bool ctrl = event.ControlDown();
+ bool alt = event.AltDown();
+#ifdef __WXMAC__
+ // On the Mac the Alt key is more like shift and is used for entry of
+ // valid characters, so check for Ctrl and Meta instead.
+ alt = event.MetaDown();
+#endif
+
+ // Assume it's not a valid char if ctrl or alt is down, but if both are
+ // down then it may be because of an AltGr key combination, so let them
+ // through in that case.
+ if ((ctrl || alt) && !(ctrl && alt))
+ return false;
+
+#if wxUSE_UNICODE
+ int key = event.GetUnicodeKey();
+ bool keyOk = true;
+
+ // if the unicode key code is not really a unicode character (it may
+ // be a function key or etc., the platforms appear to always give us a
+ // small value in this case) then fallback to the ascii key code but
+ // don't do anything for function keys or etc.
+ if (key <= 127)
+ {
+ key = event.GetKeyCode();
+ keyOk = (key <= 127);
+ }
+ return keyOk;
+#else // !wxUSE_UNICODE
+ int key = event.GetKeyCode();
+ if (key <= 255)
+ return true;
+ return false;
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
}
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
- bool changed = FALSE;
+ bool changed = false;
wxString value = Text()->GetValue();
if (value != m_startValue)
- changed = TRUE;
+ changed = true;
if (changed)
grid->GetTable()->SetValue(row, col, value);
bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
{
- if ( wxGridCellEditor::IsAcceptedKey(event) )
- {
- int keycode = event.GetKeyCode();
- switch ( keycode )
- {
- case WXK_NUMPAD0:
- case WXK_NUMPAD1:
- case WXK_NUMPAD2:
- case WXK_NUMPAD3:
- case WXK_NUMPAD4:
- case WXK_NUMPAD5:
- case WXK_NUMPAD6:
- case WXK_NUMPAD7:
- case WXK_NUMPAD8:
- case WXK_NUMPAD9:
- case WXK_MULTIPLY:
- case WXK_NUMPAD_MULTIPLY:
- case WXK_ADD:
- case WXK_NUMPAD_ADD:
- case WXK_SUBTRACT:
- case WXK_NUMPAD_SUBTRACT:
- case WXK_DECIMAL:
- case WXK_NUMPAD_DECIMAL:
- case WXK_DIVIDE:
- case WXK_NUMPAD_DIVIDE:
- return TRUE;
-
- default:
- // accept 8 bit chars too if isprint() agrees
- if ( (keycode < 255) && (wxIsprint(keycode)) )
- return TRUE;
- }
- }
-
- return FALSE;
+ return wxGridCellEditor::IsAcceptedKey(event);
}
void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
{
- if ( !Text()->EmulateKeyPress(event) )
+ // Since this is now happening in the EVT_CHAR event EmulateKeyPress is no
+ // longer an appropriate way to get the character into the text control.
+ // Do it ourselves instead. We know that if we get this far that we have
+ // a valid character, so not a whole lot of testing needs to be done.
+
+ wxTextCtrl* tc = Text();
+ wxChar ch;
+ long pos;
+
+#if wxUSE_UNICODE
+ ch = event.GetUnicodeKey();
+ if (ch <= 127)
+ ch = (wxChar)event.GetKeyCode();
+#else
+ ch = (wxChar)event.GetKeyCode();
+#endif
+ switch (ch)
{
- event.Skip();
+ case WXK_DELETE:
+ // delete the character at the cursor
+ pos = tc->GetInsertionPoint();
+ if (pos < tc->GetLastPosition())
+ tc->Remove(pos, pos+1);
+ break;
+
+ case WXK_BACK:
+ // delete the character before the cursor
+ pos = tc->GetInsertionPoint();
+ if (pos > 0)
+ tc->Remove(pos-1, pos);
+ break;
+
+ default:
+ tc->WriteText(ch);
+ break;
}
}
wxWindowID id,
wxEvtHandler* evtHandler)
{
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
// create a spin ctrl
- m_control = new wxSpinCtrl(parent, -1, wxEmptyString,
+ m_control = new wxSpinCtrl(parent, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS,
m_min, m_max);
wxGridCellEditor::Create(parent, id, evtHandler);
}
else
+#endif
{
// just a text control
wxGridCellTextEditor::Create(parent, id, evtHandler);
{
m_valueOld = 0;
wxString sValue = table->GetValue(row, col);
- if (! sValue.ToLong(&m_valueOld) && ! sValue.IsEmpty())
+ if (! sValue.ToLong(&m_valueOld) && ! sValue.empty())
{
wxFAIL_MSG( _T("this cell doesn't have numeric value") );
return;
}
}
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
Spin()->SetValue((int)m_valueOld);
Spin()->SetFocus();
}
else
+#endif
{
DoBeginEdit(GetString());
}
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.IsEmpty() || text.ToLong(&value)) && (value != m_valueOld);
+ changed = (text.empty() || text.ToLong(&value)) && (value != m_valueOld);
}
if ( changed )
void wxGridCellNumberEditor::Reset()
{
+#if wxUSE_SPINCTRL
if ( HasRange() )
{
Spin()->SetValue((int)m_valueOld);
}
else
+#endif
{
DoReset(GetString());
}
if ( wxGridCellEditor::IsAcceptedKey(event) )
{
int keycode = event.GetKeyCode();
- switch ( keycode )
+ if ( (keycode < 128) &&
+ (wxIsdigit(keycode) || keycode == '+' || keycode == '-'))
{
- case WXK_NUMPAD0:
- case WXK_NUMPAD1:
- case WXK_NUMPAD2:
- case WXK_NUMPAD3:
- case WXK_NUMPAD4:
- case WXK_NUMPAD5:
- case WXK_NUMPAD6:
- case WXK_NUMPAD7:
- case WXK_NUMPAD8:
- case WXK_NUMPAD9:
- case WXK_ADD:
- case WXK_NUMPAD_ADD:
- case WXK_SUBTRACT:
- case WXK_NUMPAD_SUBTRACT:
- case WXK_UP:
- case WXK_DOWN:
- return TRUE;
-
- default:
- if ( (keycode < 128) && wxIsdigit(keycode) )
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
{
+ int keycode = event.GetKeyCode();
if ( !HasRange() )
{
- int keycode = event.GetKeyCode();
- if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
- || keycode == WXK_NUMPAD0
- || keycode == WXK_NUMPAD1
- || keycode == WXK_NUMPAD2
- || keycode == WXK_NUMPAD3
- || keycode == WXK_NUMPAD4
- || keycode == WXK_NUMPAD5
- || keycode == WXK_NUMPAD6
- || keycode == WXK_NUMPAD7
- || keycode == WXK_NUMPAD8
- || keycode == WXK_NUMPAD9
- || keycode == WXK_ADD
- || keycode == WXK_NUMPAD_ADD
- || keycode == WXK_SUBTRACT
- || keycode == WXK_NUMPAD_SUBTRACT)
+ if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-')
{
wxGridCellTextEditor::StartingKey(event);
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;
}
// ----------------------------------------------------------------------------
{
m_valueOld = 0.0;
wxString sValue = table->GetValue(row, col);
- if (! sValue.ToDouble(&m_valueOld) && ! sValue.IsEmpty())
+ if (! sValue.ToDouble(&m_valueOld) && ! sValue.empty())
{
wxFAIL_MSG( _T("this cell doesn't have float value") );
return;
double value = 0.0;
wxString text(Text()->GetValue());
- if ( (text.IsEmpty() || text.ToDouble(&value)) && (value != m_valueOld) )
+ if ( (text.empty() || text.ToDouble(&value)) &&
+ !wxIsSameDouble(value, m_valueOld) )
{
if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
grid->GetTable()->SetValueAsDouble(row, col, value);
else
grid->GetTable()->SetValue(row, col, text);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void wxGridCellFloatEditor::Reset()
char tmpbuf[2];
tmpbuf[0] = (char) keycode;
tmpbuf[1] = '\0';
- bool is_decimal_point = ( wxString(tmpbuf, *wxConvCurrent) ==
- wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
- if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
- || is_decimal_point
- || keycode == WXK_NUMPAD0
- || keycode == WXK_NUMPAD1
- || keycode == WXK_NUMPAD2
- || keycode == WXK_NUMPAD3
- || keycode == WXK_NUMPAD4
- || keycode == WXK_NUMPAD5
- || keycode == WXK_NUMPAD6
- || keycode == WXK_NUMPAD7
- || keycode == WXK_NUMPAD8
- || keycode == WXK_NUMPAD9
- || keycode == WXK_ADD
- || keycode == WXK_NUMPAD_ADD
- || keycode == WXK_SUBTRACT
- || keycode == WXK_NUMPAD_SUBTRACT)
+ wxString strbuf(tmpbuf, *wxConvCurrent);
+#if wxUSE_INTL
+ bool is_decimal_point = ( strbuf ==
+ wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
+#else
+ bool is_decimal_point = ( strbuf == _T(".") );
+#endif
+ if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
+ || is_decimal_point )
{
wxGridCellTextEditor::StartingKey(event);
if ( wxGridCellEditor::IsAcceptedKey(event) )
{
int keycode = event.GetKeyCode();
- switch ( keycode )
- {
- case WXK_NUMPAD0:
- case WXK_NUMPAD1:
- case WXK_NUMPAD2:
- case WXK_NUMPAD3:
- case WXK_NUMPAD4:
- case WXK_NUMPAD5:
- case WXK_NUMPAD6:
- case WXK_NUMPAD7:
- case WXK_NUMPAD8:
- case WXK_NUMPAD9:
- case WXK_ADD:
- case WXK_NUMPAD_ADD:
- case WXK_SUBTRACT:
- case WXK_NUMPAD_SUBTRACT:
- case WXK_DECIMAL:
- case WXK_NUMPAD_DECIMAL:
- return TRUE;
-
- default:
- {
- // additionally accept 'e' as in '1e+6', also '-', '+', and '.'
- char tmpbuf[2];
- tmpbuf[0] = (char) keycode;
- tmpbuf[1] = '\0';
- bool is_decimal_point =
- ( wxString(tmpbuf, *wxConvCurrent) ==
- wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
- wxLOCALE_CAT_NUMBER) );
- if ( (keycode < 128) &&
- (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
- is_decimal_point || keycode == '+' || keycode == '-') )
- return TRUE;
- }
- }
+ printf("%d\n", keycode);
+ // accept digits, 'e' as in '1e+6', also '-', '+', and '.'
+ char tmpbuf[2];
+ tmpbuf[0] = (char) keycode;
+ tmpbuf[1] = '\0';
+ wxString strbuf(tmpbuf, *wxConvCurrent);
+#if wxUSE_INTL
+ bool is_decimal_point =
+ ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
+ wxLOCALE_CAT_NUMBER) );
+#else
+ bool is_decimal_point = ( strbuf == _T(".") );
+#endif
+ if ( (keycode < 128) &&
+ (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
+ is_decimal_point || keycode == '+' || keycode == '-') )
+ return true;
}
- return FALSE;
+ return false;
}
#endif // wxUSE_TEXTCTRL
void wxGridCellBoolEditor::SetSize(const wxRect& r)
{
- bool resize = FALSE;
+ bool resize = false;
wxSize size = m_control->GetSize();
wxCoord minSize = wxMin(r.width, r.height);
// reset to default size if it had been made smaller
size = sizeBest;
- resize = TRUE;
+ resize = true;
}
if ( size.x >= minSize || size.y >= minSize )
// leave 1 pixel margin
size.x = size.y = minSize - 2;
- resize = TRUE;
+ resize = true;
}
if ( resize )
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
- bool changed = FALSE;
+ bool changed = false;
bool value = CBox()->GetValue();
if ( value != m_startValue )
- changed = TRUE;
+ changed = true;
if ( changed )
{
int keycode = event.GetKeyCode();
switch ( keycode )
{
- case WXK_MULTIPLY:
- case WXK_NUMPAD_MULTIPLY:
- case WXK_ADD:
- case WXK_NUMPAD_ADD:
- case WXK_SUBTRACT:
- case WXK_NUMPAD_SUBTRACT:
case WXK_SPACE:
case '+':
case '-':
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
+void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event)
+{
+ int keycode = event.GetKeyCode();
+ switch ( keycode )
+ {
+ case WXK_SPACE:
+ CBox()->SetValue(!CBox()->GetValue());
+ break;
+
+ case '+':
+ CBox()->SetValue(true);
+ break;
+
+ case '-':
+ CBox()->SetValue(false);
+ break;
+ }
+}
+
+
// return the value as "1" for true and the empty string for false
wxString wxGridCellBoolEditor::GetValue() const
{
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
+ wxGridCellEditorEvtHandler* evtHandler = NULL;
+ if (m_control)
+ evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler);
+
+ // Don't immediately end if we get a kill focus event within BeginEdit
+ if (evtHandler)
+ evtHandler->SetInSetFocus(true);
+
m_startValue = grid->GetTable()->GetValue(row, col);
if (m_allowOthers)
{
// find the right position, or default to the first if not found
int pos = Combo()->FindString(m_startValue);
- if (pos == -1)
+ if (pos == wxNOT_FOUND)
pos = 0;
Combo()->SetSelection(pos);
}
Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
+
+ if (evtHandler)
+ evtHandler->SetInSetFocus(false);
}
bool wxGridCellChoiceEditor::EndEdit(int row, int col,
wxGrid* grid)
{
wxString value = Combo()->GetValue();
- bool changed = value != m_startValue;
+ if ( value == m_startValue )
+ return false;
- if ( changed )
- grid->GetTable()->SetValue(row, col, value);
+ grid->GetTable()->SetValue(row, col, value);
- m_startValue = wxEmptyString;
- if (m_allowOthers)
- Combo()->SetValue(m_startValue);
- else
- Combo()->SetSelection(0);
-
- return changed;
+ return true;
}
void wxGridCellChoiceEditor::Reset()
// 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();
}
// grey out fields if the grid is disabled
if( grid.IsEnabled() )
{
- if ( isSelected )
- {
- dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
- }
- else
- {
- dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
- }
+ if ( isSelected )
+ {
+ dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ }
+ else
+ {
+ dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ }
}
else
{
- dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
+ dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
}
dc.SetPen( *wxTRANSPARENT_PEN );
// wxGridCellStringRenderer
// ----------------------------------------------------------------------------
-void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
- wxGridCellAttr& attr,
+void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
+ const wxGridCellAttr& attr,
wxDC& dc,
bool isSelected)
{
}
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 i, c_cols, c_rows;
for (i = col+cell_cols; i < cols; i++)
{
- bool is_empty = TRUE;
+ bool is_empty = true;
for (int j=row; j<row+cell_rows; j++)
{
// check w/ anchor cell for multicell block
if (c_rows > 0) c_rows = 0;
if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
{
- is_empty = FALSE;
+ is_empty = false;
break;
}
}
// 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();
if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
{
val = table->GetValueAsDouble(row, col);
- hasDouble = TRUE;
+ hasDouble = true;
}
else
{
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());
- }
-
+ }
}
}
}
if ( !ms_sizeCheckMark.x )
{
// get checkbox size
- wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
+ wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString);
wxSize size = checkbox->GetBestSize();
wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
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
else
{
// ...or remove the attribute
- m_attrs.RemoveAt((size_t)n);
+ // No need to DecRef the attribute itself since this is
+ // done be wxGridCellWithAttr's destructor!
+ m_attrs.RemoveAt(n);
n--; count--;
}
}
else
{
// ...or remove the attribute
- m_attrs.RemoveAt((size_t)n);
+ // No need to DecRef the attribute itself since this is
+ // done be wxGridCellWithAttr's destructor!
+ m_attrs.RemoveAt(n);
n--; count--;
}
}
rowOrCol += numRowsOrCols;
else
{
- m_rowsOrCols.RemoveAt((size_t)n);
- m_attrs.RemoveAt((size_t)n);
+ m_rowsOrCols.RemoveAt(n);
+ m_attrs[n]->DecRef();
+ m_attrs.RemoveAt(n);
n--; count--;
}
}
wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
- if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){
- // Two or move are non NULL
+ if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){
+ // Two or more are non NULL
attr = new wxGridCellAttr;
attr->SetKind(wxGridCellAttr::Merged);
//m_data->m_mergeAttr.SetAttr(attr, row, col);
}
else
- {
+ {
// one or none is non null return it or null.
if(attrrow) attr = attrrow;
- if(attrcol) attr = attrcol;
- if(attrcell) attr = attrcell;
+ if(attrcol)
+ {
+ if(attr)
+ attr->DecRef();
+ attr = attrcol;
+ }
+ if(attrcell)
+ {
+ if(attr)
+ attr->DecRef();
+ attr = attrcell;
+ }
}
}
break;
attr = m_data->m_cellAttrs.GetAttr(row, col);
break;
case (wxGridCellAttr::Col):
- attr = m_data->m_colAttrs.GetAttr(col);
+ attr = m_data->m_colAttrs.GetAttr(col);
break;
case (wxGridCellAttr::Row):
- attr = m_data->m_rowAttrs.GetAttr(row);
+ attr = m_data->m_rowAttrs.GetAttr(row);
break;
default:
// unused as yet...
// use the default attr provider by default
SetAttrProvider(new wxGridCellAttrProvider);
}
- return TRUE;
+ return true;
}
wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind)
return (wxGridCellAttr *)NULL;
}
+
void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
{
if ( m_attrProvider )
{
wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
- return FALSE;
+ return false;
}
bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
{
wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
- return FALSE;
+ return false;
}
bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
{
wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
- return FALSE;
+ return false;
}
bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
{
wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
- return FALSE;
+ return false;
}
bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
{
wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
- return FALSE;
+ return false;
}
bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
{
wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
- return FALSE;
+ return false;
}
bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
{
- return FALSE;
+ return false;
}
void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::AppendRows( size_t numRows )
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
(unsigned long)curNumRows
) );
- return FALSE;
+ return false;
}
if ( numRows > curNumRows - pos )
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::AppendCols( size_t numCols )
// TODO: something better than this ?
//
wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
- return FALSE;
+ return false;
}
#endif
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
(unsigned long)numCols,
(unsigned long)curNumCols
) );
- return FALSE;
+ return false;
}
if ( numCols > curNumCols - pos )
GetView()->ProcessTableMessage( msg );
}
- return TRUE;
+ return true;
}
wxString wxGridStringTable::GetRowLabelValue( int row )
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,
if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
+void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
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,
if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
+void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
//////////////////////////////////////////////////////////////////////
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,
int client_width = 0;
GetClientSize( &client_width, &client_height );
+ // VZ: any reason for this ifdef? (FIXME)
+#ifdef __WXGTK__
+ wxRect rect;
+ rect.SetX( 1 );
+ rect.SetY( 1 );
+ rect.SetWidth( client_width - 2 );
+ rect.SetHeight( client_height - 2 );
+
+ wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
+#else // !__WXGTK__
dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( 1, 1, client_width-1, 1 );
dc.DrawLine( 1, 1, 1, client_height-1 );
+#endif // __WXGTK__/!__WXGTK__
}
if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
+void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
//////////////////////////////////////////////////////////////////////
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 )
}
-wxGridWindow::~wxGridWindow()
-{
-}
-
-
void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
wxPaintDC dc( this );
void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
{
+ if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
+ SetFocus();
+
m_owner->ProcessGridCellMouseEvent( event );
}
if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
}
+void wxGridWindow::OnChar( wxKeyEvent& event )
+{
+ if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+}
+
void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
{
}
#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
m_minAcceptableColWidth, \
- m_colRights, m_numCols, TRUE)
+ m_colRights, m_numCols, true)
#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
m_minAcceptableRowHeight, \
- m_rowBottoms, m_numRows, TRUE)
+ m_rowBottoms, m_numRows, true)
/////////////////////////////////////////////////////////////////////
#if wxUSE_EXTENDED_RTTI
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxBEGIN_HANDLERS_TABLE(wxGrid)
wxEND_HANDLERS_TABLE()
-wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
/*
- TODO : Expose more information of a list's layout etc. via appropriate objects (Ã la NotebookPageInfo)
+ TODO : Expose more information of a list's layout etc. via appropriate objects (\81Ã la 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()
m_rowMinHeights(GRID_HASH_SIZE)
{
Create();
+ SetBestFittingSize(size);
}
bool wxGrid::Create(wxWindow *parent, wxWindowID id,
{
if (!wxScrolledWindow::Create(parent, id, pos, size,
style | wxWANTS_CHARS , name))
- return FALSE;
+ return false;
m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
Create() ;
+ SetBestFittingSize(size);
-
- return TRUE;
+ return true;
}
void wxGrid::Create()
{
- m_created = FALSE; // set to TRUE by CreateGrid
+ m_created = false; // set to true by CreateGrid
m_table = (wxGridTableBase *) NULL;
- m_ownTable = FALSE;
+ m_ownTable = false;
- m_cellEditCtrlEnabled = FALSE;
+ m_cellEditCtrlEnabled = false;
m_defaultCellAttr = new wxGridCellAttr();
m_defaultCellAttr->SetTextColour(gva.colFg);
m_defaultCellAttr->SetBackgroundColour(gva.colBg);
-
+
#else
m_defaultCellAttr->SetTextColour(
wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
// subwindow components that make up the wxGrid
m_cornerLabelWin = new wxGridCornerLabelWindow( this,
- -1,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
m_rowLabelWin = new wxGridRowLabelWindow( this,
- -1,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
m_colLabelWin = new wxGridColLabelWindow( this,
- -1,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
m_gridWin = new wxGridWindow( this,
m_rowLabelWin,
m_colLabelWin,
- -1,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
#endif
- m_cornerLabelWin->SetDefaultForegroundColour(lfg);
- m_cornerLabelWin->SetDefaultBackgroundColour(lbg);
- m_rowLabelWin->SetDefaultForegroundColour(lfg);
- m_rowLabelWin->SetDefaultBackgroundColour(lbg);
- m_colLabelWin->SetDefaultForegroundColour(lfg);
- m_colLabelWin->SetDefaultBackgroundColour(lbg);
-
- m_gridWin->SetDefaultForegroundColour(gfg);
- m_gridWin->SetDefaultBackgroundColour(gbg);
-
+ m_cornerLabelWin->SetOwnForegroundColour(lfg);
+ m_cornerLabelWin->SetOwnBackgroundColour(lbg);
+ m_rowLabelWin->SetOwnForegroundColour(lfg);
+ m_rowLabelWin->SetOwnBackgroundColour(lbg);
+ m_colLabelWin->SetOwnForegroundColour(lfg);
+ m_colLabelWin->SetOwnBackgroundColour(lbg);
+
+ m_gridWin->SetOwnForegroundColour(gfg);
+ m_gridWin->SetOwnBackgroundColour(gbg);
+
Init();
}
wxGrid::wxGridSelectionModes selmode )
{
wxCHECK_MSG( !m_created,
- FALSE,
+ false,
wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
m_numRows = numRows;
m_table = new wxGridStringTable( m_numRows, m_numCols );
m_table->SetView( this );
- m_ownTable = TRUE;
+ m_ownTable = true;
m_selection = new wxGridSelection( this, selmode );
CalcDimensions();
- m_created = TRUE;
+ m_created = true;
return m_created;
}
if ( m_created )
{
// stop all processing
- m_created = FALSE;
+ m_created = false;
if (m_ownTable)
{
m_table = table;
m_table->SetView( this );
if (takeOwnership)
- m_ownTable = TRUE;
+ m_ownTable = true;
m_selection = new wxGridSelection( this, selmode );
CalcDimensions();
- m_created = TRUE;
+ m_created = true;
}
return m_created;
#endif
m_gridLineColour = wxColour( 192,192,192 );
- m_gridLinesEnabled = TRUE;
+ m_gridLinesEnabled = true;
m_cellHighlightColour = *wxBLACK;
m_cellHighlightPenWidth = 2;
m_cellHighlightROPenWidth = 1;
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_winCapture = (wxWindow *)NULL;
- m_canDragRowSize = TRUE;
- m_canDragColSize = TRUE;
- m_canDragGridSize = TRUE;
+ m_canDragRowSize = true;
+ m_canDragColSize = true;
+ m_canDragGridSize = true;
+ m_canDragCell = false;
m_dragLastPos = -1;
m_dragRowOrCol = -1;
- m_isDragging = FALSE;
+ m_isDragging = false;
m_startDragPos = wxDefaultPosition;
- m_waitForSlowClick = FALSE;
+ m_waitForSlowClick = false;
m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
- m_editable = TRUE; // default for whole grid
+ m_editable = true; // default for whole grid
- m_inOnKeyDown = FALSE;
+ m_inOnKeyDown = false;
m_batchCount = 0;
m_extraWidth =
m_extraHeight = 0;
+
+ m_scrollLineX = GRID_SCROLL_LINE_X;
+ m_scrollLineY = GRID_SCROLL_LINE_Y;
}
// ----------------------------------------------------------------------------
y = wxMax( h - 1, 0 );
// do set scrollbar parameters
- SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
+ SetScrollbars( m_scrollLineX, m_scrollLineY,
GetScrollX(w), GetScrollY(h), x, y,
GetBatchCount() != 0);
int cw, ch;
GetClientSize( &cw, &ch );
- if ( m_cornerLabelWin->IsShown() )
+ if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
- if ( m_colLabelWin->IsShown() )
+ if ( m_colLabelWin && m_colLabelWin->IsShown() )
m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
- if ( m_rowLabelWin->IsShown() )
+ if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
- if ( m_gridWin->IsShown() )
+ if ( m_gridWin && m_gridWin->IsShown() )
m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
}
bool wxGrid::Redimension( wxGridTableMessage& msg )
{
int i;
- bool result = FALSE;
+ bool result = false;
// Clear the attribute cache as the attribute might refer to a different
// cell than stored in the cache after adding/removing rows/columns.
m_rowLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
m_rowLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
m_rowLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
m_colLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
case wxGRIDTABLE_NOTIFY_COLS_DELETED:
m_colLabelWin->Refresh();
}
}
- result = TRUE;
+ result = true;
break;
}
rowlabels.Add( row );
}
- iter++ ;
+ ++iter;
}
return rowlabels;
colLabels.Add( col );
}
- iter++ ;
+ ++iter;
}
return colLabels;
}
}
}
- iter++;
+ ++iter;
}
return cellsExposed;
{
if (!m_isDragging)
{
- m_isDragging = TRUE;
+ m_isDragging = true;
m_rowLabelWin->CaptureMouse();
}
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();
- m_isDragging = FALSE;
+ m_isDragging = false;
}
// ------------ Entering or leaving the window
{
row = YToRow(y);
if ( row >=0 &&
- !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
- {
+ !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+ {
// no default action at the moment
- }
+ }
}
else
{
{
row = YToRow(y);
if ( row >=0 &&
- !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
{
// no default action at the moment
}
{
row = YToRow(y);
if ( row >= 0 &&
- !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
{
// no default action at the moment
}
{
// don't capture the mouse yet
if ( CanDragRowSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, false);
}
}
else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, false);
}
}
}
{
if (!m_isDragging)
{
- m_isDragging = TRUE;
+ m_isDragging = true;
m_colLabelWin->CaptureMouse();
}
break;
case WXGRID_CURSOR_SELECT_COL:
+ {
if ( (col = XToCol( x )) >= 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_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
- m_isDragging = FALSE;
+ m_isDragging = false;
}
// ------------ Entering or leaving the window
if ( col >= 0 &&
! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
{
- // no default action at the moment
+ // no default action at the moment
}
}
else
{
col = XToCol(x);
if ( col >= 0 &&
- !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
{
// no default action at the moment
}
{
col = XToCol(x);
if ( col >= 0 &&
- !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+ !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
{
// no default action at the moment
}
{
// don't capture the cursor yet
if ( CanDragColSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, false);
}
}
else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, false);
}
}
}
XYToCell( x, y, coords );
int cell_rows, cell_cols;
+ bool isFirstDrag = !m_isDragging;
GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
if ((cell_rows < 0) || (cell_cols < 0))
{
return;
}
- m_isDragging = TRUE;
+ m_isDragging = true;
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
// Hide the edit control, so it
m_selectingKeyboard = coords;
HighlightBlock ( m_selectingKeyboard, coords );
}
+ else if ( CanDragCell() )
+ {
+ if ( isFirstDrag )
+ {
+ if ( m_selectingKeyboard == wxGridNoCellCoords)
+ m_selectingKeyboard = coords;
+
+ SendEvent( wxEVT_GRID_CELL_BEGIN_DRAG,
+ coords.GetRow(),
+ coords.GetCol(),
+ event );
+ }
+ }
else
{
if ( !IsSelection() )
return;
}
- m_isDragging = FALSE;
+ m_isDragging = false;
m_startDragPos = wxDefaultPosition;
// VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
{
- SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event );
+ if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ // we want double click to select a cell and start editing
+ // (i.e. to behave in same way as sequence of two slow clicks):
+ m_waitForSlowClick = true;
+ }
}
+
}
editor->DecRef();
attr->DecRef();
- m_waitForSlowClick = FALSE;
+ m_waitForSlowClick = false;
}
else if ( m_selectingTopLeft != wxGridNoCellCoords &&
m_selectingBottomRight != wxGridNoCellCoords )
CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
rect.width = m_rowLabelWidth;
rect.height = ch - rect.y;
- m_rowLabelWin->Refresh( TRUE, &rect );
+ m_rowLabelWin->Refresh( true, &rect );
rect.width = cw;
// if there is a multicell block, paint all of it
if (m_table)
rect.height = ch - rect.y;
}
}
- m_gridWin->Refresh( FALSE, &rect );
+ m_gridWin->Refresh( false, &rect );
}
ShowCellEditControl();
CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
rect.width = cw - rect.x;
rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( TRUE, &rect );
+ m_colLabelWin->Refresh( true, &rect );
rect.height = ch;
// if there is a multicell block, paint all of it
if (m_table)
rect.width = cw - rect.x;
}
}
- m_gridWin->Refresh( FALSE, &rect );
+ m_gridWin->Refresh( false, &rect );
}
ShowCellEditControl();
return Redimension( msg );
default:
- return FALSE;
+ return false;
}
}
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
// the table will have sent the results of the insert row
// operation to this view object as a grid table message
}
- return FALSE;
+ return false;
}
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
// the table will have sent the results of the append row
// operation to this view object as a grid table message
}
- return FALSE;
+ return false;
}
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
// the table will have sent the results of the delete row
// operation to this view object as a grid table message
}
- return FALSE;
+ return false;
}
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
// the table will have sent the results of the insert col
// operation to this view object as a grid table message
}
- return FALSE;
+ return false;
}
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
// the table will have sent the results of the append col
// operation to this view object as a grid table message
}
- return FALSE;
+ return false;
}
if ( !m_created )
{
wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
- return FALSE;
+ return false;
}
if ( m_table )
// the table will have sent the results of the delete col
// operation to this view object as a grid table message
}
- return FALSE;
+ return false;
}
this,
m_selectingTopLeft,
m_selectingBottomRight,
- TRUE,
+ true,
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
row, col,
mouseEv.GetX() + GetRowLabelSize(),
mouseEv.GetY() + GetColLabelSize(),
- FALSE,
+ false,
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
}
- m_inOnKeyDown = TRUE;
+ m_inOnKeyDown = true;
// propagate the event up and see if it gets processed
//
{
if ( GetGridCursorCol() > 0 )
{
- MoveCursorLeft( FALSE );
+ MoveCursorLeft( false );
}
else
{
{
if ( GetGridCursorCol() < GetNumberCols()-1 )
{
- MoveCursorRight( FALSE );
+ MoveCursorRight( false );
}
else
{
}
if ( !IsEditable() )
{
- MoveCursorRight( FALSE );
+ MoveCursorRight( false );
break;
}
// Otherwise fall through to default
default:
- // is it possible to edit the current cell at all?
- if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
- {
- // yes, now check whether the cells editor accepts the key
- int row = m_currentCellCoords.GetRow();
- int col = m_currentCellCoords.GetCol();
- wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellEditor *editor = attr->GetEditor(this, row, col);
-
- // <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();
- }
+ event.Skip();
break;
}
}
- m_inOnKeyDown = FALSE;
+ m_inOnKeyDown = false;
}
void wxGrid::OnKeyUp( wxKeyEvent& event )
m_selectingBottomRight.GetRow(),
m_selectingBottomRight.GetCol(),
event.ControlDown(),
- TRUE,
+ 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&)
{
}
{
DisableCellEditControl();
- if ( IsVisible( m_currentCellCoords, FALSE ) )
+ if ( IsVisible( m_currentCellCoords, false ) )
{
wxRect r;
r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
wxRect rect;
rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
wxGridCellCoords ( bottomRow, rightCol ) );
- m_gridWin->Refresh( FALSE, &rect );
+ m_gridWin->Refresh( false, &rect );
}
// Now handle changing an existing selection area.
else if ( m_selectingTopLeft != updateTopLeft ||
need_refresh[0] =
need_refresh[1] =
need_refresh[2] =
- need_refresh[3] = FALSE;
+ need_refresh[3] = false;
int i;
// Store intermediate values
{
// Refresh the newly selected or deselected
// area to the left of the old or new selection.
- need_refresh[0] = TRUE;
+ need_refresh[0] = true;
rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
oldLeft ),
wxGridCellCoords ( oldBottom,
{
// Refresh the newly selected or deselected
// area above the old or new selection.
- need_refresh[1] = TRUE;
+ need_refresh[1] = true;
rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
leftCol ),
wxGridCellCoords ( topRow - 1,
{
// Refresh the newly selected or deselected
// area to the right of the old or new selection.
- need_refresh[2] = TRUE;
+ need_refresh[2] = true;
rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
rightCol + 1 ),
wxGridCellCoords ( oldBottom,
{
// Refresh the newly selected or deselected
// area below the old or new selection.
- need_refresh[3] = TRUE;
+ need_refresh[3] = true;
rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
leftCol ),
wxGridCellCoords ( oldBottom,
// various Refresh() calls
for (i = 0; i < 4; i++ )
if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
+ m_gridWin->Refresh( false, &(rect[i]) );
}
// Change Selection
m_selectingTopLeft = updateTopLeft;
// all we need to do is repaint the grid
//
m_gridWin->Refresh();
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
}
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
if ( cell_rows <= 0 || cell_cols <= 0 )
{
wxGridCellCoords cell(row+cell_rows, col+cell_cols);
- bool marked = FALSE;
+ bool marked = false;
for ( int j = 0; j < numCells; j++ )
{
if ( cell == cells[j] )
{
- marked = TRUE;
+ marked = true;
break;
}
}
{
if ( cell == redrawCells[j] )
{
- marked = TRUE;
+ marked = true;
break;
}
}
if (GetCellOverflow(row+l, j))
{
wxGridCellCoords cell(row+l, j);
- bool marked = FALSE;
+ bool marked = false;
for (int k = 0; k < numCells; k++)
{
if ( cell == cells[k] )
{
- marked = TRUE;
+ marked = true;
break;
}
}
{
if ( cell == redrawCells[k] )
{
- marked = TRUE;
+ marked = true;
break;
}
}
int topRow = internalYToRow(top);
int rightCol = internalXToCol(right);
int bottomRow = internalYToRow(bottom);
- wxRegion clippedcells(0, 0, cw, ch);
+#ifndef __WXMAC__
+ // CS: I don't know why suddenly unscrolled coordinates are used for clipping
+ wxRegion clippedcells(0, 0, cw, ch);
int i, j, cell_rows, cell_cols;
wxRect rect;
}
}
}
+#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) );
void wxGrid::DrawRowLabel( wxDC& dc, int row )
{
- if ( GetRowHeight(row) <= 0 )
+ if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 )
return;
+ wxRect rect;
+#ifdef __WXGTK20__
+ rect.SetX( 1 );
+ rect.SetY( GetRowTop(row) + 1 );
+ rect.SetWidth( m_rowLabelWidth - 2 );
+ rect.SetHeight( GetRowHeight(row) - 2 );
+
+ CalcScrolledPosition( 0, rect.y, NULL, &rect.y );
+
+ wxWindowDC *win_dc = (wxWindowDC*) &dc;
+
+ wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
+#else
int rowTop = GetRowTop(row),
rowBottom = GetRowBottom(row) - 1;
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( 1, rowTop, 1, rowBottom );
dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );
-
+#endif
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
int hAlign, vAlign;
GetRowLabelAlignment( &hAlign, &vAlign );
- wxRect rect;
rect.SetX( 2 );
rect.SetY( GetRowTop(row) + 2 );
rect.SetWidth( m_rowLabelWidth - 4 );
void wxGrid::DrawColLabel( wxDC& dc, int col )
{
- if ( GetColWidth(col) <= 0 )
+ if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 )
return;
- int colLeft = GetColLeft(col),
- colRight = GetColRight(col) - 1;
+ int colLeft = GetColLeft(col);
+
+ wxRect rect;
+#ifdef __WXGTK20__
+ rect.SetX( colLeft + 1 );
+ rect.SetY( 1 );
+ rect.SetWidth( GetColWidth(col) - 2 );
+ rect.SetHeight( m_colLabelHeight - 2 );
+
+ wxWindowDC *win_dc = (wxWindowDC*) &dc;
+
+ wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
+#else
+ int colRight = GetColRight(col) - 1;
dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );
dc.DrawLine( colRight, 0,
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
dc.DrawLine( colLeft, 1, colRight, 1 );
-
+#endif
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
GetColLabelAlignment( &hAlign, &vAlign );
orient = GetColLabelTextOrientation();
- wxRect rect;
rect.SetX( colLeft + 2 );
rect.SetY( 2 );
rect.SetWidth( GetColWidth(col) - 4 );
}
-void wxGrid::GetTextBoxSize( wxDC& dc,
+void wxGrid::GetTextBoxSize( const wxDC& dc,
const wxArrayString& lines,
long *width, long *height )
{
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
{
return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
!IsCurrentCellReadOnly();
-
+
}
bool wxGrid::IsCellEditControlEnabled() const
{
// the cell edit control might be disable for all cells or just for the
// current one if it's read only
- return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
+ return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : false;
}
bool wxGrid::IsCellEditControlShown() const
{
- bool isShown = FALSE;
+ bool isShown = false;
if ( m_cellEditCtrlEnabled )
{
{
if ( !IsVisible( m_currentCellCoords ) )
{
- m_cellEditCtrlEnabled = FALSE;
+ m_cellEditCtrlEnabled = false;
return;
}
else
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
if ( !editor->IsCreated() )
{
- editor->Create(m_gridWin, -1,
+ editor->Create(m_gridWin, wxID_ANY,
new wxGridCellEditorEvtHandler(this, editor));
wxGridEditorCreatedEvent evt(GetId(),
editor->SetCellAttr(attr);
editor->SetSize( rect );
- editor->Show( TRUE, attr );
+ editor->Show( true, attr );
// recalc dimensions in case we need to
// expand the scrolled window to account for editor
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor *editor = attr->GetEditor(this, row, col);
- editor->Show( FALSE );
+ editor->Show( false );
editor->DecRef();
attr->DecRef();
+
m_gridWin->SetFocus();
+
// refresh whole row to the right
wxRect rect( CellToRect(row, col) );
CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;
- m_gridWin->Refresh( FALSE, &rect );
+#ifdef __WXMAC__
+ // ensure that the pixels under the focus ring get refreshed as well
+ rect.Inflate(10,10);
+#endif
+ m_gridWin->Refresh( false, &rect );
}
}
int wxGrid::YToRow( int y )
{
return CoordToRowOrCol(y, m_defaultRowHeight,
- m_minAcceptableRowHeight, m_rowBottoms, m_numRows, FALSE);
+ m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
}
int wxGrid::XToCol( int x )
{
return CoordToRowOrCol(x, m_defaultColWidth,
- m_minAcceptableColWidth, m_colRights, m_numCols, FALSE);
+ m_minAcceptableColWidth, m_colRights, m_numCols, false);
}
//
// Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
// scroll unit...
- ypos += GRID_SCROLL_LINE_Y;
+ ypos += m_scrollLineY;
}
if ( left < 0 )
xpos = x0 + (right - cw);
// see comment for ypos above
- xpos += GRID_SCROLL_LINE_X;
+ xpos += m_scrollLineX;
}
if ( xpos != -1 || ypos != -1 )
{
if ( xpos != -1 )
- xpos /= GRID_SCROLL_LINE_X;
+ xpos /= m_scrollLineX;
if ( ypos != -1 )
- ypos /= GRID_SCROLL_LINE_Y;
+ ypos /= m_scrollLineY;
Scroll( xpos, ypos );
AdjustScrollbars();
}
m_currentCellCoords.GetCol() );
}
else
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
- return FALSE;
+ return false;
}
m_currentCellCoords.GetCol() );
}
else
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
- return FALSE;
+ return false;
}
m_currentCellCoords.GetCol() - 1 );
}
else
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
- return FALSE;
+ return false;
}
m_currentCellCoords.GetCol() + 1 );
}
else
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MovePageUp()
{
- if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+ if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
int row = m_currentCellCoords.GetRow();
if ( row > 0 )
if ( newRow == row )
{
- //row > 0 , so newrow can never be less than 0 here.
+ //row > 0 , so newrow can never be less than 0 here.
newRow = row - 1;
}
MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MovePageDown()
{
- if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+ if ( m_currentCellCoords == wxGridNoCellCoords ) return false;
int row = m_currentCellCoords.GetRow();
if ( (row+1) < m_numRows )
if ( newRow == row )
{
// row < m_numRows , so newrow can't overflow here.
- newRow = row + 1;
+ newRow = row + 1;
}
MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorUpBlock( bool expandSelection )
ClearSelection();
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorDownBlock( bool expandSelection )
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGrid::MoveCursorRightBlock( bool expandSelection )
SetCurrentCell( row, col );
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
{
if ( width == 0 )
{
- m_rowLabelWin->Show( FALSE );
- m_cornerLabelWin->Show( FALSE );
+ m_rowLabelWin->Show( false );
+ m_cornerLabelWin->Show( false );
}
else if ( m_rowLabelWidth == 0 )
{
- m_rowLabelWin->Show( TRUE );
- if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE );
+ m_rowLabelWin->Show( true );
+ if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true );
}
m_rowLabelWidth = width;
CalcWindowSizes();
- wxScrolledWindow::Refresh( TRUE );
+ wxScrolledWindow::Refresh( true );
}
}
{
if ( height == 0 )
{
- m_colLabelWin->Show( FALSE );
- m_cornerLabelWin->Show( FALSE );
+ m_colLabelWin->Show( false );
+ m_cornerLabelWin->Show( false );
}
else if ( m_colLabelHeight == 0 )
{
- m_colLabelWin->Show( TRUE );
- if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE );
+ m_colLabelWin->Show( true );
+ if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true );
}
m_colLabelHeight = height;
CalcWindowSizes();
- wxScrolledWindow::Refresh( TRUE );
+ wxScrolledWindow::Refresh( true );
}
}
}
}
-// Note: under MSW, the default column label font must be changed because it
-// does not support vertical printing
+// Note: under MSW, the default column label font must be changed because it
+// does not support vertical printing
//
// Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD);
-// pGrid->SetLabelFont(font);
-// pGrid->SetColLabelTextOrientation(wxVERTICAL);
+// pGrid->SetLabelFont(font);
+// pGrid->SetColLabelTextOrientation(wxVERTICAL);
//
void wxGrid::SetColLabelTextOrientation( int textOrientation )
{
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
rect.x = 0;
rect.width = m_rowLabelWidth;
- m_rowLabelWin->Refresh( TRUE, &rect );
+ m_rowLabelWin->Refresh( true, &rect );
}
}
}
CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
rect.y = 0;
rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( TRUE, &rect );
+ m_colLabelWin->Refresh( true, &rect );
}
}
}
if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
wxRect rect = CellToRect(row, col);
- m_gridWin->Refresh(TRUE, &rect);
+ m_gridWin->Refresh(true, &rect);
}
}
if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
wxRect rect = CellToRect(row, col);
- m_gridWin->Refresh(TRUE, &rect);
+ m_gridWin->Refresh(true, &rect);
}
}
m_defaultCellAttr->SetFont(font);
}
+
+// For editors and renderers the type registry takes precedence over the
+// default attr, so we need to register the new editor/renderer for the string
+// data type in order to make setting a default editor/renderer appear to
+// work correctly.
+
void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
{
- m_defaultCellAttr->SetRenderer(renderer);
+ RegisterDataType(wxGRID_VALUE_STRING,
+ renderer,
+ GetDefaultEditorForType(wxGRID_VALUE_STRING));
}
void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
{
- m_defaultCellAttr->SetEditor(editor);
+ RegisterDataType(wxGRID_VALUE_STRING,
+ GetDefaultRendererForType(wxGRID_VALUE_STRING),
+ editor);
}
// ----------------------------------------------------------------------------
{
if ( !m_table )
{
- return FALSE;
+ return false;
}
return m_table->CanHaveAttributes();
gs_nAttrCacheHits++;
#endif
- return TRUE;
+ return true;
}
else
{
#ifdef DEBUG_ATTR_CACHE
gs_nAttrCacheMisses++;
#endif
- return FALSE;
+ return false;
}
}
wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
{
wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ bool canHave = ((wxGrid*)this)->CanHaveAttributes();
- wxCHECK_MSG( m_table, attr,
- _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
+ wxCHECK_MSG( canHave, attr, _T("Cell attributes not allowed"));
+ wxCHECK_MSG( m_table, attr, _T("must have a table") );
attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
if ( !attr )
m_canDragGridSize = enable;
}
+void wxGrid::EnableDragCell( bool enable )
+{
+ m_canDragCell = enable;
+}
void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
{
void wxGrid::SetColMinimalWidth( int col, int width )
{
if (width > GetColMinimalAcceptableWidth()) {
- m_colMinWidths[col] = width;
+ wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+ m_colMinWidths[key] = width;
}
}
void wxGrid::SetRowMinimalHeight( int row, int width )
{
if (width > GetRowMinimalAcceptableHeight()) {
- m_rowMinHeights[row] = width;
+ wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+ m_rowMinHeights[key] = width;
}
}
int wxGrid::GetColMinimalWidth(int col) const
{
- wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(col);
+ wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+ wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
}
int wxGrid::GetRowMinimalHeight(int row) const
{
- wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(row);
+ wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+ wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
}
if ( height<0 )
return;
m_minAcceptableRowHeight = height;
-};
+}
int wxGrid::GetColMinimalAcceptableWidth() const
{
CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
rect.width = cw - rect.x;
rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( TRUE, &rect );
+ m_colLabelWin->Refresh( true, &rect );
}
}
else
CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
rect.width = m_rowLabelWidth;
rect.height = ch - rect.y;
- m_rowLabelWin->Refresh( TRUE, &rect );
+ m_rowLabelWin->Refresh( true, &rect );
}
}
if ( setAsMin )
{
BeginBatch();
- wxSize size(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+ wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false));
// round up the size to a multiple of scroll step - this ensures that we
// won't get the scrollbars if we're sized exactly to this width
// CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
// scrollbar steps
- wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
- GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);
+ wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * m_scrollLineX,
+ GetScrollY(size.y + m_extraHeight + 1) * m_scrollLineY);
// distribute the extra space between the columns/rows to avoid having
// extra white space
wxGrid *self = (wxGrid *)this; // const_cast
int width, height;
- width = self->SetOrCalcColumnSizes(TRUE);
- height = self->SetOrCalcRowSizes(TRUE);
-
+ width = self->SetOrCalcColumnSizes(true);
+ height = self->SetOrCalcRowSizes(true);
+
+ if (!width) width=100;
+ if (!height) height=80;
+
+ // Round up to a multiple the scroll rate NOTE: this still doesn't get rid
+ // of the scrollbars, is there any magic incantaion for that?
+ int xpu, ypu;
+ GetScrollPixelsPerUnit(&xpu, &ypu);
+ if (xpu)
+ width += 1 + xpu - (width % xpu);
+ if (ypu)
+ height += 1 + ypu - (height % ypu);
+
+ // limit to 1/4 of the screen size
int maxwidth, maxheight;
wxDisplaySize( & maxwidth, & maxheight );
-
+ maxwidth /= 2;
+ maxheight /= 2;
if ( width > maxwidth ) width = maxwidth;
if ( height > maxheight ) height = maxheight;
- return wxSize( width, height );
+
+ wxSize best(width, height);
+ // NOTE: This size should be cached, but first we need to add calls to
+ // InvalidateBestSize everywhere that could change the results of this
+ // calculation.
+ // CacheBestSize(size);
+ return best;
}
void wxGrid::Fit()
rect.x = 0;
rect.width = m_gridWin->GetClientSize().GetWidth();
CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
- m_gridWin->Refresh( FALSE, &rect );
+ m_gridWin->Refresh( false, &rect );
}
if ( m_currentCellCoords.GetRow() == row &&
ClearSelection();
if ( m_selection )
- m_selection->SelectRow( row, FALSE, addToSelected );
+ m_selection->SelectRow( row, false, addToSelected );
}
ClearSelection();
if ( m_selection )
- m_selection->SelectCol( col, FALSE, addToSelected );
+ m_selection->SelectCol( col, false, addToSelected );
}
if ( m_selection )
m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
- FALSE, addToSelected );
+ false, addToSelected );
}
}
else
{
- rect = wxRect( 0, 0, 0, 0 );
+ rect = wxRect(0,0,0,0);
}
cellRect = CellToRect( bottomRight );
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) );
projects / wxWidgets.git / blobdiff