X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ac05a91abea459438b8ea62074108d3daf39568..03d1ae179905c0bdc720cd1c444a557f1e7a044b:/src/generic/gridctrl.cpp diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index f16184ecf7..9d502277e6 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ - #pragma interface "gridctrl.h" + #pragma implementation "gridctrl.h" #endif #include "wx/wxprec.h" @@ -19,6 +19,8 @@ #pragma hdrstop #endif +#if wxUSE_GRID || wxUSE_NEW_GRID + #ifndef WX_PRECOMP #include "wx/textctrl.h" #include "wx/dc.h" @@ -115,7 +117,7 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid, } void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){ - if(params) + if (!params.IsEmpty()) m_oformat=params; } @@ -128,7 +130,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){ wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices) { - if(choices) + if (!choices.IsEmpty()) SetParameters(choices); } @@ -205,17 +207,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() { - if(choices) + m_startint = -1; + + if (!choices.IsEmpty()) SetParameters(choices); } @@ -265,12 +272,17 @@ bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid) if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER)) grid->GetTable()->SetValueAsLong(row, col, pos); else - grid->GetTable()->SetValue(row, col,wxString::Format("%i",pos)); + grid->GetTable()->SetValue(row, col,wxString::Format(wxT("%i"),pos)); } return changed; } +#endif // wxUSE_COMBOBOX + +// ---------------------------------------------------------------------------- +// wxGridCellAutoWrapStringEditor +// ---------------------------------------------------------------------------- void wxGridCellAutoWrapStringEditor::Create(wxWindow* parent, @@ -328,7 +340,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, dc.SetFont(attr.GetFont()); wxStringTokenizer tk(data , _T(" \n\t\r")); - wxString thisline(""); + wxString thisline(wxT("")); while ( tk.HasMoreTokens() ) { @@ -363,13 +375,13 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, wxDC& dc, int row, int col) { - int x,y, height , width = grid.GetColSize(col) -10; + wxCoord x,y, height , width = grid.GetColSize(col) -10; int count = 250; //Limit iterations.. 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 { @@ -384,3 +396,5 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, return wxSize(width,height); } +#endif // wxUSE_GRID +