#include "wx/textctrl.h"
#include "wx/checkbox.h"
#include "wx/combobox.h"
- #include "wx/valtext.h"
#include "wx/intl.h"
#include "wx/math.h"
#include "wx/listbox.h"
#endif
+#include "wx/valnum.h"
#include "wx/textfile.h"
#include "wx/spinctrl.h"
#include "wx/tokenzr.h"
#define WXUNUSED_GTK(identifier) identifier
#endif
+#ifdef __WXOSX__
+#include "wx/osx/private.h"
+#endif
+
// Required for wxIs... functions
#include <ctype.h>
else
{
// restore the standard colours fonts
- if ( m_colFgOld.Ok() )
+ if ( m_colFgOld.IsOk() )
{
m_control->SetForegroundColour(m_colFgOld);
m_colFgOld = wxNullColour;
}
- if ( m_colBgOld.Ok() )
+ if ( m_colBgOld.IsOk() )
{
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() )
+ if ( m_fontOld.IsOk() )
{
m_control->SetFont(m_fontOld);
m_fontOld = wxNullFont;
bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
{
bool ctrl = event.ControlDown();
- bool alt = event.AltDown();
+ bool alt;
#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
+#else // !__WXMAC__
+ alt = event.AltDown();
+#endif // __WXMAC__/!__WXMAC__
// 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
return false;
#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.
- if ( event.GetUnicodeKey() > 127 && event.GetKeyCode() > 127 )
+ if ( static_cast<int>(event.GetUnicodeKey()) == WXK_NONE )
return false;
#else
- if ( event.GetKeyCode() > 255 )
+ if ( event.GetKeyCode() > WXK_START )
return false;
#endif
wxEvtHandler* evtHandler,
long style)
{
- style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER;
+ // Use of wxTE_RICH2 is a strange hack to work around the bug #11681: a
+ // plain text control seems to lose its caret somehow when we hide it and
+ // show it again for a different cell.
+ style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER | wxTE_RICH2;
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
style);
+#ifdef __WXOSX__
+ wxWidgetImpl* impl = m_control->GetPeer();
+ impl->SetNeedsFocusRect(false);
+#endif
// set max length allowed in the textctrl, if the parameter was set
if ( m_maxChars != 0 )
{
rect.width -= 2;
rect.height -= 2;
+#elif defined(__WXOSX__)
+ rect.x += 1;
+ rect.y += 1;
+
+ rect.width -= 1;
+ rect.height -= 1;
#else
int extra_x = ( rect.x > 2 ) ? 2 : 1;
int extra_y = ( rect.y > 2 ) ? 2 : 1;
bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
{
- return wxGridCellEditor::IsAcceptedKey(event);
+ switch ( event.GetKeyCode() )
+ {
+ case WXK_DELETE:
+ case WXK_BACK:
+ return true;
+
+ default:
+ return wxGridCellEditor::IsAcceptedKey(event);
+ }
}
void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
// a valid character, so not a whole lot of testing needs to be done.
wxTextCtrl* tc = Text();
- wxChar ch;
- long pos;
+ int ch;
+
+ bool isPrintable;
#if wxUSE_UNICODE
ch = event.GetUnicodeKey();
- if (ch <= 127)
- ch = (wxChar)event.GetKeyCode();
-#else
- ch = (wxChar)event.GetKeyCode();
-#endif
+ if ( ch != WXK_NONE )
+ isPrintable = true;
+ else
+#endif // wxUSE_UNICODE
+ {
+ ch = event.GetKeyCode();
+ isPrintable = ch >= WXK_SPACE && ch < WXK_START;
+ }
switch (ch)
{
case WXK_DELETE:
- // delete the character at the cursor
- pos = tc->GetInsertionPoint();
- if (pos < tc->GetLastPosition())
- tc->Remove(pos, pos + 1);
+ // Delete the initial character when starting to edit with DELETE.
+ tc->Remove(0, 1);
break;
case WXK_BACK:
- // delete the character before the cursor
- pos = tc->GetInsertionPoint();
- if (pos > 0)
+ // Delete the last character when starting to edit with BACKSPACE.
+ {
+ const long pos = tc->GetLastPosition();
tc->Remove(pos - 1, pos);
+ }
break;
default:
- tc->WriteText(ch);
+ if ( isPrintable )
+ tc->WriteText(static_cast<wxChar>(ch));
break;
}
}
}
else
{
- wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
+ wxLogDebug( wxT("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
}
}
}
wxGridCellTextEditor::Create(parent, id, evtHandler);
#if wxUSE_VALIDATORS
- Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+ Text()->SetValidator(wxIntegerValidator<int>());
#endif
}
}
wxString sValue = table->GetValue(row, col);
if (! sValue.ToLong(&m_value) && ! sValue.empty())
{
- wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+ wxFAIL_MSG( wxT("this cell doesn't have numeric value") );
return;
}
}
else
{
long tmp;
- if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+ if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) )
{
m_min = (int)tmp;
- if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+ if ( params.AfterFirst(wxT(',')).ToLong(&tmp) )
{
m_max = (int)tmp;
}
}
- wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
+ wxLogDebug(wxT("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
}
}
// wxGridCellFloatEditor
// ----------------------------------------------------------------------------
-wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision)
+wxGridCellFloatEditor::wxGridCellFloatEditor(int width,
+ int precision,
+ int format)
{
m_width = width;
m_precision = precision;
+ m_style = format;
}
void wxGridCellFloatEditor::Create(wxWindow* parent,
wxGridCellTextEditor::Create(parent, id, evtHandler);
#if wxUSE_VALIDATORS
- Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+ Text()->SetValidator(wxFloatingPointValidator<double>(m_precision));
#endif
}
{
if ( !value.ToDouble(&m_value) )
{
- wxFAIL_MSG( _T("this cell doesn't have float value") );
+ wxFAIL_MSG( wxT("this cell doesn't have float value") );
return;
}
}
bool is_decimal_point = ( strbuf ==
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
#else
- bool is_decimal_point = ( strbuf == _T(".") );
+ bool is_decimal_point = ( strbuf == wxT(".") );
#endif
if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
// reset to default
m_width =
m_precision = -1;
+ m_style = wxGRID_FLOAT_FORMAT_DEFAULT;
+ m_format.clear();
}
else
{
- long tmp;
- if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
+ wxString rest;
+ wxString tmp = params.BeforeFirst(wxT(','), &rest);
+ if ( !tmp.empty() )
{
- m_width = (int)tmp;
-
- if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
+ long width;
+ if ( tmp.ToLong(&width) )
{
- m_precision = (int)tmp;
+ m_width = (int)width;
+ }
+ else
+ {
+ wxLogDebug(wxT("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str());
+ }
+ }
- // skip the error message below
- return;
+ tmp = rest.BeforeFirst(wxT(','));
+ if ( !tmp.empty() )
+ {
+ long precision;
+ if ( tmp.ToLong(&precision) )
+ {
+ m_precision = (int)precision;
+ }
+ else
+ {
+ wxLogDebug(wxT("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str());
}
}
- wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
+ tmp = rest.AfterFirst(wxT(','));
+ if ( !tmp.empty() )
+ {
+ if ( tmp[0] == wxT('f') )
+ {
+ m_style = wxGRID_FLOAT_FORMAT_FIXED;
+ }
+ else if ( tmp[0] == wxT('e') )
+ {
+ m_style = wxGRID_FLOAT_FORMAT_SCIENTIFIC;
+ }
+ else if ( tmp[0] == wxT('g') )
+ {
+ m_style = wxGRID_FLOAT_FORMAT_COMPACT;
+ }
+ else if ( tmp[0] == wxT('E') )
+ {
+ m_style = wxGRID_FLOAT_FORMAT_SCIENTIFIC |
+ wxGRID_FLOAT_FORMAT_UPPER;
+ }
+ else if ( tmp[0] == wxT('F') )
+ {
+ m_style = wxGRID_FLOAT_FORMAT_FIXED |
+ wxGRID_FLOAT_FORMAT_UPPER;
+ }
+ else if ( tmp[0] == wxT('G') )
+ {
+ m_style = wxGRID_FLOAT_FORMAT_COMPACT |
+ wxGRID_FLOAT_FORMAT_UPPER;
+ }
+ else
+ {
+ wxLogDebug("Invalid wxGridCellFloatRenderer format "
+ "parameter string '%s ignored", params);
+ }
+ }
}
}
-wxString wxGridCellFloatEditor::GetString() const
+wxString wxGridCellFloatEditor::GetString()
{
- wxString fmt;
- if ( m_precision == -1 && m_width != -1)
+ if ( !m_format )
{
- // default precision
- fmt.Printf(_T("%%%d.f"), m_width);
- }
- 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");
+ if ( m_precision == -1 && m_width != -1)
+ {
+ // default precision
+ m_format.Printf(wxT("%%%d."), m_width);
+ }
+ else if ( m_precision != -1 && m_width == -1)
+ {
+ // default width
+ m_format.Printf(wxT("%%.%d"), m_precision);
+ }
+ else if ( m_precision != -1 && m_width != -1 )
+ {
+ m_format.Printf(wxT("%%%d.%d"), m_width, m_precision);
+ }
+ else
+ {
+ // default width/precision
+ m_format = wxT("%");
+ }
+
+ bool isUpper = (m_style & wxGRID_FLOAT_FORMAT_UPPER) != 0;
+ if ( m_style & wxGRID_FLOAT_FORMAT_SCIENTIFIC )
+ m_format += isUpper ? wxT('E') : wxT('e');
+ else if ( m_style & wxGRID_FLOAT_FORMAT_COMPACT )
+ m_format += isUpper ? wxT('G') : wxT('g');
+ else
+ m_format += wxT('f');
}
- return wxString::Format(fmt, m_value);
+ return wxString::Format(m_format, m_value);
}
bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
if ( wxGridCellEditor::IsAcceptedKey(event) )
{
const int keycode = event.GetKeyCode();
- if ( isascii(keycode) )
+ if ( wxIsascii(keycode) )
{
- char tmpbuf[2];
- tmpbuf[0] = (char) keycode;
- tmpbuf[1] = '\0';
- wxString strbuf(tmpbuf, *wxConvCurrent);
-
#if wxUSE_INTL
const wxString decimalPoint =
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
#else
- const wxString decimalPoint(_T('.'));
+ const wxString decimalPoint(wxT('.'));
#endif
// accept digits, 'e' as in '1e+6', also '-', '+', and '.'
// ----------------------------------------------------------------------------
// the default values for GetValue()
-wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") };
+wxString wxGridCellBoolEditor::ms_stringValues[2] = { wxT(""), wxT("1") };
void wxGridCellBoolEditor::Create(wxWindow* parent,
wxWindowID id,
// 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!") );
+ wxFAIL_MSG( wxT("invalid value for a cell with bool editor!") );
}
}
wxGridCellEditor::Create(parent, id, evtHandler);
}
+void wxGridCellChoiceEditor::SetSize(const wxRect& rect)
+{
+ wxASSERT_MSG(m_control,
+ wxT("The wxGridCellChoiceEditor must be created first!"));
+
+ // Check that the height is not too small to fit the combobox.
+ wxRect rectTallEnough = rect;
+ const wxSize bestSize = m_control->GetBestSize();
+ const wxCoord diffY = bestSize.GetHeight() - rectTallEnough.GetHeight();
+ if ( diffY > 0 )
+ {
+ // Do make it tall enough.
+ rectTallEnough.height += diffY;
+
+ // Also centre the effective rectangle vertically with respect to the
+ // original one.
+ rectTallEnough.y -= diffY/2;
+ }
+ //else: The rectangle provided is already tall enough.
+
+ wxGridCellEditor::SetSize(rectTallEnough);
+}
+
void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
wxGridCellAttr * attr)
{
Combo()->SetFocus();
+#ifdef __WXOSX_COCOA__
+ // This is a work around for the combobox being simply dismissed when a
+ // choice is made in it under OS X. The bug is almost certainly due to a
+ // problem in focus events generation logic but it's not obvious to fix and
+ // for now this at least allows to use wxGrid.
+ Combo()->Popup();
+#endif
+
if (evtHandler)
{
// When dropping down the menu, a kill focus event
m_choices.Empty();
- wxStringTokenizer tk(params, _T(','));
+ wxStringTokenizer tk(params, wxT(','));
while ( tk.HasMoreTokens() )
{
m_choices.Add(tk.GetNextToken());
}
Combo()->SetSelection(m_index);
- Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
}
projects / wxWidgets.git / blobdiff