projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set minsize and implement DoGetBestSize
[wxWidgets.git]
/
src
/
generic
/
gridctrl.cpp
diff --git
a/src/generic/gridctrl.cpp
b/src/generic/gridctrl.cpp
index 0fd5a3fead6af9387e28d4c50ecb3b77308e9579..6b608141f92064fb5d6e43d745ae3b4a1262db68 100644
(file)
--- a/
src/generic/gridctrl.cpp
+++ b/
src/generic/gridctrl.cpp
@@
-9,7
+9,7
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "gridctrl.h"
#endif
#pragma implementation "gridctrl.h"
#endif
@@
-19,7
+19,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_GRID
|| wxUSE_NEW_GRID
+#if wxUSE_GRID
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
@@
-60,7
+60,7
@@
wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col)
{
wxGridTableBase *table = grid.GetTable();
{
wxGridTableBase *table = grid.GetTable();
- bool hasDatetime =
FALSE
;
+ bool hasDatetime =
false
;
wxDateTime val;
wxString text;
if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) )
wxDateTime val;
wxString text;
if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) )
@@
-69,7
+69,7
@@
wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col)
if (tempval){
val = *((wxDateTime *)tempval);
if (tempval){
val = *((wxDateTime *)tempval);
- hasDatetime =
TRUE
;
+ hasDatetime =
true
;
delete (wxDateTime *)tempval;
}
delete (wxDateTime *)tempval;
}
@@
-344,7
+344,7
@@
wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
dc.SetFont(attr.GetFont());
wxStringTokenizer tk(data , _T(" \n\t\r"));
dc.SetFont(attr.GetFont());
wxStringTokenizer tk(data , _T(" \n\t\r"));
- wxString thisline
(wxT(""))
;
+ wxString thisline
= wxEmptyString
;
while ( tk.HasMoreTokens() )
{
while ( tk.HasMoreTokens() )
{