fix bug with adding entries to a root group containing only subgroups (as shown by...

[wxWidgets.git] / src / generic / gridctrl.cpp

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 05d11b19eff3ce3bf01e297568eb4bc0c3ec239c..e8da62f5646114d32e8b766d8fcc3ba95155833d 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "gridctrl.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -21,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"
 
 // ----------------------------------------------------------------------------


@@ -35,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 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;
 {
     m_iformat = informat;
     m_oformat = outformat;


@@ -56,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();
 


@@ -78,7 +76,7 @@ wxString wxGridCellDateTimeRenderer::GetString(wxGrid& grid, int row, int col)
     if (!hasDatetime )
     {
         text = table->GetValue(row, 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 )
     }
 
     if ( hasDatetime )


@@ -146,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;


@@ -294,12 +292,8 @@ wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,
                                        wxWindowID id,
                                        wxEvtHandler* evtHandler)
 {
                                        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
 }
 
 void


@@ -330,7 +324,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)
 {


@@ -394,7 +388,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)) );