projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wx/image.h to fix non-PCH compilation after last commit (patch 1635649)
[wxWidgets.git]
/
src
/
generic
/
gridctrl.cpp
diff --git
a/src/generic/gridctrl.cpp
b/src/generic/gridctrl.cpp
index 1c69499c2358498969271e7fb7380fa3b9190f86..27c709e3ab0ea017d2e8d5c4fd5835a5f7d581d5 100644
(file)
--- a/
src/generic/gridctrl.cpp
+++ b/
src/generic/gridctrl.cpp
@@
-17,12
+17,14
@@
#if wxUSE_GRID
#if wxUSE_GRID
+#include "wx/generic/gridctrl.h"
+
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#include "wx/dc.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#include "wx/dc.h"
+ #include "wx/combobox.h"
#endif // WX_PRECOMP
#endif // WX_PRECOMP
-#include "wx/generic/gridctrl.h"
#include "wx/tokenzr.h"
// ----------------------------------------------------------------------------
#include "wx/tokenzr.h"
// ----------------------------------------------------------------------------
@@
-31,9
+33,9
@@
#if wxUSE_DATETIME
#if wxUSE_DATETIME
-// Enables a grid cell to display a formated date and or time
+// Enables a grid cell to display a format
t
ed date and or time
-wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(
wxString outformat, wxString
informat)
+wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(
const wxString& outformat, const wxString&
informat)
{
m_iformat = informat;
m_oformat = outformat;
{
m_iformat = informat;
m_oformat = outformat;
@@
-52,7
+54,7
@@
wxGridCellRenderer *wxGridCellDateTimeRenderer::Clone() const
return renderer;
}
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();
{
wxGridTableBase *table = grid.GetTable();
@@
-142,7
+144,7
@@
wxGridCellRenderer *wxGridCellEnumRenderer::Clone() const
return renderer;
}
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;
{
wxGridTableBase *table = grid.GetTable();
wxString text;
@@
-326,7
+328,7
@@
wxGridCellAutoWrapStringRenderer::Draw(wxGrid& grid,
wxArrayString
wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
wxDC& dc,
wxArrayString
wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
wxDC& dc,
- wxGridCellAttr& attr,
+
const
wxGridCellAttr& attr,
const wxRect& rect,
int row, int col)
{
const wxRect& rect,
int row, int col)
{
@@
-390,7
+392,7
@@
wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
{
width+=10;
rect.SetWidth(width);
{
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)) );
count--;
// Search for a shape no taller than the golden ratio.
} while (count && (width < (height*1.68)) );