X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..9a7b7798282622e445efc3318b6c85ff0bed9af8:/src/generic/gridctrl.cpp diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index 1c69499c23..e8da62f564 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -17,12 +17,14 @@ #if wxUSE_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" // ---------------------------------------------------------------------------- @@ -31,9 +33,9 @@ #if wxUSE_DATETIME -// Enables a grid cell to display a formated date and or time +// 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; @@ -52,7 +54,7 @@ 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(); @@ -74,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 ) @@ -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; @@ -290,12 +292,8 @@ 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 @@ -326,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) { @@ -390,7 +388,7 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid, { 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)) );