X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b53dc7d661f662f0ed09c938ae4c32a0accd6350..8366ab05cd8541c272e5132e2482e9cfb20cbf27:/src/generic/gridctrl.cpp diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index 12f1c6c655..e8da62f564 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -9,34 +9,33 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "gridctrl.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif +#if wxUSE_GRID -#if wxUSE_GRID || wxUSE_NEW_GRID +#include "wx/generic/gridctrl.h" #ifndef WX_PRECOMP #include "wx/textctrl.h" #include "wx/dc.h" + #include "wx/combobox.h" #endif // WX_PRECOMP -#include "wx/generic/gridctrl.h" #include "wx/tokenzr.h" // ---------------------------------------------------------------------------- // wxGridCellDateTimeRenderer // ---------------------------------------------------------------------------- -// Enables a grid cell to display a formated date and or time +#if wxUSE_DATETIME + +// Enables a grid cell to display a formatted date and or time -wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString outformat, wxString informat) +wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(const wxString& outformat, const wxString& informat) { m_iformat = informat; m_oformat = outformat; @@ -55,11 +54,11 @@ wxGridCellRenderer *wxGridCellDateTimeRenderer::Clone() const return renderer; } -wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col) +wxString wxGridCellDateTimeRenderer::GetString(const wxGrid& grid, int row, int col) { wxGridTableBase *table = grid.GetTable(); - bool hasDatetime = FALSE; + bool hasDatetime = false; wxDateTime val; wxString text; if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) ) @@ -68,7 +67,7 @@ wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col) if (tempval){ val = *((wxDateTime *)tempval); - hasDatetime = TRUE; + hasDatetime = true; delete (wxDateTime *)tempval; } @@ -77,7 +76,7 @@ wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col) if (!hasDatetime ) { text = table->GetValue(row, col); - hasDatetime = (val.ParseFormat( text, m_iformat, m_dateDef ) != (wxChar *)NULL) ; + hasDatetime = (val.ParseFormat(text.c_str(), m_iformat, m_dateDef) != (wxChar *)NULL) ; } if ( hasDatetime ) @@ -117,11 +116,14 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid, return DoGetBestSize(attr, dc, GetString(grid, row, col)); } -void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){ - if (!params.IsEmpty()) +void wxGridCellDateTimeRenderer::SetParameters(const wxString& params) +{ + if (!params.empty()) m_oformat=params; } +#endif // wxUSE_DATETIME + // ---------------------------------------------------------------------------- // wxGridCellChoiceNumberRenderer // ---------------------------------------------------------------------------- @@ -131,7 +133,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){ wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices) { - if (!choices.IsEmpty()) + if (!choices.empty()) SetParameters(choices); } @@ -142,7 +144,7 @@ wxGridCellRenderer *wxGridCellEnumRenderer::Clone() const return renderer; } -wxString wxGridCellEnumRenderer::GetString(wxGrid& grid, int row, int col) +wxString wxGridCellEnumRenderer::GetString(const wxGrid& grid, int row, int col) { wxGridTableBase *table = grid.GetTable(); wxString text; @@ -208,19 +210,22 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params) } } +#if wxUSE_COMBOBOX + // ---------------------------------------------------------------------------- // wxGridCellEnumEditor // ---------------------------------------------------------------------------- -// A cell editor which displays an enum number as a textual equivalent. -// eg data in cell is 0,1,2 ... n the cell could be displayed as "John","Fred"..."Bob" -// in the combo choice box -// + +// A cell editor which displays an enum number as a textual equivalent. eg +// data in cell is 0,1,2 ... n the cell could be displayed as +// "John","Fred"..."Bob" in the combo choice box + wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices) - : wxGridCellChoiceEditor() + :wxGridCellChoiceEditor() { m_startint = -1; - if (!choices.IsEmpty()) + if (!choices.empty()) SetParameters(choices); } @@ -245,7 +250,7 @@ void wxGridCellEnumEditor::BeginEdit(int row, int col, wxGrid* grid) else { wxString startValue = table->GetValue(row, col); - if (startValue.IsNumber() && !startValue.IsEmpty()) + if (startValue.IsNumber() && !startValue.empty()) { startValue.ToLong(&m_startint); } @@ -276,18 +281,19 @@ bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid) return changed; } +#endif // wxUSE_COMBOBOX + +// ---------------------------------------------------------------------------- +// wxGridCellAutoWrapStringEditor +// ---------------------------------------------------------------------------- void wxGridCellAutoWrapStringEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { - m_control = new wxTextCtrl(parent, id, wxEmptyString, - wxDefaultPosition, wxDefaultSize, - wxTE_MULTILINE | wxTE_RICH); - - - wxGridCellEditor::Create(parent, id, evtHandler); + wxGridCellTextEditor::DoCreate(parent, id, evtHandler, + wxTE_MULTILINE | wxTE_RICH); } void @@ -318,7 +324,7 @@ wxGridCellAutoWrapStringRenderer::Draw(wxGrid& grid, wxArrayString wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, wxDC& dc, - wxGridCellAttr& attr, + const wxGridCellAttr& attr, const wxRect& rect, int row, int col) { @@ -333,27 +339,29 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, dc.SetFont(attr.GetFont()); wxStringTokenizer tk(data , _T(" \n\t\r")); - wxString thisline(""); + wxString thisline = wxEmptyString; while ( tk.HasMoreTokens() ) { wxString tok = tk.GetNextToken(); - //FIXME: this causes us to print an extra unnecesary - // space at the end of the line. But it - // is invisible , simplifies the size calculation - // and ensures tokens are seperated in the display - tok += _T(" "); + //FIXME: this causes us to print an extra unnecesary + // space at the end of the line. But it + // is invisible , simplifies the size calculation + // and ensures tokens are separated in the display + tok += _T(" "); dc.GetTextExtent(tok, &x, &y); - if ( curr_x + x > max_x) { + if ( curr_x + x > max_x) + { lines.Add( wxString(thisline) ); - thisline = tok; - curr_x=x; - } else { + thisline = tok; + curr_x=x; + } + else + { thisline+= tok; - curr_x += x; - } - + curr_x += x; + } } //Add last line lines.Add( wxString(thisline) ); @@ -374,13 +382,13 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, wxRect rect(0,0,width,10); // M is a nice large character 'y' gives descender!. - dc.GetTextExtent("My", &x, &y); + dc.GetTextExtent(wxT("My"), &x, &y); do { width+=10; rect.SetWidth(width); - height = y *( GetTextLines(grid,dc,attr,rect,row,col).GetCount()); + height = y * (wx_truncate_cast(wxCoord, GetTextLines(grid,dc,attr,rect,row,col).GetCount())); count--; // Search for a shape no taller than the golden ratio. } while (count && (width < (height*1.68)) ); @@ -389,4 +397,5 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, return wxSize(width,height); } -#endif +#endif // wxUSE_GRID +