reverted yet another accidental commit of testing code in r57505

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

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 12f1c6c6554e3b258d045e695cad362651c05ba6..052dfbd49f2e26a3c3184027feb25710d0b5aefe 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -9,34 +9,33 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "gridctrl.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_GRID

 
 

-#if wxUSE_GRID || wxUSE_NEW_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"
 
 // ----------------------------------------------------------------------------
 // wxGridCellDateTimeRenderer
 // ----------------------------------------------------------------------------
 
 #include "wx/tokenzr.h"
 
 // ----------------------------------------------------------------------------
 // wxGridCellDateTimeRenderer
 // ----------------------------------------------------------------------------
 

-// Enables a grid cell to display a formated date and or time
+#if wxUSE_DATETIME
+
+// 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;


@@ -55,20 +54,21 @@ 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();
 

-    bool hasDatetime = FALSE;
+    bool hasDatetime = false;

     wxDateTime val;
     wxString text;
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) )
     {
         void * tempval = table->GetValueAsCustom(row, col,wxGRID_VALUE_DATETIME);
 
     wxDateTime val;
     wxString text;
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_DATETIME) )
     {
         void * tempval = table->GetValueAsCustom(row, col,wxGRID_VALUE_DATETIME);
 

-        if (tempval){
+        if (tempval)
+        {

             val = *((wxDateTime *)tempval);
             val = *((wxDateTime *)tempval);

-            hasDatetime = TRUE;
+            hasDatetime = true;

             delete (wxDateTime *)tempval;
         }
 
             delete (wxDateTime *)tempval;
         }
 


@@ -77,13 +77,14 @@ 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) ;
+        const char * const end = val.ParseFormat(text, m_iformat, m_dateDef);
+        hasDatetime = end && !*end;

     }
 
     if ( hasDatetime )
         text = val.Format(m_oformat, m_tz );
 
     }
 
     if ( hasDatetime )
         text = val.Format(m_oformat, m_tz );
 

-    //If we faild to parse string just show what we where given?
+    // If we failed to parse string just show what we where given?

     return text;
 }
 
     return text;
 }
 


@@ -117,11 +118,14 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid,
     return DoGetBestSize(attr, dc, GetString(grid, row, col));
 }
 
     return DoGetBestSize(attr, dc, GetString(grid, row, col));
 }
 

-void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
-    if (!params.IsEmpty())
+void wxGridCellDateTimeRenderer::SetParameters(const wxString& params)
+{
+    if (!params.empty())

         m_oformat=params;
 }
 
         m_oformat=params;
 }
 

+#endif // wxUSE_DATETIME
+

 // ----------------------------------------------------------------------------
 // wxGridCellChoiceNumberRenderer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellChoiceNumberRenderer
 // ----------------------------------------------------------------------------


@@ -131,7 +135,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {

-    if (!choices.IsEmpty())
+    if (!choices.empty())

         SetParameters(choices);
 }
 
         SetParameters(choices);
 }
 


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


@@ -208,26 +212,29 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

+#if wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // wxGridCellEnumEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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)
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)

-                    : wxGridCellChoiceEditor()
+                     :wxGridCellChoiceEditor()

 {
 {

-    m_startint = -1;
+    m_index = -1;

 
 

-    if (!choices.IsEmpty())
+    if (!choices.empty())

         SetParameters(choices);
 }
 
 wxGridCellEditor *wxGridCellEnumEditor::Clone() const
 {
     wxGridCellEnumEditor *editor = new wxGridCellEnumEditor();
         SetParameters(choices);
 }
 
 wxGridCellEditor *wxGridCellEnumEditor::Clone() const
 {
     wxGridCellEnumEditor *editor = new wxGridCellEnumEditor();

-    editor->m_startint = m_startint;
+    editor->m_index = m_index;

     return editor;
 }
 
     return editor;
 }
 


@@ -240,54 +247,64 @@ void wxGridCellEnumEditor::BeginEdit(int row, int col, wxGrid* grid)
 
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
     {
 
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
     {

-        m_startint = table->GetValueAsLong(row, col);
+        m_index = table->GetValueAsLong(row, col);

     }
     else
     {
         wxString startValue = table->GetValue(row, col);
     }
     else
     {
         wxString startValue = table->GetValue(row, col);

-        if (startValue.IsNumber() && !startValue.IsEmpty())
+        if (startValue.IsNumber() && !startValue.empty())

         {
         {

-            startValue.ToLong(&m_startint);
+            startValue.ToLong(&m_index);

         }
         else
         {
         }
         else
         {

-            m_startint=-1;
+            m_index = -1;

         }
     }
 
         }
     }
 

-    Combo()->SetSelection(m_startint);
+    Combo()->SetSelection(m_index);

     Combo()->SetInsertionPointEnd();
     Combo()->SetFocus();
 
 }
 
     Combo()->SetInsertionPointEnd();
     Combo()->SetFocus();
 
 }
 

-bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid)
+bool wxGridCellEnumEditor::EndEdit(const wxString& WXUNUSED(oldval),
+                                   wxString *newval)

 {
 {

-    int pos = Combo()->GetSelection();
-    bool changed = (pos != m_startint);
-    if (changed)
-    {
-        if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
-            grid->GetTable()->SetValueAsLong(row, col, pos);
-        else
-            grid->GetTable()->SetValue(row, col,wxString::Format(wxT("%i"),pos));
-    }
+    long idx = Combo()->GetSelection();
+    if ( idx == m_index )
+        return false;
+
+    m_index = idx;

 
 

-    return changed;
+    if ( newval )
+        newval->Printf("%ld", m_index);
+
+    return true;

 }
 
 }
 

+void wxGridCellEnumEditor::ApplyEdit(int row, int col, wxGrid* grid)
+{
+    wxGridTableBase * const table = grid->GetTable();
+    if ( table->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER) )
+        table->SetValueAsLong(row, col, m_index);
+    else
+        table->SetValue(row, col, wxString::Format("%ld", m_index));
+}
+
+#endif // wxUSE_COMBOBOX
+
+// ----------------------------------------------------------------------------
+// wxGridCellAutoWrapStringEditor
+// ----------------------------------------------------------------------------

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


@@ -318,7 +335,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)
 {


@@ -333,27 +350,29 @@ 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("");
+    wxString thisline = wxEmptyString;

 
     while ( tk.HasMoreTokens() )
     {
         wxString tok = tk.GetNextToken();
 
     while ( tk.HasMoreTokens() )
     {
         wxString tok = tk.GetNextToken();

-    //FIXME: this causes us to print an extra unnecesary
-    //       space at the end of the line. But it
-    //       is invisible , simplifies the size calculation
-    //       and ensures tokens are seperated in the display
-    tok += _T(" ");
+        //FIXME: this causes us to print an extra unnecesary
+        //       space at the end of the line. But it
+        //       is invisible , simplifies the size calculation
+        //       and ensures tokens are separated in the display
+        tok += _T(" ");

 
         dc.GetTextExtent(tok, &x, &y);
 
         dc.GetTextExtent(tok, &x, &y);

-        if ( curr_x + x > max_x) {
+        if ( curr_x + x > max_x)
+        {

             lines.Add( wxString(thisline) );
             lines.Add( wxString(thisline) );

-        thisline = tok;
-        curr_x=x;
-    } else {
+            thisline = tok;
+            curr_x=x;
+        }
+        else
+        {

             thisline+= tok;
             thisline+= tok;

-        curr_x += x;
-    }
-
+            curr_x += x;
+        }

     }
     //Add last line
     lines.Add( wxString(thisline) );
     }
     //Add last line
     lines.Add( wxString(thisline) );


@@ -368,19 +387,22 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
                                               wxDC& dc,
                                               int row, int col)
 {
                                               wxDC& dc,
                                               int row, int col)
 {

-    wxCoord x,y, height , width = grid.GetColSize(col) -10;
+    wxCoord x,y, height , width = grid.GetColSize(col) -20;
+    // for width, subtract 20 because ColSize includes a magin of 10 pixels
+    // that we do not want here and because we always start with an increment
+    // by 10 in the loop below.

     int count = 250; //Limit iterations..
 
     wxRect rect(0,0,width,10);
 
     // M is a nice large character 'y' gives descender!.
     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
     {
         width+=10;
         rect.SetWidth(width);
 
     do
     {
         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)) );


@@ -389,4 +411,5 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
     return wxSize(width,height);
 }
 

-#endif
+#endif // wxUSE_GRID
+