removed src/gtk/eggtrayicon.h

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 8947c56632c19ea533d9ac212af55022c0f17ad9..9d0e0a9f69b26d8f37dda68b35109852ddc1570e 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -109,6 +109,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)

+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_BEGIN_DRAG)

 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)


@@ -205,7 +206,7 @@ public:
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );
                   wxGridRowLabelWindow *rowLblWin,
                   wxGridColLabelWindow *colLblWin,
                   wxWindowID id, const wxPoint &pos, const wxSize &size );

-    ~wxGridWindow();
+    ~wxGridWindow(){}

 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 


@@ -412,6 +413,7 @@ static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
 // in these hash tables is the number of rows/columns)
 static const int GRID_HASH_SIZE = 100;
 
 // in these hash tables is the number of rows/columns)
 static const int GRID_HASH_SIZE = 100;
 

+#if 0

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -425,6 +427,7 @@ static inline int GetScrollY(int y)
 {
     return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
 }
 {
     return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
 }

+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -475,7 +478,7 @@ void wxGridCellEditor::Destroy()
 {
     if (m_control)
     {
 {
     if (m_control)
     {

-        m_control->PopEventHandler(TRUE /* delete it*/);
+        m_control->PopEventHandler(true /* delete it*/);

 
         m_control->Destroy();
         m_control = NULL;
 
         m_control->Destroy();
         m_control = NULL;


@@ -499,9 +502,11 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_colBgOld = m_control->GetBackgroundColour();
             m_control->SetBackgroundColour(attr->GetBackgroundColour());
 
             m_colBgOld = m_control->GetBackgroundColour();
             m_control->SetBackgroundColour(attr->GetBackgroundColour());
 

+           // Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)

             m_fontOld = m_control->GetFont();
             m_control->SetFont(attr->GetFont());
             m_fontOld = m_control->GetFont();
             m_control->SetFont(attr->GetFont());

-
+#endif

             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }
             // can't do anything more in the base class version, the other
             // attributes may only be used by the derived classes
         }


@@ -520,12 +525,14 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr)
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }
             m_control->SetBackgroundColour(m_colBgOld);
             m_colBgOld = wxNullColour;
         }

-
+       // Workaround for GTK+1 font setting problem on some platforms
+#if !defined(__WXGTK__) || defined(__WXGTK20__)

         if ( m_fontOld.Ok() )
         {
             m_control->SetFont(m_fontOld);
             m_fontOld = wxNullFont;
         }
         if ( m_fontOld.Ok() )
         {
             m_control->SetFont(m_fontOld);
             m_fontOld = wxNullFont;
         }

+#endif

     }
 }
 
     }
 }
 


@@ -660,10 +667,10 @@ bool wxGridCellTextEditor::EndEdit(int row, int col,
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 

-    bool changed = FALSE;
+    bool changed = false;

     wxString value = Text()->GetValue();
     if (value != m_startValue)
     wxString value = Text()->GetValue();
     if (value != m_startValue)

-        changed = TRUE;
+        changed = true;

 
     if (changed)
         grid->GetTable()->SetValue(row, col, value);
 
     if (changed)
         grid->GetTable()->SetValue(row, col, value);


@@ -717,16 +724,16 @@ bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event)
             case WXK_NUMPAD_DECIMAL:
             case WXK_DIVIDE:
             case WXK_NUMPAD_DIVIDE:
             case WXK_NUMPAD_DECIMAL:
             case WXK_DIVIDE:
             case WXK_NUMPAD_DIVIDE:

-                return TRUE;
+                return true;

 
             default:
                 // accept 8 bit chars too if isprint() agrees
                 if ( (keycode < 255) && (wxIsprint(keycode)) )
 
             default:
                 // accept 8 bit chars too if isprint() agrees
                 if ( (keycode < 255) && (wxIsprint(keycode)) )

-                    return TRUE;
+                    return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 }
 
 void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)


@@ -798,7 +805,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent,
     if ( HasRange() )
     {
         // create a spin ctrl
     if ( HasRange() )
     {
         // create a spin ctrl

-        m_control = new wxSpinCtrl(parent, -1, wxEmptyString,
+        m_control = new wxSpinCtrl(parent, wxID_ANY, wxEmptyString,

                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    m_min, m_max);
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
                                    m_min, m_max);


@@ -912,15 +919,15 @@ bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event)
             case WXK_NUMPAD_SUBTRACT:
             case WXK_UP:
             case WXK_DOWN:
             case WXK_NUMPAD_SUBTRACT:
             case WXK_UP:
             case WXK_DOWN:

-                return TRUE;
+                return true;

 
             default:
                 if ( (keycode < 128) && wxIsdigit(keycode) )
 
             default:
                 if ( (keycode < 128) && wxIsdigit(keycode) )

-                    return TRUE;
+                    return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
 }
 
 void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)


@@ -1055,9 +1062,9 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col,
         else
             grid->GetTable()->SetValue(row, col, text);
 
         else
             grid->GetTable()->SetValue(row, col, text);
 

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 void wxGridCellFloatEditor::Reset()
 }
 
 void wxGridCellFloatEditor::Reset()


@@ -1071,7 +1078,8 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
     char tmpbuf[2];
     tmpbuf[0] = (char) keycode;
     tmpbuf[1] = '\0';
     char tmpbuf[2];
     tmpbuf[0] = (char) keycode;
     tmpbuf[1] = '\0';

-    bool is_decimal_point = ( wxString(tmpbuf, *wxConvCurrent) == 
+    wxString strbuf(tmpbuf, *wxConvCurrent);
+    bool is_decimal_point = ( strbuf ==

       wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
         if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
             || is_decimal_point
       wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
         if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
             || is_decimal_point


@@ -1171,27 +1179,27 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
             case WXK_NUMPAD_SUBTRACT:
             case WXK_DECIMAL:
             case WXK_NUMPAD_DECIMAL:
             case WXK_NUMPAD_SUBTRACT:
             case WXK_DECIMAL:
             case WXK_NUMPAD_DECIMAL:

-                return TRUE;
+                return true;

 
 

-            default: 
+            default:

             {
                // additionally accept 'e' as in '1e+6', also '-', '+', and '.'
                 char tmpbuf[2];
                 tmpbuf[0] = (char) keycode;
                 tmpbuf[1] = '\0';
             {
                // additionally accept 'e' as in '1e+6', also '-', '+', and '.'
                 char tmpbuf[2];
                 tmpbuf[0] = (char) keycode;
                 tmpbuf[1] = '\0';

-                bool is_decimal_point =
-                  ( wxString(tmpbuf, *wxConvCurrent) == 
-                    wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
-                                      wxLOCALE_CAT_NUMBER) );
+                wxString strbuf(tmpbuf, *wxConvCurrent);
+                bool is_decimal_point = 
+                    ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
+                                                  wxLOCALE_CAT_NUMBER) );

                 if ( (keycode < 128) &&
                      (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
                       is_decimal_point || keycode == '+' || keycode == '-') )
                 if ( (keycode < 128) &&
                      (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
                       is_decimal_point || keycode == '+' || keycode == '-') )

-                    return TRUE;
+                    return true;

             }
         }
     }
 
             }
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 #endif // wxUSE_TEXTCTRL
 }
 
 #endif // wxUSE_TEXTCTRL


@@ -1215,7 +1223,7 @@ void wxGridCellBoolEditor::Create(wxWindow* parent,
 
 void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {
 
 void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {

-    bool resize = FALSE;
+    bool resize = false;

     wxSize size = m_control->GetSize();
     wxCoord minSize = wxMin(r.width, r.height);
 
     wxSize size = m_control->GetSize();
     wxCoord minSize = wxMin(r.width, r.height);
 


@@ -1226,7 +1234,7 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r)
         // reset to default size if it had been made smaller
         size = sizeBest;
 
         // reset to default size if it had been made smaller
         size = sizeBest;
 

-        resize = TRUE;
+        resize = true;

     }
 
     if ( size.x >= minSize || size.y >= minSize )
     }
 
     if ( size.x >= minSize || size.y >= minSize )


@@ -1234,7 +1242,7 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r)
         // leave 1 pixel margin
         size.x = size.y = minSize - 2;
 
         // leave 1 pixel margin
         size.x = size.y = minSize - 2;
 

-        resize = TRUE;
+        resize = true;

     }
 
     if ( resize )
     }
 
     if ( resize )


@@ -1315,10 +1323,10 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEditor must be Created first!"));
 

-    bool changed = FALSE;
+    bool changed = false;

     bool value = CBox()->GetValue();
     if ( value != m_startValue )
     bool value = CBox()->GetValue();
     if ( value != m_startValue )

-        changed = TRUE;
+        changed = true;

 
     if ( changed )
     {
 
     if ( changed )
     {


@@ -1360,11 +1368,11 @@ bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
             case WXK_SPACE:
             case '+':
             case '-':
             case WXK_SPACE:
             case '+':
             case '-':

-                return TRUE;
+                return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 // return the value as "1" for true and the empty string for false
 }
 
 // return the value as "1" for true and the empty string for false


@@ -1460,18 +1468,12 @@ bool wxGridCellChoiceEditor::EndEdit(int row, int col,
                                      wxGrid* grid)
 {
     wxString value = Combo()->GetValue();
                                      wxGrid* grid)
 {
     wxString value = Combo()->GetValue();

-    bool changed = value != m_startValue;
+    if ( value == m_startValue )
+        return false;

 
 

-    if ( changed )
-        grid->GetTable()->SetValue(row, col, value);
-
-    m_startValue = wxEmptyString;
-    if (m_allowOthers)
-        Combo()->SetValue(m_startValue);
-    else
-        Combo()->SetSelection(0);
+    grid->GetTable()->SetValue(row, col, value);

 
 

-    return changed;
+    return true;

 }
 
 void wxGridCellChoiceEditor::Reset()
 }
 
 void wxGridCellChoiceEditor::Reset()


@@ -1692,7 +1694,7 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
             int i, c_cols, c_rows;
             for (i = col+cell_cols; i < cols; i++)
             {
             int i, c_cols, c_rows;
             for (i = col+cell_cols; i < cols; i++)
             {

-                bool is_empty = TRUE;
+                bool is_empty = true;

                 for (int j=row; j<row+cell_rows; j++)
                 {
                     // check w/ anchor cell for multicell block
                 for (int j=row; j<row+cell_rows; j++)
                 {
                     // check w/ anchor cell for multicell block


@@ -1700,7 +1702,7 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
                     if (c_rows > 0) c_rows = 0;
                     if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
                     {
                     if (c_rows > 0) c_rows = 0;
                     if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))
                     {

-                        is_empty = FALSE;
+                        is_empty = false;

                         break;
                     }
                 }
                         break;
                     }
                 }


@@ -1834,7 +1836,7 @@ wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
         val = table->GetValueAsDouble(row, col);
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
     {
         val = table->GetValueAsDouble(row, col);

-        hasDouble = TRUE;
+        hasDouble = true;

     }
     else
     {
     }
     else
     {


@@ -1970,7 +1972,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
     if ( !ms_sizeCheckMark.x )
     {
         // get checkbox size
     if ( !ms_sizeCheckMark.x )
     {
         // get checkbox size

-        wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
+        wxCheckBox *checkbox = new wxCheckBox(&grid, wxID_ANY, wxEmptyString);

         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
 
         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
 


@@ -2596,8 +2598,8 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                     wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
                     wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
 
                     wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row);
                     wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col);
 

-                    if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){
-                        // Two or move are non NULL
+                    if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){
+                        // Two or more are non NULL

                         attr = new wxGridCellAttr;
                         attr->SetKind(wxGridCellAttr::Merged);
 
                         attr = new wxGridCellAttr;
                         attr->SetKind(wxGridCellAttr::Merged);
 


@@ -2619,11 +2621,21 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                         //m_data->m_mergeAttr.SetAttr(attr, row, col);
                     }
                     else
                         //m_data->m_mergeAttr.SetAttr(attr, row, col);
                     }
                     else

-        {
+                    {

                         // one or none is non null return it or null.
                         if(attrrow) attr = attrrow;
                         // one or none is non null return it or null.
                         if(attrrow) attr = attrrow;

-                        if(attrcol) attr = attrcol;
-                        if(attrcell) attr = attrcell;
+                        if(attrcol)
+                        {
+                            if(attr)
+                                attr->DecRef();
+                            attr = attrcol;
+                        }
+                        if(attrcell)
+                        {
+                            if(attr)
+                                attr->DecRef();
+                            attr = attrcell;
+                        }

                     }
                 }
             break;
                     }
                 }
             break;


@@ -2631,10 +2643,10 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                 attr = m_data->m_cellAttrs.GetAttr(row, col);
             break;
             case (wxGridCellAttr::Col):
                 attr = m_data->m_cellAttrs.GetAttr(row, col);
             break;
             case (wxGridCellAttr::Col):

-                 attr = m_data->m_colAttrs.GetAttr(col);
+                attr = m_data->m_colAttrs.GetAttr(col);

             break;
             case (wxGridCellAttr::Row):
             break;
             case (wxGridCellAttr::Row):

-            attr = m_data->m_rowAttrs.GetAttr(row);
+                attr = m_data->m_rowAttrs.GetAttr(row);

             break;
             default:
                 // unused as yet...
             break;
             default:
                 // unused as yet...


@@ -2878,7 +2890,7 @@ bool wxGridTableBase::CanHaveAttributes()
         // use the default attr provider by default
         SetAttrProvider(new wxGridCellAttrProvider);
     }
         // use the default attr provider by default
         SetAttrProvider(new wxGridCellAttrProvider);
     }

-    return TRUE;
+    return true;

 }
 
 wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind  kind)
 }
 
 wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind  kind)


@@ -2939,14 +2951,14 @@ bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
 {
     wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
 
 {
     wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
 

-    return FALSE;
+    return false;

 }
 
 bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
 {
     wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
 
 }
 
 bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
 {
     wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
 

-    return FALSE;
+    return false;

 }
 
 bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
 }
 
 bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),


@@ -2954,7 +2966,7 @@ bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
 {
     wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
 
 {
     wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
 

-    return FALSE;
+    return false;

 }
 
 bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
 }
 
 bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),


@@ -2962,14 +2974,14 @@ bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
 {
     wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
 
 {
     wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
 

-    return FALSE;
+    return false;

 }
 
 bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
 {
     wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
 
 }
 
 bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
 {
     wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
 

-    return FALSE;
+    return false;

 }
 
 bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
 }
 
 bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),


@@ -2977,7 +2989,7 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
 {
     wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
 
 {
     wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -3044,7 +3056,7 @@ double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) )
 
 bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
 {
 
 bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) )
 {

-    return FALSE;
+    return false;

 }
 
 void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),
 }
 
 void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col),


@@ -3216,7 +3228,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows )
         GetView()->ProcessTableMessage( msg );
     }
 
         GetView()->ProcessTableMessage( msg );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGridStringTable::AppendRows( size_t numRows )
 }
 
 bool wxGridStringTable::AppendRows( size_t numRows )


@@ -3243,7 +3255,7 @@ bool wxGridStringTable::AppendRows( size_t numRows )
         GetView()->ProcessTableMessage( msg );
     }
 
         GetView()->ProcessTableMessage( msg );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
 }
 
 bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )


@@ -3260,7 +3272,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
                         (unsigned long)curNumRows
                     ) );
 
                         (unsigned long)curNumRows
                     ) );
 

-        return FALSE;
+        return false;

     }
 
     if ( numRows > curNumRows - pos )
     }
 
     if ( numRows > curNumRows - pos )


@@ -3286,7 +3298,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
         GetView()->ProcessTableMessage( msg );
     }
 
         GetView()->ProcessTableMessage( msg );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
 }
 
 bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )


@@ -3319,7 +3331,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols )
         GetView()->ProcessTableMessage( msg );
     }
 
         GetView()->ProcessTableMessage( msg );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGridStringTable::AppendCols( size_t numCols )
 }
 
 bool wxGridStringTable::AppendCols( size_t numCols )


@@ -3333,7 +3345,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
         // TODO: something better than this ?
         //
         wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
         // TODO: something better than this ?
         //
         wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );

-        return FALSE;
+        return false;

     }
 #endif
 
     }
 #endif
 


@@ -3351,7 +3363,7 @@ bool wxGridStringTable::AppendCols( size_t numCols )
         GetView()->ProcessTableMessage( msg );
     }
 
         GetView()->ProcessTableMessage( msg );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
 }
 
 bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )


@@ -3371,7 +3383,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
                         (unsigned long)numCols,
                         (unsigned long)curNumCols
                     ) );
                         (unsigned long)numCols,
                         (unsigned long)curNumCols
                     ) );

-        return FALSE;
+        return false;

     }
 
     if ( numCols > curNumCols - pos )
     }
 
     if ( numCols > curNumCols - pos )


@@ -3400,7 +3412,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         GetView()->ProcessTableMessage( msg );
     }
 
         GetView()->ProcessTableMessage( msg );
     }
 

-    return TRUE;
+    return true;

 }
 
 wxString wxGridStringTable::GetRowLabelValue( int row )
 }
 
 wxString wxGridStringTable::GetRowLabelValue( int row )


@@ -3692,11 +3704,6 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
 }
 
 
 }
 
 

-wxGridWindow::~wxGridWindow()
-{
-}
-
-

 void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
 void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );


@@ -3768,10 +3775,10 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
                                           m_minAcceptableColWidth, \
 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
                                           m_minAcceptableColWidth, \

-                                          m_colRights, m_numCols, TRUE)
+                                          m_colRights, m_numCols, true)

 #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
                                           m_minAcceptableRowHeight, \
 #define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
                                           m_minAcceptableRowHeight, \

-                                          m_rowBottoms, m_numRows, TRUE)
+                                          m_rowBottoms, m_numRows, true)

 /////////////////////////////////////////////////////////////////////
 
 #if wxUSE_EXTENDED_RTTI
 /////////////////////////////////////////////////////////////////////
 
 #if wxUSE_EXTENDED_RTTI


@@ -3786,7 +3793,7 @@ wxBEGIN_FLAGS( wxGridStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -3817,10 +3824,10 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxGrid)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxGrid)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )

 
 /*
 
 /*

- TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo)
+ TODO : Expose more information of a list's layout etc. via appropriate objects (\81à la NotebookPageInfo)

 */
 #else
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
 */
 #else
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )


@@ -3855,6 +3862,7 @@ wxGrid::wxGrid( wxWindow *parent,
     m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();
     m_rowMinHeights(GRID_HASH_SIZE)
 {
     Create();

+    SetBestFittingSize(size);

 }
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,


@@ -3863,15 +3871,15 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id,
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                                   style | wxWANTS_CHARS , name))
 {
     if (!wxScrolledWindow::Create(parent, id, pos, size,
                                   style | wxWANTS_CHARS , name))

-        return FALSE;
+        return false;

 
     m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
     m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
 
     Create() ;
 
     m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
     m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
 
     Create() ;

+    SetBestFittingSize(size);

 
 

-
-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -3912,12 +3920,12 @@ wxGrid::~wxGrid()
 
 void wxGrid::Create()
 {
 
 void wxGrid::Create()
 {

-    m_created = FALSE;    // set to TRUE by CreateGrid
+    m_created = false;    // set to true by CreateGrid

 
     m_table        = (wxGridTableBase *) NULL;
 
     m_table        = (wxGridTableBase *) NULL;

-    m_ownTable     = FALSE;
+    m_ownTable     = false;

 
 

-    m_cellEditCtrlEnabled = FALSE;
+    m_cellEditCtrlEnabled = false;

 
     m_defaultCellAttr = new wxGridCellAttr();
 
 
     m_defaultCellAttr = new wxGridCellAttr();
 


@@ -3935,7 +3943,7 @@ void wxGrid::Create()
 
     m_defaultCellAttr->SetTextColour(gva.colFg);
     m_defaultCellAttr->SetBackgroundColour(gva.colBg);
 
     m_defaultCellAttr->SetTextColour(gva.colFg);
     m_defaultCellAttr->SetBackgroundColour(gva.colBg);

-    
+

 #else
     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 #else
     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));


@@ -3956,24 +3964,24 @@ void wxGrid::Create()
 
     // subwindow components that make up the wxGrid
     m_cornerLabelWin = new wxGridCornerLabelWindow( this,
 
     // subwindow components that make up the wxGrid
     m_cornerLabelWin = new wxGridCornerLabelWindow( this,

-                                                    -1,
+                                                    wxID_ANY,

                                                     wxDefaultPosition,
                                                     wxDefaultSize );
 
     m_rowLabelWin = new wxGridRowLabelWindow( this,
                                                     wxDefaultPosition,
                                                     wxDefaultSize );
 
     m_rowLabelWin = new wxGridRowLabelWindow( this,

-                                              -1,
+                                              wxID_ANY,

                                               wxDefaultPosition,
                                               wxDefaultSize );
 
     m_colLabelWin = new wxGridColLabelWindow( this,
                                               wxDefaultPosition,
                                               wxDefaultSize );
 
     m_colLabelWin = new wxGridColLabelWindow( this,

-                                              -1,
+                                              wxID_ANY,

                                               wxDefaultPosition,
                                               wxDefaultSize );
 
     m_gridWin = new wxGridWindow( this,
                                   m_rowLabelWin,
                                   m_colLabelWin,
                                               wxDefaultPosition,
                                               wxDefaultSize );
 
     m_gridWin = new wxGridWindow( this,
                                   m_rowLabelWin,
                                   m_colLabelWin,

-                                  -1,
+                                  wxID_ANY,

                                   wxDefaultPosition,
                                   wxDefaultSize );
 
                                   wxDefaultPosition,
                                   wxDefaultSize );
 


@@ -3990,16 +3998,16 @@ void wxGrid::Create()
     wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
 #endif
     wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
 #endif

-    m_cornerLabelWin->SetDefaultForegroundColour(lfg);
-    m_cornerLabelWin->SetDefaultBackgroundColour(lbg);
-    m_rowLabelWin->SetDefaultForegroundColour(lfg);
-    m_rowLabelWin->SetDefaultBackgroundColour(lbg);
-    m_colLabelWin->SetDefaultForegroundColour(lfg);
-    m_colLabelWin->SetDefaultBackgroundColour(lbg);
-
-    m_gridWin->SetDefaultForegroundColour(gfg);
-    m_gridWin->SetDefaultBackgroundColour(gbg);
-    
+    m_cornerLabelWin->SetOwnForegroundColour(lfg);
+    m_cornerLabelWin->SetOwnBackgroundColour(lbg);
+    m_rowLabelWin->SetOwnForegroundColour(lfg);
+    m_rowLabelWin->SetOwnBackgroundColour(lbg);
+    m_colLabelWin->SetOwnForegroundColour(lfg);
+    m_colLabelWin->SetOwnBackgroundColour(lbg);
+
+    m_gridWin->SetOwnForegroundColour(gfg);
+    m_gridWin->SetOwnBackgroundColour(gbg);
+

     Init();
 }
 
     Init();
 }
 


@@ -4008,7 +4016,7 @@ bool wxGrid::CreateGrid( int numRows, int numCols,
                          wxGrid::wxGridSelectionModes selmode )
 {
     wxCHECK_MSG( !m_created,
                          wxGrid::wxGridSelectionModes selmode )
 {
     wxCHECK_MSG( !m_created,

-                 FALSE,
+                 false,

                  wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
 
     m_numRows = numRows;
                  wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
 
     m_numRows = numRows;


@@ -4016,12 +4024,12 @@ bool wxGrid::CreateGrid( int numRows, int numCols,
 
     m_table = new wxGridStringTable( m_numRows, m_numCols );
     m_table->SetView( this );
 
     m_table = new wxGridStringTable( m_numRows, m_numCols );
     m_table->SetView( this );

-    m_ownTable = TRUE;
+    m_ownTable = true;

     m_selection = new wxGridSelection( this, selmode );
 
     CalcDimensions();
 
     m_selection = new wxGridSelection( this, selmode );
 
     CalcDimensions();
 

-    m_created = TRUE;
+    m_created = true;

 
     return m_created;
 }
 
     return m_created;
 }


@@ -4048,7 +4056,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
     if ( m_created )
     {
         // stop all processing
     if ( m_created )
     {
         // stop all processing

-        m_created = FALSE;
+        m_created = false;

 
         if (m_ownTable)
         {
 
         if (m_ownTable)
         {


@@ -4071,12 +4079,12 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
         m_table = table;
         m_table->SetView( this );
         if (takeOwnership)
         m_table = table;
         m_table->SetView( this );
         if (takeOwnership)

-            m_ownTable = TRUE;
+            m_ownTable = true;

         m_selection = new wxGridSelection( this, selmode );
 
         CalcDimensions();
 
         m_selection = new wxGridSelection( this, selmode );
 
         CalcDimensions();
 

-        m_created = TRUE;
+        m_created = true;

     }
 
     return m_created;
     }
 
     return m_created;


@@ -4129,22 +4137,23 @@ void wxGrid::Init()
 #endif
 
     m_gridLineColour = wxColour( 192,192,192 );
 #endif
 
     m_gridLineColour = wxColour( 192,192,192 );

-    m_gridLinesEnabled = TRUE;
+    m_gridLinesEnabled = true;

     m_cellHighlightColour = *wxBLACK;
     m_cellHighlightPenWidth = 2;
     m_cellHighlightROPenWidth = 1;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     m_cellHighlightColour = *wxBLACK;
     m_cellHighlightPenWidth = 2;
     m_cellHighlightROPenWidth = 1;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;

-    m_canDragRowSize = TRUE;
-    m_canDragColSize = TRUE;
-    m_canDragGridSize = TRUE;
+    m_canDragRowSize = true;
+    m_canDragColSize = true;
+    m_canDragGridSize = true;
+    m_canDragCell = false;

     m_dragLastPos  = -1;
     m_dragRowOrCol = -1;
     m_dragLastPos  = -1;
     m_dragRowOrCol = -1;

-    m_isDragging = FALSE;
+    m_isDragging = false;

     m_startDragPos = wxDefaultPosition;
 
     m_startDragPos = wxDefaultPosition;
 

-    m_waitForSlowClick = FALSE;
+    m_waitForSlowClick = false;

 
     m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
     m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
 
     m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
     m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );


@@ -4156,13 +4165,16 @@ void wxGrid::Init()
     m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
     m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 
     m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
     m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 

-    m_editable = TRUE;  // default for whole grid
+    m_editable = true;  // default for whole grid

 
 

-    m_inOnKeyDown = FALSE;
+    m_inOnKeyDown = false;

     m_batchCount = 0;
 
     m_extraWidth =
     m_extraHeight = 0;
     m_batchCount = 0;
 
     m_extraWidth =
     m_extraHeight = 0;

+
+    m_scrollLineX = GRID_SCROLL_LINE_X;
+    m_scrollLineY = GRID_SCROLL_LINE_Y;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -4312,16 +4324,16 @@ void wxGrid::CalcWindowSizes()
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 

-    if ( m_cornerLabelWin->IsShown() )
+    if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )

         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 

-    if ( m_colLabelWin->IsShown() )
+    if (  m_colLabelWin && m_colLabelWin->IsShown() )

         m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
 
         m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight);
 

-    if ( m_rowLabelWin->IsShown() )
+    if ( m_rowLabelWin && m_rowLabelWin->IsShown() )

         m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
 
         m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight);
 

-    if ( m_gridWin->IsShown() )
+    if ( m_gridWin && m_gridWin->IsShown() )

         m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
 }
 
         m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight);
 }
 


@@ -4332,7 +4344,7 @@ void wxGrid::CalcWindowSizes()
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;
 bool wxGrid::Redimension( wxGridTableMessage& msg )
 {
     int i;

-    bool result = FALSE;
+    bool result = false;

 
     // Clear the attribute cache as the attribute might refer to a different
     // cell than stored in the cache after adding/removing rows/columns.
 
     // Clear the attribute cache as the attribute might refer to a different
     // cell than stored in the cache after adding/removing rows/columns.


@@ -4400,7 +4412,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowLabelWin->Refresh();
             }
         }
                 m_rowLabelWin->Refresh();
             }
         }

-        result = TRUE;
+        result = true;

         break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
         break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:


@@ -4436,7 +4448,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowLabelWin->Refresh();
             }
         }
                 m_rowLabelWin->Refresh();
             }
         }

-        result = TRUE;
+        result = true;

         break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
         break;
 
         case wxGRIDTABLE_NOTIFY_ROWS_DELETED:


@@ -4489,7 +4501,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_rowLabelWin->Refresh();
             }
         }
                 m_rowLabelWin->Refresh();
             }
         }

-        result = TRUE;
+        result = true;

         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_INSERTED:


@@ -4532,7 +4544,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             }
 
         }
             }
 
         }

-        result = TRUE;
+        result = true;

         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:


@@ -4567,7 +4579,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_colLabelWin->Refresh();
             }
         }
                 m_colLabelWin->Refresh();
             }
         }

-        result = TRUE;
+        result = true;

         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_DELETED:
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_DELETED:


@@ -4620,7 +4632,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 m_colLabelWin->Refresh();
             }
         }
                 m_colLabelWin->Refresh();
             }
         }

-        result = TRUE;
+        result = true;

         break;
     }
 
         break;
     }
 


@@ -4802,7 +4814,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     {
         if (!m_isDragging)
         {
     {
         if (!m_isDragging)
         {

-            m_isDragging = TRUE;
+            m_isDragging = true;

             m_rowLabelWin->CaptureMouse();
         }
 
             m_rowLabelWin->CaptureMouse();
         }
 


@@ -4859,7 +4871,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     if (m_isDragging)
     {
         if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();
     if (m_isDragging)
     {
         if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse();

-        m_isDragging = FALSE;
+        m_isDragging = false;

     }
 
     // ------------ Entering or leaving the window
     }
 
     // ------------ Entering or leaving the window


@@ -4931,10 +4943,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         {
             row = YToRow(y);
             if ( row >=0 &&
         {
             row = YToRow(y);
             if ( row >=0 &&

-                !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
-           {
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+            {

                 // no default action at the moment
                 // no default action at the moment

-           }
+            }

         }
         else
         {
         }
         else
         {


@@ -4972,7 +4984,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     {
         row = YToRow(y);
         if ( row >=0 &&
     {
         row = YToRow(y);
         if ( row >=0 &&

-           !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -4985,7 +4997,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     {
         row = YToRow(y);
         if ( row >= 0 &&
     {
         row = YToRow(y);
         if ( row >= 0 &&

-            !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -5003,12 +5015,12 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             {
                 // don't capture the mouse yet
                 if ( CanDragRowSize() )
             {
                 // don't capture the mouse yet
                 if ( CanDragRowSize() )

-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, false);

             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {
             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {

-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE);
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, false);

         }
     }
 }
         }
     }
 }


@@ -5024,7 +5036,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     {
         if (!m_isDragging)
         {
     {
         if (!m_isDragging)
         {

-            m_isDragging = TRUE;
+            m_isDragging = true;

             m_colLabelWin->CaptureMouse();
         }
 
             m_colLabelWin->CaptureMouse();
         }
 


@@ -5081,7 +5093,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     if (m_isDragging)
     {
         if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();
     if (m_isDragging)
     {
         if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse();

-        m_isDragging = FALSE;
+        m_isDragging = false;

     }
 
     // ------------ Entering or leaving the window
     }
 
     // ------------ Entering or leaving the window


@@ -5154,7 +5166,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             if ( col >= 0 &&
                  ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
             {
             if ( col >= 0 &&
                  ! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
             {

-               // no default action at the moment
+                // no default action at the moment

             }
         }
         else
             }
         }
         else


@@ -5193,7 +5205,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     {
         col = XToCol(x);
         if ( col >= 0 &&
     {
         col = XToCol(x);
         if ( col >= 0 &&

-            !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -5206,7 +5218,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     {
         col = XToCol(x);
         if ( col >= 0 &&
     {
         col = XToCol(x);
         if ( col >= 0 &&

-            !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )

         {
             // no default action at the moment
         }
         {
             // no default action at the moment
         }


@@ -5224,12 +5236,12 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             {
                 // don't capture the cursor yet
                 if ( CanDragColSize() )
             {
                 // don't capture the cursor yet
                 if ( CanDragColSize() )

-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, false);

             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {
             }
         }
         else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
         {

-            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE);
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, false);

         }
     }
 }
         }
     }
 }


@@ -5346,6 +5358,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     XYToCell( x, y, coords );
 
     int cell_rows, cell_cols;
     XYToCell( x, y, coords );
 
     int cell_rows, cell_cols;

+    bool isFirstDrag = !m_isDragging;

     GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
     if ((cell_rows < 0) || (cell_cols < 0))
     {
     GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
     if ((cell_rows < 0) || (cell_cols < 0))
     {


@@ -5370,7 +5383,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 return;
         }
 
                 return;
         }
 

-        m_isDragging = TRUE;
+        m_isDragging = true;

         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
             // Hide the edit control, so it
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
             // Hide the edit control, so it


@@ -5396,6 +5409,19 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                         m_selectingKeyboard = coords;
                     HighlightBlock ( m_selectingKeyboard, coords );
                 }
                         m_selectingKeyboard = coords;
                     HighlightBlock ( m_selectingKeyboard, coords );
                 }

+                else if ( CanDragCell() )
+                {
+                    if ( isFirstDrag )
+                    {
+                        if ( m_selectingKeyboard == wxGridNoCellCoords)
+                            m_selectingKeyboard = coords;
+
+                        SendEvent( wxEVT_GRID_CELL_BEGIN_DRAG,
+                                   coords.GetRow(),
+                                   coords.GetCol(),
+                                   event );
+                    }
+                }

                 else
                 {
                     if ( !IsSelection() )
                 else
                 {
                     if ( !IsSelection() )


@@ -5456,7 +5482,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
         return;
     }
 
         return;
     }
 

-    m_isDragging = FALSE;
+    m_isDragging = false;

     m_startDragPos = wxDefaultPosition;
 
     // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
     m_startDragPos = wxDefaultPosition;
 
     // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL


@@ -5543,11 +5569,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
         if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
         {
 
         if ( XToEdgeOfCol(x) < 0  &&  YToEdgeOfRow(y) < 0 )
         {

-            SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
-                       coords.GetRow(),
-                       coords.GetCol(),
-                       event );
+            if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+                             coords.GetRow(),
+                             coords.GetCol(),
+                             event ) )
+            {
+                // we want double click to select a cell and start editing
+                // (i.e. to behave in same way as sequence of two slow clicks):
+                m_waitForSlowClick = true;
+            }

         }
         }

+

     }
 
 
     }
 
 


@@ -5574,7 +5606,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 editor->DecRef();
                 attr->DecRef();
 
                 editor->DecRef();
                 attr->DecRef();
 

-                m_waitForSlowClick = FALSE;
+                m_waitForSlowClick = false;

             }
             else if ( m_selectingTopLeft != wxGridNoCellCoords &&
                  m_selectingBottomRight != wxGridNoCellCoords )
             }
             else if ( m_selectingTopLeft != wxGridNoCellCoords &&
                  m_selectingBottomRight != wxGridNoCellCoords )


@@ -5746,7 +5778,7 @@ void wxGrid::DoEndDragResizeRow()
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;
             rect.height = ch - rect.y;
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;
             rect.height = ch - rect.y;

-            m_rowLabelWin->Refresh( TRUE, &rect );
+            m_rowLabelWin->Refresh( true, &rect );

             rect.width = cw;
             // if there is a multicell block, paint all of it
             if (m_table)
             rect.width = cw;
             // if there is a multicell block, paint all of it
             if (m_table)


@@ -5767,7 +5799,7 @@ void wxGrid::DoEndDragResizeRow()
                     rect.height = ch - rect.y;
                 }
             }
                     rect.height = ch - rect.y;
                 }
             }

-            m_gridWin->Refresh( FALSE, &rect );
+            m_gridWin->Refresh( false, &rect );

         }
 
         ShowCellEditControl();
         }
 
         ShowCellEditControl();


@@ -5805,7 +5837,7 @@ void wxGrid::DoEndDragResizeCol()
             CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
             rect.width = cw - rect.x;
             rect.height = m_colLabelHeight;
             CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
             rect.width = cw - rect.x;
             rect.height = m_colLabelHeight;

-            m_colLabelWin->Refresh( TRUE, &rect );
+            m_colLabelWin->Refresh( true, &rect );

             rect.height = ch;
             // if there is a multicell block, paint all of it
             if (m_table)
             rect.height = ch;
             // if there is a multicell block, paint all of it
             if (m_table)


@@ -5826,7 +5858,7 @@ void wxGrid::DoEndDragResizeCol()
                     rect.width = cw - rect.x;
                 }
             }
                     rect.width = cw - rect.x;
                 }
             }

-            m_gridWin->Refresh( FALSE, &rect );
+            m_gridWin->Refresh( false, &rect );

         }
 
         ShowCellEditControl();
         }
 
         ShowCellEditControl();


@@ -5857,7 +5889,7 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
             return Redimension( msg );
 
         default:
             return Redimension( msg );
 
         default:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }
 


@@ -5888,7 +5920,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );

-        return FALSE;
+        return false;

     }
 
     if ( m_table )
     }
 
     if ( m_table )


@@ -5902,7 +5934,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the insert row
         // operation to this view object as a grid table message
     }
         // the table will have sent the results of the insert row
         // operation to this view object as a grid table message
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -5913,7 +5945,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );

-        return FALSE;
+        return false;

     }
 
     if ( m_table )
     }
 
     if ( m_table )


@@ -5923,7 +5955,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
     }
         // the table will have sent the results of the append row
         // operation to this view object as a grid table message
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -5934,7 +5966,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );

-        return FALSE;
+        return false;

     }
 
     if ( m_table )
     }
 
     if ( m_table )


@@ -5947,7 +5979,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the delete row
         // operation to this view object as a grid table message
     }
         // the table will have sent the results of the delete row
         // operation to this view object as a grid table message
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -5958,7 +5990,7 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );

-        return FALSE;
+        return false;

     }
 
     if ( m_table )
     }
 
     if ( m_table )


@@ -5971,7 +6003,7 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
     }
         // the table will have sent the results of the insert col
         // operation to this view object as a grid table message
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -5982,7 +6014,7 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );

-        return FALSE;
+        return false;

     }
 
     if ( m_table )
     }
 
     if ( m_table )


@@ -5992,7 +6024,7 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the append col
         // operation to this view object as a grid table message
     }
         // the table will have sent the results of the append col
         // operation to this view object as a grid table message
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -6003,7 +6035,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
     if ( !m_created )
     {
         wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );

-        return FALSE;
+        return false;

     }
 
     if ( m_table )
     }
 
     if ( m_table )


@@ -6016,7 +6048,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         // the table will have sent the results of the delete col
         // operation to this view object as a grid table message
     }
         // the table will have sent the results of the delete col
         // operation to this view object as a grid table message
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -6061,7 +6093,7 @@ int wxGrid::SendEvent( const wxEventType type,
                this,
                m_selectingTopLeft,
                m_selectingBottomRight,
                this,
                m_selectingTopLeft,
                m_selectingBottomRight,

-               TRUE,
+               true,

                mouseEv.ControlDown(),
                mouseEv.ShiftDown(),
                mouseEv.AltDown(),
                mouseEv.ControlDown(),
                mouseEv.ShiftDown(),
                mouseEv.AltDown(),


@@ -6078,7 +6110,7 @@ int wxGrid::SendEvent( const wxEventType type,
                row, col,
                mouseEv.GetX() + GetRowLabelSize(),
                mouseEv.GetY() + GetColLabelSize(),
                row, col,
                mouseEv.GetX() + GetRowLabelSize(),
                mouseEv.GetY() + GetColLabelSize(),

-               FALSE,
+               false,

                mouseEv.ControlDown(),
                mouseEv.ShiftDown(),
                mouseEv.AltDown(),
                mouseEv.ControlDown(),
                mouseEv.ShiftDown(),
                mouseEv.AltDown(),


@@ -6243,7 +6275,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
         wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
     }
 
         wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
     }
 

-    m_inOnKeyDown = TRUE;
+    m_inOnKeyDown = true;

 
     // propagate the event up and see if it gets processed
     //
 
     // propagate the event up and see if it gets processed
     //


@@ -6331,7 +6363,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     if ( GetGridCursorCol() > 0 )
                     {
                 {
                     if ( GetGridCursorCol() > 0 )
                     {

-                        MoveCursorLeft( FALSE );
+                        MoveCursorLeft( false );

                     }
                     else
                     {
                     }
                     else
                     {


@@ -6343,7 +6375,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     if ( GetGridCursorCol() < GetNumberCols()-1 )
                     {
                 {
                     if ( GetGridCursorCol() < GetNumberCols()-1 )
                     {

-                        MoveCursorRight( FALSE );
+                        MoveCursorRight( false );

                     }
                     else
                     {
                     }
                     else
                     {


@@ -6401,7 +6433,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 if ( !IsEditable() )
                 {
                 }
                 if ( !IsEditable() )
                 {

-                    MoveCursorRight( FALSE );
+                    MoveCursorRight( false );

                     break;
                 }
                 // Otherwise fall through to default
                     break;
                 }
                 // Otherwise fall through to default


@@ -6449,7 +6481,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
         }
     }
 
         }
     }
 

-    m_inOnKeyDown = FALSE;
+    m_inOnKeyDown = false;

 }
 
 void wxGrid::OnKeyUp( wxKeyEvent& event )
 }
 
 void wxGrid::OnKeyUp( wxKeyEvent& event )


@@ -6468,7 +6500,7 @@ void wxGrid::OnKeyUp( wxKeyEvent& event )
                                           m_selectingBottomRight.GetRow(),
                                           m_selectingBottomRight.GetCol(),
                                           event.ControlDown(),
                                           m_selectingBottomRight.GetRow(),
                                           m_selectingBottomRight.GetCol(),
                                           event.ControlDown(),

-                                          TRUE,
+                                          true,

                                           event.AltDown(),
                                           event.MetaDown() );
             }
                                           event.AltDown(),
                                           event.MetaDown() );
             }


@@ -6499,7 +6531,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
     {
         DisableCellEditControl();
 
     {
         DisableCellEditControl();
 

-        if ( IsVisible( m_currentCellCoords, FALSE ) )
+        if ( IsVisible( m_currentCellCoords, false ) )

         {
             wxRect r;
             r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
         {
             wxRect r;
             r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);


@@ -6572,7 +6604,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         wxRect rect;
         rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
                                   wxGridCellCoords ( bottomRow, rightCol ) );
         wxRect rect;
         rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
                                   wxGridCellCoords ( bottomRow, rightCol ) );

-        m_gridWin->Refresh( FALSE, &rect );
+        m_gridWin->Refresh( false, &rect );

     }
     // Now handle changing an existing selection area.
     else if ( m_selectingTopLeft != updateTopLeft ||
     }
     // Now handle changing an existing selection area.
     else if ( m_selectingTopLeft != updateTopLeft ||


@@ -6586,7 +6618,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         need_refresh[0] =
         need_refresh[1] =
         need_refresh[2] =
         need_refresh[0] =
         need_refresh[1] =
         need_refresh[2] =

-        need_refresh[3] = FALSE;
+        need_refresh[3] = false;

         int     i;
 
         // Store intermediate values
         int     i;
 
         // Store intermediate values


@@ -6629,7 +6661,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         {
             // Refresh the newly selected or deselected
             // area to the left of the old or new selection.
         {
             // Refresh the newly selected or deselected
             // area to the left of the old or new selection.

-            need_refresh[0] = TRUE;
+            need_refresh[0] = true;

             rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
                                                             oldLeft ),
                                          wxGridCellCoords ( oldBottom,
             rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
                                                             oldLeft ),
                                          wxGridCellCoords ( oldBottom,


@@ -6640,7 +6672,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         {
             // Refresh the newly selected or deselected
             // area above the old or new selection.
         {
             // Refresh the newly selected or deselected
             // area above the old or new selection.

-            need_refresh[1] = TRUE;
+            need_refresh[1] = true;

             rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
                                                             leftCol ),
                                          wxGridCellCoords ( topRow - 1,
             rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
                                                             leftCol ),
                                          wxGridCellCoords ( topRow - 1,


@@ -6651,7 +6683,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         {
             // Refresh the newly selected or deselected
             // area to the right of the old or new selection.
         {
             // Refresh the newly selected or deselected
             // area to the right of the old or new selection.

-            need_refresh[2] = TRUE;
+            need_refresh[2] = true;

             rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
                                                             rightCol + 1 ),
                                          wxGridCellCoords ( oldBottom,
             rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
                                                             rightCol + 1 ),
                                          wxGridCellCoords ( oldBottom,


@@ -6662,7 +6694,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         {
             // Refresh the newly selected or deselected
             // area below the old or new selection.
         {
             // Refresh the newly selected or deselected
             // area below the old or new selection.

-            need_refresh[3] = TRUE;
+            need_refresh[3] = true;

             rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
                                                             leftCol ),
                                          wxGridCellCoords ( oldBottom,
             rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
                                                             leftCol ),
                                          wxGridCellCoords ( oldBottom,


@@ -6672,7 +6704,7 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo
         // various Refresh() calls
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
         // various Refresh() calls
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )

-                m_gridWin->Refresh( FALSE, &(rect[i]) );
+                m_gridWin->Refresh( false, &(rect[i]) );

     }
     // Change Selection
     m_selectingTopLeft = updateTopLeft;
     }
     // Change Selection
     m_selectingTopLeft = updateTopLeft;


@@ -6693,10 +6725,10 @@ bool wxGrid::GetModelValues()
         // all we need to do is repaint the grid
         //
         m_gridWin->Refresh();
         // all we need to do is repaint the grid
         //
         m_gridWin->Refresh();

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -6719,10 +6751,10 @@ bool wxGrid::SetModelValues()
             }
         }
 
             }
         }
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -6749,12 +6781,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         if ( cell_rows <= 0 || cell_cols <= 0 )
         {
             wxGridCellCoords cell(row+cell_rows, col+cell_cols);
         if ( cell_rows <= 0 || cell_cols <= 0 )
         {
             wxGridCellCoords cell(row+cell_rows, col+cell_cols);

-            bool marked = FALSE;
+            bool marked = false;

             for ( int j = 0;  j < numCells;  j++ )
             {
                 if ( cell == cells[j] )
                 {
             for ( int j = 0;  j < numCells;  j++ )
             {
                 if ( cell == cells[j] )
                 {

-                    marked = TRUE;
+                    marked = true;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -6765,7 +6797,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                 {
                     if ( cell == redrawCells[j] )
                     {
                 {
                     if ( cell == redrawCells[j] )
                     {

-                        marked = TRUE;
+                        marked = true;

                         break;
                     }
                 }
                         break;
                     }
                 }


@@ -6795,13 +6827,13 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                         if (GetCellOverflow(row+l, j))
                         {
                             wxGridCellCoords cell(row+l, j);
                         if (GetCellOverflow(row+l, j))
                         {
                             wxGridCellCoords cell(row+l, j);

-                            bool marked = FALSE;
+                            bool marked = false;

 
                             for (int k = 0; k < numCells; k++)
                             {
                                 if ( cell == cells[k] )
                                 {
 
                             for (int k = 0; k < numCells; k++)
                             {
                                 if ( cell == cells[k] )
                                 {

-                                    marked = TRUE;
+                                    marked = true;

                                     break;
                                 }
                             }
                                     break;
                                 }
                             }


@@ -6812,7 +6844,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                                 {
                                     if ( cell == redrawCells[k] )
                                     {
                                 {
                                     if ( cell == redrawCells[k] )
                                     {

-                                        marked = TRUE;
+                                        marked = true;

                                         break;
                                     }
                                 }
                                         break;
                                     }
                                 }


@@ -7512,19 +7544,19 @@ bool wxGrid::CanEnableCellControl() const
 {
     return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
         !IsCurrentCellReadOnly();
 {
     return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
         !IsCurrentCellReadOnly();

-        
+

 }
 
 bool wxGrid::IsCellEditControlEnabled() const
 {
     // the cell edit control might be disable for all cells or just for the
     // current one if it's read only
 }
 
 bool wxGrid::IsCellEditControlEnabled() const
 {
     // the cell edit control might be disable for all cells or just for the
     // current one if it's read only

-    return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
+    return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : false;

 }
 
 bool wxGrid::IsCellEditControlShown() const
 {
 }
 
 bool wxGrid::IsCellEditControlShown() const
 {

-    bool isShown = FALSE;
+    bool isShown = false;

 
     if ( m_cellEditCtrlEnabled )
     {
 
     if ( m_cellEditCtrlEnabled )
     {


@@ -7554,7 +7586,7 @@ void wxGrid::ShowCellEditControl()
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {

-            m_cellEditCtrlEnabled = FALSE;
+            m_cellEditCtrlEnabled = false;

             return;
         }
         else
             return;
         }
         else


@@ -7602,7 +7634,7 @@ void wxGrid::ShowCellEditControl()
             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {
             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
             {

-                editor->Create(m_gridWin, -1,
+                editor->Create(m_gridWin, wxID_ANY,

                                new wxGridCellEditorEvtHandler(this, editor));
 
                 wxGridEditorCreatedEvent evt(GetId(),
                                new wxGridCellEditorEvtHandler(this, editor));
 
                 wxGridEditorCreatedEvent evt(GetId(),


@@ -7650,7 +7682,7 @@ void wxGrid::ShowCellEditControl()
 
             editor->SetCellAttr(attr);
             editor->SetSize( rect );
 
             editor->SetCellAttr(attr);
             editor->SetSize( rect );

-            editor->Show( TRUE, attr );
+            editor->Show( true, attr );

 
             // recalc dimensions in case we need to
             // expand the scrolled window to account for editor
 
             // recalc dimensions in case we need to
             // expand the scrolled window to account for editor


@@ -7675,7 +7707,7 @@ void wxGrid::HideCellEditControl()
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
 
         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);

-        editor->Show( FALSE );
+        editor->Show( false );

         editor->DecRef();
         attr->DecRef();
         m_gridWin->SetFocus();
         editor->DecRef();
         attr->DecRef();
         m_gridWin->SetFocus();


@@ -7683,7 +7715,7 @@ void wxGrid::HideCellEditControl()
         wxRect rect( CellToRect(row, col) );
         CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
         rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;
         wxRect rect( CellToRect(row, col) );
         CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );
         rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x;

-        m_gridWin->Refresh( FALSE, &rect );
+        m_gridWin->Refresh( false, &rect );

     }
 }
 
     }
 }
 


@@ -7808,14 +7840,14 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
 int wxGrid::YToRow( int y )
 {
     return CoordToRowOrCol(y, m_defaultRowHeight,
 int wxGrid::YToRow( int y )
 {
     return CoordToRowOrCol(y, m_defaultRowHeight,

-                           m_minAcceptableRowHeight, m_rowBottoms, m_numRows, FALSE);
+                           m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);

 }
 
 
 int wxGrid::XToCol( int x )
 {
     return CoordToRowOrCol(x, m_defaultColWidth,
 }
 
 
 int wxGrid::XToCol( int x )
 {
     return CoordToRowOrCol(x, m_defaultColWidth,

-                           m_minAcceptableColWidth, m_colRights, m_numCols, FALSE);
+                           m_minAcceptableColWidth, m_colRights, m_numCols, false);

 }
 
 
 }
 
 


@@ -8039,11 +8071,11 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
                             m_currentCellCoords.GetCol() );
         }
         else
                             m_currentCellCoords.GetCol() );
         }
         else

-            return FALSE;
-        return TRUE;
+            return false;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -8073,11 +8105,11 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
                             m_currentCellCoords.GetCol() );
         }
         else
                             m_currentCellCoords.GetCol() );
         }
         else

-            return FALSE;
-        return TRUE;
+            return false;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -8107,11 +8139,11 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
                             m_currentCellCoords.GetCol() - 1 );
         }
         else
                             m_currentCellCoords.GetCol() - 1 );
         }
         else

-            return FALSE;
-        return TRUE;
+            return false;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -8141,17 +8173,17 @@ bool wxGrid::MoveCursorRight( bool expandSelection )
                             m_currentCellCoords.GetCol() + 1 );
         }
         else
                             m_currentCellCoords.GetCol() + 1 );
         }
         else

-            return FALSE;
-        return TRUE;
+            return false;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 bool wxGrid::MovePageUp()
 {
 }
 
 
 bool wxGrid::MovePageUp()
 {

-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+    if ( m_currentCellCoords == wxGridNoCellCoords ) return false;

 
     int row = m_currentCellCoords.GetRow();
     if ( row > 0 )
 
     int row = m_currentCellCoords.GetRow();
     if ( row > 0 )


@@ -8164,22 +8196,22 @@ bool wxGrid::MovePageUp()
 
         if ( newRow == row )
         {
 
         if ( newRow == row )
         {

-           //row > 0 , so newrow can never be less than 0 here.
+            //row > 0 , so newrow can never be less than 0 here.

             newRow = row - 1;
         }
 
         MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
         SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
             newRow = row - 1;
         }
 
         MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
         SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGrid::MovePageDown()
 {
 }
 
 bool wxGrid::MovePageDown()
 {

-    if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE;
+    if ( m_currentCellCoords == wxGridNoCellCoords ) return false;

 
     int row = m_currentCellCoords.GetRow();
     if ( (row+1) < m_numRows )
 
     int row = m_currentCellCoords.GetRow();
     if ( (row+1) < m_numRows )


@@ -8192,16 +8224,16 @@ bool wxGrid::MovePageDown()
         if ( newRow == row )
         {
             // row < m_numRows , so newrow can't overflow here.
         if ( newRow == row )
         {
             // row < m_numRows , so newrow can't overflow here.

-           newRow = row + 1;
+            newRow = row + 1;

         }
 
         MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
         SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 
         }
 
         MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
         SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGrid::MoveCursorUpBlock( bool expandSelection )
 }
 
 bool wxGrid::MoveCursorUpBlock( bool expandSelection )


@@ -8261,10 +8293,10 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
             ClearSelection();
             SetCurrentCell( row, col );
         }
             ClearSelection();
             SetCurrentCell( row, col );
         }

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGrid::MoveCursorDownBlock( bool expandSelection )
 }
 
 bool wxGrid::MoveCursorDownBlock( bool expandSelection )


@@ -8325,10 +8357,10 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
             SetCurrentCell( row, col );
         }
 
             SetCurrentCell( row, col );
         }
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
 }
 
 bool wxGrid::MoveCursorLeftBlock( bool expandSelection )


@@ -8389,10 +8421,10 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
             SetCurrentCell( row, col );
         }
 
             SetCurrentCell( row, col );
         }
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGrid::MoveCursorRightBlock( bool expandSelection )
 }
 
 bool wxGrid::MoveCursorRightBlock( bool expandSelection )


@@ -8453,10 +8485,10 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
             SetCurrentCell( row, col );
         }
 
             SetCurrentCell( row, col );
         }
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -8518,18 +8550,18 @@ void wxGrid::SetRowLabelSize( int width )
     {
         if ( width == 0 )
         {
     {
         if ( width == 0 )
         {

-            m_rowLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
+            m_rowLabelWin->Show( false );
+            m_cornerLabelWin->Show( false );

         }
         else if ( m_rowLabelWidth == 0 )
         {
         }
         else if ( m_rowLabelWidth == 0 )
         {

-            m_rowLabelWin->Show( TRUE );
-            if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE );
+            m_rowLabelWin->Show( true );
+            if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( true );

         }
 
         m_rowLabelWidth = width;
         CalcWindowSizes();
         }
 
         m_rowLabelWidth = width;
         CalcWindowSizes();

-        wxScrolledWindow::Refresh( TRUE );
+        wxScrolledWindow::Refresh( true );

     }
 }
 
     }
 }
 


@@ -8541,18 +8573,18 @@ void wxGrid::SetColLabelSize( int height )
     {
         if ( height == 0 )
         {
     {
         if ( height == 0 )
         {

-            m_colLabelWin->Show( FALSE );
-            m_cornerLabelWin->Show( FALSE );
+            m_colLabelWin->Show( false );
+            m_cornerLabelWin->Show( false );

         }
         else if ( m_colLabelHeight == 0 )
         {
         }
         else if ( m_colLabelHeight == 0 )
         {

-            m_colLabelWin->Show( TRUE );
-            if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE );
+            m_colLabelWin->Show( true );
+            if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( true );

         }
 
         m_colLabelHeight = height;
         CalcWindowSizes();
         }
 
         m_colLabelHeight = height;
         CalcWindowSizes();

-        wxScrolledWindow::Refresh( TRUE );
+        wxScrolledWindow::Refresh( true );

     }
 }
 
     }
 }
 


@@ -8664,12 +8696,12 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert )
     }
 }
 
     }
 }
 

-// Note:       under MSW, the default column label font must be changed because it
-//                             does not support vertical printing
+// Note: under MSW, the default column label font must be changed because it
+//       does not support vertical printing

 //
 // Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD);
 //
 // Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD);

-//                             pGrid->SetLabelFont(font);
-//             pGrid->SetColLabelTextOrientation(wxVERTICAL);
+//                      pGrid->SetLabelFont(font);
+//                      pGrid->SetColLabelTextOrientation(wxVERTICAL);

 //
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {
 //
 void wxGrid::SetColLabelTextOrientation( int textOrientation )
 {


@@ -8697,7 +8729,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
                 rect.x = 0;
                 rect.width = m_rowLabelWidth;
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
                 rect.x = 0;
                 rect.width = m_rowLabelWidth;

-                m_rowLabelWin->Refresh( TRUE, &rect );
+                m_rowLabelWin->Refresh( true, &rect );

             }
         }
     }
             }
         }
     }


@@ -8716,7 +8748,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
                 CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
                 rect.y = 0;
                 rect.height = m_colLabelHeight;
                 CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
                 rect.y = 0;
                 rect.height = m_colLabelHeight;

-                m_colLabelWin->Refresh( TRUE, &rect );
+                m_colLabelWin->Refresh( true, &rect );

             }
         }
     }
             }
         }
     }


@@ -8761,7 +8793,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
         wxRect rect = CellToRect(row, col);
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
         wxRect rect = CellToRect(row, col);

-        m_gridWin->Refresh(TRUE, &rect);
+        m_gridWin->Refresh(true, &rect);

     }
 }
 
     }
 }
 


@@ -8777,7 +8809,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width)
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
         wxRect rect = CellToRect(row, col);
         if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
         wxRect rect = CellToRect(row, col);

-        m_gridWin->Refresh(TRUE, &rect);
+        m_gridWin->Refresh(true, &rect);

     }
 }
 
     }
 }
 


@@ -8865,14 +8897,24 @@ void wxGrid::SetDefaultCellFont( const wxFont& font )
     m_defaultCellAttr->SetFont(font);
 }
 
     m_defaultCellAttr->SetFont(font);
 }
 

+
+// For editors and renderers the type registry takes precedence over the
+// default attr, so we need to register the new editor/renderer for the string
+// data type in order to make setting a default editor/renderer appear to
+// work correctly.
+

 void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
 {
 void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
 {

-    m_defaultCellAttr->SetRenderer(renderer);
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     renderer,
+                     GetDefaultEditorForType(wxGRID_VALUE_STRING));

 }
 
 void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
 {
 }
 
 void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
 {

-    m_defaultCellAttr->SetEditor(editor);
+    RegisterDataType(wxGRID_VALUE_STRING,
+                     GetDefaultRendererForType(wxGRID_VALUE_STRING),
+                     editor);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -8998,7 +9040,7 @@ bool wxGrid::CanHaveAttributes()
 {
     if ( !m_table )
     {
 {
     if ( !m_table )
     {

-        return FALSE;
+        return false;

     }
 
     return m_table->CanHaveAttributes();
     }
 
     return m_table->CanHaveAttributes();


@@ -9039,14 +9081,14 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
         gs_nAttrCacheHits++;
 #endif
 
         gs_nAttrCacheHits++;
 #endif
 

-        return TRUE;
+        return true;

     }
     else
     {
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheMisses++;
 #endif
     }
     else
     {
 #ifdef DEBUG_ATTR_CACHE
         gs_nAttrCacheMisses++;
 #endif

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -9080,9 +9122,10 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
 wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
 wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
 {
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;

+    bool canHave = ((wxGrid*)this)->CanHaveAttributes();

 
 

-    wxCHECK_MSG( m_table, attr,
-                  _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
+    wxCHECK_MSG( canHave, attr, _T("Cell attributes not allowed"));
+    wxCHECK_MSG( m_table, attr, _T("must have a table") );

 
     attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
     if ( !attr )
 
     attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell);
     if ( !attr )


@@ -9389,6 +9432,10 @@ void wxGrid::EnableDragGridSize( bool enable )
     m_canDragGridSize = enable;
 }
 
     m_canDragGridSize = enable;
 }
 

+void wxGrid::EnableDragCell( bool enable )
+{
+    m_canDragCell = enable;
+}

 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {


@@ -9498,26 +9545,30 @@ void wxGrid::SetColSize( int col, int width )
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
     if (width > GetColMinimalAcceptableWidth()) {
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
     if (width > GetColMinimalAcceptableWidth()) {

-        m_colMinWidths[col] = width;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+        m_colMinWidths[key] = width;

     }
 }
 
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
     if (width > GetRowMinimalAcceptableHeight()) {
     }
 }
 
 void wxGrid::SetRowMinimalHeight( int row, int width )
 {
     if (width > GetRowMinimalAcceptableHeight()) {

-       m_rowMinHeights[row] = width;
+        wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+        m_rowMinHeights[key] = width;

     }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {
     }
 }
 
 int wxGrid::GetColMinimalWidth(int col) const
 {

-    wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(col);
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col;
+    wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);

     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {
     return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {

-    wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(row);
+    wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row;
+    wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);

     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
 
     return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
 }
 


@@ -9645,7 +9696,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
             CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
             rect.width = cw - rect.x;
             rect.height = m_colLabelHeight;
             CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
             rect.width = cw - rect.x;
             rect.height = m_colLabelHeight;

-            m_colLabelWin->Refresh( TRUE, &rect );
+            m_colLabelWin->Refresh( true, &rect );

         }
     }
     else
         }
     }
     else


@@ -9660,7 +9711,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;
             rect.height = ch - rect.y;
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;
             rect.height = ch - rect.y;

-            m_rowLabelWin->Refresh( TRUE, &rect );
+            m_rowLabelWin->Refresh( true, &rect );

         }
     }
     if ( setAsMin )
         }
     }
     if ( setAsMin )


@@ -9722,7 +9773,7 @@ void wxGrid::AutoSize()
 {
     BeginBatch();
 
 {
     BeginBatch();
 

-    wxSize size(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+    wxSize size(SetOrCalcColumnSizes(false), SetOrCalcRowSizes(false));

 
     // round up the size to a multiple of scroll step - this ensures that we
     // won't get the scrollbars if we're sized exactly to this width
 
     // round up the size to a multiple of scroll step - this ensures that we
     // won't get the scrollbars if we're sized exactly to this width


@@ -9844,16 +9895,36 @@ wxSize wxGrid::DoGetBestSize() const
     wxGrid *self = (wxGrid *)this;  // const_cast
 
     int width, height;
     wxGrid *self = (wxGrid *)this;  // const_cast
 
     int width, height;

-    width = self->SetOrCalcColumnSizes(TRUE);
-    height = self->SetOrCalcRowSizes(TRUE);
-
+    width = self->SetOrCalcColumnSizes(true);
+    height = self->SetOrCalcRowSizes(true);
+
+    if (!width) width=100;
+    if (!height) height=80;
+
+    // Round up to a multiple the scroll rate NOTE: this still doesn't get rid
+    // of the scrollbars, is there any magic incantaion for that?
+    int xpu, ypu;
+    GetScrollPixelsPerUnit(&xpu, &ypu);
+    if (xpu)
+        width  += 1 + xpu - (width  % xpu);
+    if (ypu)
+        height += 1 + ypu - (height % ypu);
+
+    // limit to 1/4 of the screen size

     int maxwidth, maxheight;
     wxDisplaySize( & maxwidth, & maxheight );
     int maxwidth, maxheight;
     wxDisplaySize( & maxwidth, & maxheight );

-
+    maxwidth /= 2;
+    maxheight /= 2;

     if ( width > maxwidth ) width = maxwidth;
     if ( height > maxheight ) height = maxheight;
 
     if ( width > maxwidth ) width = maxwidth;
     if ( height > maxheight ) height = maxheight;
 

-    return wxSize( width, height );
+
+    wxSize best(width, height);
+    // NOTE: This size should be cached, but first we need to add calls to
+    // InvalidateBestSize everywhere that could change the results of this
+    // calculation.
+    // CacheBestSize(size);
+    return best;

 }
 
 void wxGrid::Fit()
 }
 
 void wxGrid::Fit()


@@ -9883,7 +9954,7 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
             rect.x = 0;
             rect.width = m_gridWin->GetClientSize().GetWidth();
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.x = 0;
             rect.width = m_gridWin->GetClientSize().GetWidth();
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);

-            m_gridWin->Refresh( FALSE, &rect );
+            m_gridWin->Refresh( false, &rect );

         }
 
         if ( m_currentCellCoords.GetRow() == row &&
         }
 
         if ( m_currentCellCoords.GetRow() == row &&


@@ -9910,7 +9981,7 @@ void wxGrid::SelectRow( int row, bool addToSelected )
         ClearSelection();
 
     if ( m_selection )
         ClearSelection();
 
     if ( m_selection )

-        m_selection->SelectRow( row, FALSE, addToSelected );
+        m_selection->SelectRow( row, false, addToSelected );

 }
 
 
 }
 
 


@@ -9920,7 +9991,7 @@ void wxGrid::SelectCol( int col, bool addToSelected )
         ClearSelection();
 
     if ( m_selection )
         ClearSelection();
 
     if ( m_selection )

-        m_selection->SelectCol( col, FALSE, addToSelected );
+        m_selection->SelectCol( col, false, addToSelected );

 }
 
 
 }
 
 


@@ -9932,7 +10003,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
 
     if ( m_selection )
         m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
 
     if ( m_selection )
         m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,

-                                  FALSE, addToSelected );
+                                  false, addToSelected );

 }
 
 
 }