add a outside area for borders and focus rects of 3 pixels to a wxWindowDC's clip...

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 9e25988500c6d0d413e739b219aab68a5aac21cc..f38e12eb13300ff1a7d159f4e0f48237b95f7fe0 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "grid.h"
 #endif
 
     #pragma implementation "grid.h"
 #endif
 


@@ -32,10 +32,6 @@
 
 #if wxUSE_GRID
 
 
 #if wxUSE_GRID
 

-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-    #include "gridg.cpp"
-#else // wxUSE_NEW_GRID
-

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"


@@ -45,6 +41,7 @@
     #include "wx/checkbox.h"
     #include "wx/combobox.h"
     #include "wx/valtext.h"
     #include "wx/checkbox.h"
     #include "wx/combobox.h"
     #include "wx/valtext.h"

+    #include "wx/intl.h"

 #endif
 
 #include "wx/textfile.h"
 #endif
 
 #include "wx/textfile.h"


@@ -73,7 +70,8 @@
 // array classes
 // ----------------------------------------------------------------------------
 
 // array classes
 // ----------------------------------------------------------------------------
 

-WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridCellAttr *, wxArrayAttrs,
+                                 class WXDLLIMPEXP_ADV);

 
 struct wxGridCellWithAttr
 {
 
 struct wxGridCellWithAttr
 {


@@ -89,9 +87,14 @@ struct wxGridCellWithAttr
 
     wxGridCellCoords coords;
     wxGridCellAttr  *attr;
 
     wxGridCellCoords coords;
     wxGridCellAttr  *attr;

+
+// Cannot do this:
+//  DECLARE_NO_COPY_CLASS(wxGridCellWithAttr)
+// without rewriting the macros, which require a public copy constructor.

 };
 
 };
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray,
+                              class WXDLLIMPEXP_ADV);

 
 #include "wx/arrimpl.cpp"
 
 
 #include "wx/arrimpl.cpp"
 


@@ -123,7 +126,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
 // private classes
 // ----------------------------------------------------------------------------
 
 // private classes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow

 {
 public:
     wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
 {
 public:
     wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }


@@ -141,10 +144,11 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)

 };
 
 
 };
 
 

-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow

 {
 public:
     wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
 {
 public:
     wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }


@@ -162,10 +166,11 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)

 };
 
 
 };
 
 

-class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow

 {
 public:
     wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
 {
 public:
     wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }


@@ -183,9 +188,10 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)

 };
 
 };
 

-class WXDLLEXPORT wxGridWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow

 {
 public:
     wxGridWindow()
 {
 public:
     wxGridWindow()


@@ -203,6 +209,8 @@ public:
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
 
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 

+    wxGrid* GetOwner() { return m_owner; }
+

 private:
     wxGrid                   *m_owner;
     wxGridRowLabelWindow     *m_rowLabelWin;
 private:
     wxGrid                   *m_owner;
     wxGridRowLabelWindow     *m_rowLabelWin;


@@ -214,10 +222,11 @@ private:
     void OnKeyDown( wxKeyEvent& );
     void OnKeyUp( wxKeyEvent& );
     void OnEraseBackground( wxEraseEvent& );
     void OnKeyDown( wxKeyEvent& );
     void OnKeyUp( wxKeyEvent& );
     void OnEraseBackground( wxEraseEvent& );

-
+    void OnFocus( wxFocusEvent& );

 
     DECLARE_DYNAMIC_CLASS(wxGridWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridWindow)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxGridWindow)

 };
 
 
 };
 
 


@@ -240,6 +249,7 @@ private:
     wxGridCellEditor*   m_editor;
     DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
     DECLARE_EVENT_TABLE()
     wxGridCellEditor*   m_editor;
     DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)

 };
 
 
 };
 
 


@@ -256,7 +266,7 @@ END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
 
 // this class stores attributes set for cells
 // ----------------------------------------------------------------------------
 
 // this class stores attributes set for cells

-class WXDLLEXPORT wxGridCellAttrData
+class WXDLLIMPEXP_ADV wxGridCellAttrData

 {
 public:
     void SetAttr(wxGridCellAttr *attr, int row, int col);
 {
 public:
     void SetAttr(wxGridCellAttr *attr, int row, int col);


@@ -272,7 +282,7 @@ private:
 };
 
 // this class stores attributes set for rows or columns
 };
 
 // this class stores attributes set for rows or columns

-class WXDLLEXPORT wxGridRowOrColAttrData
+class WXDLLIMPEXP_ADV wxGridRowOrColAttrData

 {
 public:
     // empty ctor to suppress warnings
 {
 public:
     // empty ctor to suppress warnings


@@ -290,7 +300,7 @@ private:
 
 // NB: this is just a wrapper around 3 objects: one which stores cell
 //     attributes, and 2 others for row/col ones
 
 // NB: this is just a wrapper around 3 objects: one which stores cell
 //     attributes, and 2 others for row/col ones

-class WXDLLEXPORT wxGridCellAttrProviderData
+class WXDLLIMPEXP_ADV wxGridCellAttrProviderData

 {
 public:
     wxGridCellAttrData m_cellAttrs;
 {
 public:
     wxGridCellAttrData m_cellAttrs;


@@ -320,13 +330,16 @@ struct wxGridDataTypeInfo
     wxString            m_typeName;
     wxGridCellRenderer* m_renderer;
     wxGridCellEditor*   m_editor;
     wxString            m_typeName;
     wxGridCellRenderer* m_renderer;
     wxGridCellEditor*   m_editor;

+
+    DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo)

 };
 
 
 };
 
 

-WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray,
+                                 class WXDLLIMPEXP_ADV);

 
 
 
 

-class WXDLLEXPORT wxGridTypeRegistry
+class WXDLLIMPEXP_ADV wxGridTypeRegistry

 {
 public:
   wxGridTypeRegistry() {}
 {
 public:
   wxGridTypeRegistry() {}


@@ -424,6 +437,7 @@ static inline int GetScrollY(int y)
 wxGridCellEditor::wxGridCellEditor()
 {
     m_control = NULL;
 wxGridCellEditor::wxGridCellEditor()
 {
     m_control = NULL;

+    m_attr = NULL;

 }
 
 
 }
 
 


@@ -445,6 +459,10 @@ void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
 {
     // erase the background because we might not fill the cell
     wxClientDC dc(m_control->GetParent());
 {
     // erase the background because we might not fill the cell
     wxClientDC dc(m_control->GetParent());

+    wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow);
+    if (gridWindow)
+        gridWindow->GetOwner()->PrepareDC(dc);
+

     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
     dc.DrawRectangle(rectCell);
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
     dc.DrawRectangle(rectCell);


@@ -457,7 +475,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;


@@ -556,12 +574,15 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)

-                               , wxTE_PROCESS_TAB | wxTE_MULTILINE |
-                                 wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
+                               , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL

 #endif
                               );
 
 #endif
                               );
 

-    // TODO: use m_maxChars
+    // set max length allowed in the textctrl, if the parameter was set
+    if (m_maxChars != 0)
+    {
+        ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars);
+    }

 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }


@@ -639,16 +660,17 @@ 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);
 
     m_startValue = wxEmptyString;
 
     if (changed)
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;

-    Text()->SetValue(m_startValue);
+    // No point in setting the text of the hidden control
+    //Text()->SetValue(m_startValue);

 
     return changed;
 }
 
     return changed;
 }


@@ -695,16 +717,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
 
             default:
                 // accept 8 bit chars too if isprint() agrees

-                if ( (keycode < 255) && (isprint(keycode)) )
-                    return TRUE;
+                if ( (keycode < 255) && (wxIsprint(keycode)) )
+                    return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

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


@@ -753,6 +775,12 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

+// return the value in the text control
+wxString wxGridCellTextEditor::GetValue() const
+{
+  return Text()->GetValue();
+}
+

 // ----------------------------------------------------------------------------
 // wxGridCellNumberEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellNumberEditor
 // ----------------------------------------------------------------------------


@@ -770,7 +798,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);


@@ -884,23 +912,23 @@ 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:
 
             default:

-                if ( (keycode < 128) && isdigit(keycode) )
-                    return TRUE;
+                if ( (keycode < 128) && wxIsdigit(keycode) )
+                    return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
 {
     if ( !HasRange() )
     {
 }
 
 void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
 {
     if ( !HasRange() )
     {

-        int keycode = (int) event.KeyCode();
-        if ( isdigit(keycode) || keycode == '+' || keycode == '-'
+        int keycode = event.GetKeyCode();
+        if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'

             || keycode ==  WXK_NUMPAD0
             || keycode ==  WXK_NUMPAD1
             || keycode ==  WXK_NUMPAD2
             || keycode ==  WXK_NUMPAD0
             || keycode ==  WXK_NUMPAD1
             || keycode ==  WXK_NUMPAD2


@@ -954,6 +982,23 @@ void wxGridCellNumberEditor::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

+// return the value in the spin control if it is there (the text control otherwise)
+wxString wxGridCellNumberEditor::GetValue() const
+{
+  wxString s;
+
+  if( HasRange() )
+  {
+    long value = Spin()->GetValue();
+    s.Printf(wxT("%ld"), value);
+  }
+  else
+  {
+    s = Text()->GetValue();
+  }
+  return s;
+}
+

 // ----------------------------------------------------------------------------
 // wxGridCellFloatEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellFloatEditor
 // ----------------------------------------------------------------------------


@@ -1010,9 +1055,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()


@@ -1022,8 +1067,14 @@ void wxGridCellFloatEditor::Reset()
 
 void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
 {
 
 void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
 {

-    int keycode = (int)event.KeyCode();
-        if ( isdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.'
+    int keycode = event.GetKeyCode();
+    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) );
+        if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
+            || is_decimal_point

             || keycode ==  WXK_NUMPAD0
             || keycode ==  WXK_NUMPAD1
             || keycode ==  WXK_NUMPAD2
             || keycode ==  WXK_NUMPAD0
             || keycode ==  WXK_NUMPAD1
             || keycode ==  WXK_NUMPAD2


@@ -1120,17 +1171,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'
+            {
+               // 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) );

                 if ( (keycode < 128) &&
                 if ( (keycode < 128) &&

-                     (isdigit(keycode) || tolower(keycode) == 'e') )
-                    return TRUE;
+                     (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
+                      is_decimal_point || keycode == '+' || keycode == '-') )
+                    return true;
+            }

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

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


@@ -1154,7 +1215,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);
 


@@ -1165,7 +1226,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 )


@@ -1173,7 +1234,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 )


@@ -1193,7 +1254,32 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r)
     size.y -= 2;
 #endif
 
     size.y -= 2;
 #endif
 

-    m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2);
+    int hAlign = wxALIGN_CENTRE;
+    int vAlign = wxALIGN_CENTRE;
+    if (GetCellAttr())
+        GetCellAttr()->GetAlignment(& hAlign, & vAlign);
+
+    int x = 0, y = 0;
+    if (hAlign == wxALIGN_LEFT)
+    {
+        x = r.x + 2;
+#ifdef __WXMSW__
+        x += 2;
+#endif
+        y = r.y + r.height/2 - size.y/2;
+    }
+    else if (hAlign == wxALIGN_RIGHT)
+    {
+        x = r.x + r.width - size.x - 2;
+        y = r.y + r.height/2 - size.y/2;
+    }
+    else if (hAlign == wxALIGN_CENTRE)
+    {
+        x = r.x + r.width/2 - size.x/2;
+        y = r.y + r.height/2 - size.y/2;
+    }
+
+    m_control->Move(x, y);

 }
 
 void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
 }
 
 void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)


@@ -1229,10 +1315,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 )
     {


@@ -1274,11 +1360,18 @@ 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
+wxString wxGridCellBoolEditor::GetValue() const
+{
+  bool bSet = CBox()->GetValue();
+  return bSet ? _T("1") : wxEmptyString;

 }
 
 #endif // wxUSE_CHECKBOX
 }
 
 #endif // wxUSE_CHECKBOX


@@ -1289,6 +1382,11 @@ bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
 // wxGridCellChoiceEditor
 // ----------------------------------------------------------------------------
 
 // wxGridCellChoiceEditor
 // ----------------------------------------------------------------------------
 

+wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices,
+                                               bool allowOthers)
+    : m_choices(choices),
+      m_allowOthers(allowOthers) { }
+

 wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
                                                const wxString choices[],
                                                bool allowOthers)
 wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
                                                const wxString choices[],
                                                bool allowOthers)


@@ -1317,20 +1415,11 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent,
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 {
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 {

-    size_t count = m_choices.GetCount();
-    wxString *choices = new wxString[count];
-    for ( size_t n = 0; n < count; n++ )
-    {
-        choices[n] = m_choices[n];
-    }
-

     m_control = new wxComboBox(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize,
     m_control = new wxComboBox(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize,

-                               count, choices,
+                               m_choices,

                                m_allowOthers ? 0 : wxCB_READONLY);
 
                                m_allowOthers ? 0 : wxCB_READONLY);
 

-    delete [] choices;
-

     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 


@@ -1353,15 +1442,15 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 
     m_startValue = grid->GetTable()->GetValue(row, col);
 
 
     m_startValue = grid->GetTable()->GetValue(row, col);
 

-    Combo()->SetValue(m_startValue);
-    size_t count = m_choices.GetCount();
-    for (size_t i=0; i<count; i++)
+    if (m_allowOthers)
+        Combo()->SetValue(m_startValue);
+    else

     {
     {

-        if (m_startValue == m_choices[i])
-        {
-            Combo()->SetSelection(i);
-            break;
-        }
+        // find the right position, or default to the first if not found
+        int pos = Combo()->FindString(m_startValue);
+        if (pos == -1)
+            pos = 0;
+        Combo()->SetSelection(pos);

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


@@ -1377,7 +1466,10 @@ bool wxGridCellChoiceEditor::EndEdit(int row, int col,
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;

-    Combo()->SetValue(m_startValue);
+    if (m_allowOthers)
+        Combo()->SetValue(m_startValue);
+    else
+        Combo()->SetSelection(0);

 
     return changed;
 }
 
     return changed;
 }


@@ -1405,6 +1497,12 @@ void wxGridCellChoiceEditor::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

+// return the value in the text control
+wxString wxGridCellChoiceEditor::GetValue() const
+{
+  return Combo()->GetValue();
+}
+

 #endif // wxUSE_COMBOBOX
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_COMBOBOX
 
 // ----------------------------------------------------------------------------


@@ -1413,7 +1511,7 @@ void wxGridCellChoiceEditor::SetParameters(const wxString& params)
 
 void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 {

-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )

     {
         case WXK_ESCAPE:
             m_editor->Reset();
     {
         case WXK_ESCAPE:
             m_editor->Reset();


@@ -1438,7 +1536,7 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
 
 void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {
 
 void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 {

-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )

     {
         case WXK_ESCAPE:
         case WXK_TAB:
     {
         case WXK_ESCAPE:
         case WXK_TAB:


@@ -1482,13 +1580,21 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
 {
     dc.SetBackgroundMode( wxSOLID );
 
 {
     dc.SetBackgroundMode( wxSOLID );
 

-    if ( isSelected )
+    // grey out fields if the grid is disabled
+    if( grid.IsEnabled() )

     {
     {

-        dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+      if ( isSelected )
+      {
+          dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+      }
+      else
+      {
+          dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+      }

     }
     else
     {
     }
     else
     {

-        dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+      dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID));

     }
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     }
 
     dc.SetPen( *wxTRANSPARENT_PEN );


@@ -1508,15 +1614,24 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid,
 
     // TODO some special colours for attr.IsReadOnly() case?
 
 
     // TODO some special colours for attr.IsReadOnly() case?
 

-    if ( isSelected )
+    // different coloured text when the grid is disabled
+    if( grid.IsEnabled() )

     {
     {

-        dc.SetTextBackground( grid.GetSelectionBackground() );
-        dc.SetTextForeground( grid.GetSelectionForeground() );
+      if ( isSelected )
+      {
+          dc.SetTextBackground( grid.GetSelectionBackground() );
+          dc.SetTextForeground( grid.GetSelectionForeground() );
+      }
+      else
+      {
+          dc.SetTextBackground( attr.GetBackgroundColour() );
+          dc.SetTextForeground( attr.GetTextColour() );
+      }

     }
     else
     {
     }
     else
     {

-        dc.SetTextBackground( attr.GetBackgroundColour() );
-        dc.SetTextForeground( attr.GetTextColour() );
+      dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+      dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT));

     }
 
     dc.SetFont( attr.GetFont() );
     }
 
     dc.SetFont( attr.GetFont() );


@@ -1577,7 +1692,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


@@ -1585,7 +1700,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;
                     }
                 }


@@ -1597,20 +1712,20 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
                     break;
                 }
                 if (rect.width >= best_width) break;
                     break;
                 }
                 if (rect.width >= best_width) break;

-           }
+            }

             overflowCols = i - col - cell_cols + 1;
             overflowCols = i - col - cell_cols + 1;

-           if (overflowCols >= cols) overflowCols = cols - 1;
+            if (overflowCols >= cols) overflowCols = cols - 1;

         }
 
         if (overflowCols > 0) // redraw overflow cells w/ proper hilight
         {
             hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned
         }
 
         if (overflowCols > 0) // redraw overflow cells w/ proper hilight
         {
             hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned

-            wxRect clip = rect; 
+            wxRect clip = rect;

             clip.x += rectCell.width;
             // draw each overflow cell individually
             int col_end = col+cell_cols+overflowCols;
             if (col_end >= grid.GetNumberCols())
             clip.x += rectCell.width;
             // draw each overflow cell individually
             int col_end = col+cell_cols+overflowCols;
             if (col_end >= grid.GetNumberCols())

-               col_end = grid.GetNumberCols() - 1;
+                col_end = grid.GetNumberCols() - 1;

             for (int i = col+cell_cols; i <= col_end; i++)
             {
                 clip.width = grid.GetColSize(i) - 1;
             for (int i = col+cell_cols; i <= col_end; i++)
             {
                 clip.width = grid.GetColSize(i) - 1;


@@ -1618,15 +1733,15 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
                 dc.SetClippingRegion(clip);
 
                 SetTextColoursAndFont(grid, attr, dc,
                 dc.SetClippingRegion(clip);
 
                 SetTextColoursAndFont(grid, attr, dc,

-                                     grid.IsInSelection(row,i));
+                        grid.IsInSelection(row,i));

 
                 grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
 
                 grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),

-                                       rect, hAlign, vAlign);
+                        rect, hAlign, vAlign);

                 clip.x += grid.GetColSize(i) - 1;
             }
 
             rect = rectCell;
                 clip.x += grid.GetColSize(i) - 1;
             }
 
             rect = rectCell;

-           rect.Inflate(-1);
+            rect.Inflate(-1);

             rect.width++;
             dc.DestroyClippingRegion();
         }
             rect.width++;
             dc.DestroyClippingRegion();
         }


@@ -1719,7 +1834,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
     {


@@ -1735,9 +1850,9 @@ wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
             {
                 if ( m_precision == -1 )
                 {
             {
                 if ( m_precision == -1 )
                 {

-                // default width/precision
-                m_format = _T("%f");
-            }
+                    // default width/precision
+                    m_format = _T("%f");
+                }

                 else
                 {
                     m_format.Printf(_T("%%.%df"), m_precision);
                 else
                 {
                     m_format.Printf(_T("%%.%df"), m_precision);


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

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

         wxSize size = checkbox->GetBestSize();
         wxSize size = checkbox->GetBestSize();

-        checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
+        wxCoord checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;

 
         // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 
         // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
 #if defined(__WXGTK__) || defined(__WXMOTIF__)


@@ -1894,11 +2008,31 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     }
 
     // draw a border around checkmark
     }
 
     // draw a border around checkmark

+    int vAlign, hAlign;
+    attr.GetAlignment(& hAlign, &vAlign);
+

     wxRect rectBorder;
     wxRect rectBorder;

-    rectBorder.x = rect.x + rect.width/2 - size.x/2;
-    rectBorder.y = rect.y + rect.height/2 - size.y/2;
-    rectBorder.width = size.x;
-    rectBorder.height = size.y;
+    if (hAlign == wxALIGN_CENTRE)
+    {
+        rectBorder.x = rect.x + rect.width/2 - size.x/2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;
+    }
+    else if (hAlign == wxALIGN_LEFT)
+    {
+        rectBorder.x = rect.x + 2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;
+    }
+    else if (hAlign == wxALIGN_RIGHT)
+    {
+        rectBorder.x = rect.x + rect.width - size.x - 2;
+        rectBorder.y = rect.y + rect.height/2 - size.y/2;
+        rectBorder.width = size.x;
+        rectBorder.height = size.y;
+    }

 
     bool value;
     if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
 
     bool value;
     if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )


@@ -1946,7 +2080,7 @@ void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
     m_attrkind = wxGridCellAttr::Cell;
 
     m_sizeRows = m_sizeCols = 1;
     m_attrkind = wxGridCellAttr::Cell;
 
     m_sizeRows = m_sizeCols = 1;

-    m_overflow = TRUE;
+    m_overflow = UnsetOverflow;

 
     SetDefAttr(attrDefault);
 }
 
     SetDefAttr(attrDefault);
 }


@@ -2018,6 +2152,9 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
     if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
         SetReadOnly(mergefrom->IsReadOnly());
 
     if ( !HasReadWriteMode()  && mergefrom->HasReadWriteMode() )
         SetReadOnly(mergefrom->IsReadOnly());
 

+    if (!HasOverflowMode()  && mergefrom->HasOverflowMode() )
+        SetOverflow(mergefrom->GetOverflow());
+

     SetDefAttr(mergefrom->m_defGridAttr);
 }
 
     SetDefAttr(mergefrom->m_defGridAttr);
 }
 


@@ -2455,13 +2592,9 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
                 {
                     //Basicaly implement old version.
                     //Also check merge cache, so we don't have to re-merge every time..
                 {
                     //Basicaly implement old version.
                     //Also check merge cache, so we don't have to re-merge every time..

-                    wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL,
-                                   *attrrow = (wxGridCellAttr *)NULL,
-                                   *attrcol = (wxGridCellAttr *)NULL;
-
-                    attrcell = m_data->m_cellAttrs.GetAttr(row, col);
-                    attrcol = m_data->m_colAttrs.GetAttr(col);
-                    attrrow = m_data->m_rowAttrs.GetAttr(row);
+                    wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, 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 move are non NULL


@@ -2745,7 +2878,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)


@@ -2806,14 +2939,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),


@@ -2821,7 +2954,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),


@@ -2829,14 +2962,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),


@@ -2844,7 +2977,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;

 }
 
 
 }
 
 


@@ -2867,7 +3000,7 @@ wxString wxGridTableBase::GetColLabelValue( int col )
     unsigned int i, n;
     for ( n = 1; ; n++ )
     {
     unsigned int i, n;
     for ( n = 1; ; n++ )
     {

-        s += (_T('A') + (wxChar)( col%26 ));
+        s += (wxChar) (_T('A') + (wxChar)( col%26 ));

         col = col/26 - 1;
         if ( col < 0 ) break;
     }
         col = col/26 - 1;
         if ( col < 0 ) break;
     }


@@ -2911,7 +3044,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),


@@ -3013,23 +3146,25 @@ int wxGridStringTable::GetNumberCols()
 
 wxString wxGridStringTable::GetValue( int row, int col )
 {
 
 wxString wxGridStringTable::GetValue( int row, int col )
 {

-    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
-                  _T("invalid row or column index in wxGridStringTable") );
+    wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                 wxEmptyString,
+                 _T("invalid row or column index in wxGridStringTable") );

 
     return m_data[row][col];
 }
 
 void wxGridStringTable::SetValue( int row, int col, const wxString& value )
 {
 
     return m_data[row][col];
 }
 
 void wxGridStringTable::SetValue( int row, int col, const wxString& value )
 {

-    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
-                  _T("invalid row or column index in wxGridStringTable") );
+    wxCHECK_RET( (row < GetNumberRows()) && (col < GetNumberCols()),
+                 _T("invalid row or column index in wxGridStringTable") );

 
     m_data[row][col] = value;
 }
 
 bool wxGridStringTable::IsEmptyCell( int row, int col )
 {
 
     m_data[row][col] = value;
 }
 
 bool wxGridStringTable::IsEmptyCell( int row, int col )
 {

-    wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+    wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+                 true,

                   _T("invalid row or column index in wxGridStringTable") );
 
     return (m_data[row][col] == wxEmptyString);
                   _T("invalid row or column index in wxGridStringTable") );
 
     return (m_data[row][col] == wxEmptyString);


@@ -3081,7 +3216,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 )


@@ -3108,7 +3243,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 )


@@ -3125,7 +3260,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 )


@@ -3151,7 +3286,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 )


@@ -3184,7 +3319,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 )


@@ -3198,7 +3333,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
 


@@ -3216,7 +3351,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 )


@@ -3236,7 +3371,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 )


@@ -3265,7 +3400,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 )


@@ -3344,7 +3479,7 @@ END_EVENT_TABLE()
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )

-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )

 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }


@@ -3410,7 +3545,7 @@ END_EVENT_TABLE()
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
                                             wxWindowID id,
                                             const wxPoint &pos, const wxSize &size )

-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )

 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }


@@ -3475,7 +3610,7 @@ END_EVENT_TABLE()
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
                                                   wxWindowID id,
                                                   const wxPoint &pos, const wxSize &size )

-  : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
+  : wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE )

 {
     m_owner = parent;
 }
 {
     m_owner = parent;
 }


@@ -3488,13 +3623,15 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     int client_width = 0;
     GetClientSize( &client_width, &client_height );
 
     int client_width = 0;
     GetClientSize( &client_width, &client_height );
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );

     dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
     dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );
     dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 );
     dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 );

-
-    dc.SetPen( *wxWHITE_PEN );

     dc.DrawLine( 0, 0, client_width, 0 );
     dc.DrawLine( 0, 0, 0, client_height );
     dc.DrawLine( 0, 0, client_width, 0 );
     dc.DrawLine( 0, 0, 0, client_height );

+
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 1, 1, client_width-1, 1 );
+    dc.DrawLine( 1, 1, 1, client_height-1 );

 }
 
 
 }
 
 


@@ -3534,19 +3671,24 @@ BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
     EVT_KEY_UP( wxGridWindow::OnKeyUp )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
     EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
     EVT_KEY_UP( wxGridWindow::OnKeyUp )

+    EVT_SET_FOCUS( wxGridWindow::OnFocus )
+    EVT_KILL_FOCUS( wxGridWindow::OnFocus )

     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
 END_EVENT_TABLE()
 
 wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
 END_EVENT_TABLE()
 
 wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,

-                            wxWindowID id, const wxPoint &pos, const wxSize &size )
-        : wxWindow( parent, id, pos, size, wxWANTS_CHARS, wxT("grid window") )
+                            wxWindowID id,
+                            const wxPoint &pos,
+                            const wxSize &size )
+            : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE,
+                        wxT("grid window") )
+

 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
     m_colLabelWin = colLblWin;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
     m_colLabelWin = colLblWin;

-    SetBackgroundColour(_T("WHITE"));

 }
 
 
 }
 
 


@@ -3605,6 +3747,11 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 {
 }
 
 {
 }
 

+void wxGridWindow::OnFocus(wxFocusEvent& event)
+{
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+        event.Skip();
+}

 
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 


@@ -3617,17 +3764,67 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,

-                           bool maxOnOverflow);
+                           bool clipToMinMax);

 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \
 
 #define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \

-                                          WXGRID_MIN_COL_WIDTH, \
-                                          m_colRights, m_numCols, TRUE)
+                                          m_minAcceptableColWidth, \
+                                          m_colRights, m_numCols, true)

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

-                                          WXGRID_MIN_ROW_HEIGHT, \
-                                          m_rowBottoms, m_numRows, TRUE)
+                                          m_minAcceptableRowHeight, \
+                                          m_rowBottoms, m_numRows, true)

 /////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////
 

+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGridStyle )
+
+wxBEGIN_FLAGS( wxGridStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxGridStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow,"wx/grid.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGrid)
+    wxHIDE_PROPERTY( Children )
+    wxPROPERTY_FLAGS( WindowStyle , wxGridStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGrid)
+wxEND_HANDLERS_TABLE()
+
+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)
+*/
+#else

 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
 IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )

+#endif

 
 BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_PAINT( wxGrid::OnPaint )
 
 BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_PAINT( wxGrid::OnPaint )


@@ -3637,6 +3834,16 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
 END_EVENT_TABLE()
 
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
 END_EVENT_TABLE()
 

+wxGrid::wxGrid()
+{
+    // in order to make sure that a size event is not
+    // trigerred in a unfinished state
+    m_cornerLabelWin = NULL ;
+    m_rowLabelWin = NULL ;
+    m_colLabelWin = NULL ;
+    m_gridWin = NULL ;
+}
+

 wxGrid::wxGrid( wxWindow *parent,
                  wxWindowID id,
                  const wxPoint& pos,
 wxGrid::wxGrid( wxWindow *parent,
                  wxWindowID id,
                  const wxPoint& pos,


@@ -3650,6 +3857,23 @@ wxGrid::wxGrid( wxWindow *parent,
     Create();
 }
 
     Create();
 }
 

+bool wxGrid::Create(wxWindow *parent, wxWindowID id,
+                          const wxPoint& pos, const wxSize& size,
+                          long style, const wxString& name)
+{
+    if (!wxScrolledWindow::Create(parent, id, pos, size,
+                                  style | wxWANTS_CHARS , name))
+        return false;
+
+    m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+    m_rowMinHeights = wxLongToLongHashMap(GRID_HASH_SIZE) ;
+
+    Create() ;
+
+
+    return true;
+}
+

 
 wxGrid::~wxGrid()
 {
 
 wxGrid::~wxGrid()
 {


@@ -3678,14 +3902,22 @@ wxGrid::~wxGrid()
 // ----- internal init and update functions
 //
 
 // ----- internal init and update functions
 //
 

+// NOTE: If using the default visual attributes works everywhere then this can
+// be removed as well as the #else cases below.
+#define _USE_VISATTR 0
+
+#if _USE_VISATTR
+#include "wx/listbox.h"
+#endif
+

 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();
 


@@ -3694,13 +3926,22 @@ void wxGrid::Create()
     m_defaultCellAttr->SetKind(wxGridCellAttr::Default);
     m_defaultCellAttr->SetFont(GetFont());
     m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
     m_defaultCellAttr->SetKind(wxGridCellAttr::Default);
     m_defaultCellAttr->SetFont(GetFont());
     m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);

+    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
+    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
+
+#if _USE_VISATTR
+    wxVisualAttributes gva = wxListBox::GetClassDefaultAttributes();
+    wxVisualAttributes lva = wxPanel::GetClassDefaultAttributes();
+
+    m_defaultCellAttr->SetTextColour(gva.colFg);
+    m_defaultCellAttr->SetBackgroundColour(gva.colBg);
+
+#else

     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
     m_defaultCellAttr->SetBackgroundColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     m_defaultCellAttr->SetTextColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
     m_defaultCellAttr->SetBackgroundColour(
         wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

-    m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
-    m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
-
+#endif

 
     m_numRows = 0;
     m_numCols = 0;
 
     m_numRows = 0;
     m_numCols = 0;


@@ -3715,29 +3956,50 @@ 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 );
 
     SetTargetWindow( m_gridWin );
 
                                   wxDefaultPosition,
                                   wxDefaultSize );
 
     SetTargetWindow( m_gridWin );
 

+#if _USE_VISATTR
+    wxColour gfg = gva.colFg;
+    wxColour gbg = gva.colBg;
+    wxColour lfg = lva.colFg;
+    wxColour lbg = lva.colBg;
+#else
+    wxColour gfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    wxColour gbg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
+    wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
+#endif
+    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();
 }
 


@@ -3746,7 +4008,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;


@@ -3754,12 +4016,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;
 }


@@ -3785,16 +4047,23 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
 {
     if ( m_created )
     {
 {
     if ( m_created )
     {

-        // RD: Actually, this should probably be allowed.  I think it would be
-        //     nice to be able to switch multiple Tables in and out of a single
-        //     View at runtime.  Is there anything in the implementation that
-        //     would prevent this?
+        // stop all processing
+        m_created = false;
+
+        if (m_ownTable)
+        {
+            wxGridTableBase *t=m_table;
+            m_table=0;
+            delete t;
+        }
+        delete m_selection;

 
 

-        // At least, you now have to cope with m_selection
-        wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
-        return FALSE;
+        m_table=0;
+        m_selection=0;
+        m_numRows=0;
+        m_numCols=0;

     }
     }

-    else
+    if (table)

     {
         m_numRows = table->GetNumberRows();
         m_numCols = table->GetNumberCols();
     {
         m_numRows = table->GetNumberRows();
         m_numCols = table->GetNumberCols();


@@ -3802,12 +4071,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;


@@ -3832,44 +4101,50 @@ void wxGrid::Init()
 
     // init attr cache
     m_attrCache.row = -1;
 
     // init attr cache
     m_attrCache.row = -1;

+    m_attrCache.col = -1;
+    m_attrCache.attr = NULL;

 
     // TODO: something better than this ?
     //
     m_labelFont = this->GetFont();
 
     // TODO: something better than this ?
     //
     m_labelFont = this->GetFont();

-    m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
+    m_labelFont.SetWeight( wxBOLD );

 
 

-    m_rowLabelHorizAlign = wxALIGN_LEFT;
+    m_rowLabelHorizAlign = wxALIGN_CENTRE;

     m_rowLabelVertAlign  = wxALIGN_CENTRE;
 
     m_colLabelHorizAlign = wxALIGN_CENTRE;
     m_rowLabelVertAlign  = wxALIGN_CENTRE;
 
     m_colLabelHorizAlign = wxALIGN_CENTRE;

-    m_colLabelVertAlign  = wxALIGN_TOP;
+    m_colLabelVertAlign  = wxALIGN_CENTRE;
+    m_colLabelTextOrientation = wxHORIZONTAL;

 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
     m_defaultRowHeight = m_gridWin->GetCharHeight();
 
 
     m_defaultColWidth  = WXGRID_DEFAULT_COL_WIDTH;
     m_defaultRowHeight = m_gridWin->GetCharHeight();
 

+    m_minAcceptableColWidth  = WXGRID_MIN_COL_WIDTH;
+    m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT;
+

 #if defined(__WXMOTIF__) || defined(__WXGTK__)  // see also text ctrl sizing in ShowCellEditControl()
     m_defaultRowHeight += 8;
 #else
     m_defaultRowHeight += 4;
 #endif
 
 #if defined(__WXMOTIF__) || defined(__WXGTK__)  // see also text ctrl sizing in ShowCellEditControl()
     m_defaultRowHeight += 8;
 #else
     m_defaultRowHeight += 4;
 #endif
 

-    m_gridLineColour = wxColour( 128, 128, 255 );
-    m_gridLinesEnabled = TRUE;
-    m_cellHighlightColour = m_gridLineColour;
+    m_gridLineColour = wxColour( 192,192,192 );
+    m_gridLinesEnabled = true;
+    m_cellHighlightColour = *wxBLACK;

     m_cellHighlightPenWidth = 2;
     m_cellHighlightROPenWidth = 1;
 
     m_cursorMode  = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture = (wxWindow *)NULL;
     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_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 );


@@ -3881,9 +4156,9 @@ 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_batchCount = 0;
 
     m_extraWidth =


@@ -3909,7 +4184,7 @@ void wxGrid::InitRowHeights()
     m_rowBottoms.Alloc( m_numRows );
 
     int rowBottom = 0;
     m_rowBottoms.Alloc( m_numRows );
 
     int rowBottom = 0;

-    
+

     m_rowHeights.Add( m_defaultRowHeight, m_numRows );
 
     for ( int i = 0;  i < m_numRows;  i++ )
     m_rowHeights.Add( m_defaultRowHeight, m_numRows );
 
     for ( int i = 0;  i < m_numRows;  i++ )


@@ -3985,32 +4260,36 @@ void wxGrid::CalcDimensions()
     int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
     int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
 
     int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0;
     int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0;
 

+    // take into account editor if shown
+    if( IsCellEditControlShown() )
+    {
+      int w2, h2;
+      int r = m_currentCellCoords.GetRow();
+      int c = m_currentCellCoords.GetCol();
+      int x = GetColLeft(c);
+      int y = GetRowTop(r);
+
+      // how big is the editor
+      wxGridCellAttr* attr = GetCellAttr(r, c);
+      wxGridCellEditor* editor = attr->GetEditor(this, r, c);
+      editor->GetControl()->GetSize(&w2, &h2);
+      w2 += x;
+      h2 += y;
+      if( w2 > w ) w = w2;
+      if( h2 > h ) h = h2;
+      editor->DecRef();
+      attr->DecRef();
+    }
+

     // preserve (more or less) the previous position
     int x, y;
     GetViewStart( &x, &y );
 
     // preserve (more or less) the previous position
     int x, y;
     GetViewStart( &x, &y );
 

-    // maybe we don't need scrollbars at all?
-    //
-    // also adjust the position to be valid for the new scroll rangs
-    if ( w <= cw )
-    {
-        w = x = 0;
-    }
-    else
-    {
-        if ( x >= w )
-            x = w - 1;
-    }
-
-    if ( h <= ch )
-    {
-        h = y = 0;
-    }
-    else
-    {
-        if ( y >= h )
-            y = h - 1;
-    }
+    // ensure the position is valid for the new scroll ranges
+    if ( x >= w )
+        x = wxMax( w - 1, 0 );
+    if ( y >= h )
+        y = wxMax( h - 1, 0 );

 
     // do set scrollbar parameters
     SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
 
     // do set scrollbar parameters
     SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,


@@ -4025,6 +4304,11 @@ void wxGrid::CalcDimensions()
 
 void wxGrid::CalcWindowSizes()
 {
 
 void wxGrid::CalcWindowSizes()
 {

+    // escape if the window is has not been fully created yet
+
+    if ( m_cornerLabelWin == NULL )
+        return ;
+

     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 


@@ -4048,7 +4332,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.


@@ -4116,7 +4400,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:


@@ -4152,7 +4436,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:


@@ -4205,7 +4489,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:


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

-        result = TRUE;
+        result = true;

         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
         break;
 
         case wxGRIDTABLE_NOTIFY_COLS_APPENDED:


@@ -4283,7 +4567,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:


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

-        result = TRUE;
+        result = true;

         break;
     }
 
         break;
     }
 


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

-            m_isDragging = TRUE;
+            m_isDragging = true;

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


@@ -4575,7 +4859,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


@@ -4642,10 +4926,23 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     //
     else if (event.LeftDClick() )
     {
     //
     else if (event.LeftDClick() )
     {

-        if ( YToEdgeOfRow(y) < 0 )
+        int row = YToEdgeOfRow(y);
+        if ( row < 0 )

         {
             row = YToRow(y);
         {
             row = YToRow(y);

-            SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event );
+            if ( row >=0 &&
+                 !SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ) )
+            {
+                // no default action at the moment
+            }
+        }
+        else
+        {
+            // adjust row height depending on label text
+            AutoSizeRowLabelSize( row );
+
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+            m_dragLastPos  = -1;

         }
     }
 
         }
     }
 


@@ -4674,7 +4971,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDown() )
     {
         row = YToRow(y);
     else if ( event.RightDown() )
     {
         row = YToRow(y);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )
+        if ( row >=0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) )

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


@@ -4686,7 +4984,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDClick() )
     {
         row = YToRow(y);
     else if ( event.RightDClick() )
     {
         row = YToRow(y);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )
+        if ( row >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) )

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


@@ -4704,12 +5003,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);

         }
     }
 }
         }
     }
 }


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

-            m_isDragging = TRUE;
+            m_isDragging = true;

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


@@ -4782,7 +5081,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


@@ -4848,10 +5147,23 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     //
     if ( event.LeftDClick() )
     {
     //
     if ( event.LeftDClick() )
     {

-        if ( XToEdgeOfCol(x) < 0 )
+        int col = XToEdgeOfCol(x);
+        if ( col < 0 )

         {
             col = XToCol(x);
         {
             col = XToCol(x);

-            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
+            }
+        }
+        else
+        {
+            // adjust column width depending on label text
+            AutoSizeColLabelSize( col );
+
+            ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+            m_dragLastPos  = -1;

         }
     }
 
         }
     }
 


@@ -4880,7 +5192,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDown() )
     {
         col = XToCol(x);
     else if ( event.RightDown() )
     {
         col = XToCol(x);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
+        if ( col >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )

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


@@ -4892,7 +5205,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     else if ( event.RightDClick() )
     {
         col = XToCol(x);
     else if ( event.RightDClick() )
     {
         col = XToCol(x);

-        if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
+        if ( col >= 0 &&
+             !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )

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


@@ -4910,12 +5224,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);

         }
     }
 }
         }
     }
 }


@@ -5056,7 +5370,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


@@ -5142,7 +5456,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


@@ -5188,54 +5502,33 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 DisableCellEditControl();
                 MakeCellVisible( coords );
 
                 DisableCellEditControl();
                 MakeCellVisible( coords );
 

-                // if this is the second click on this cell then start
-                // the edit control
-                if ( m_waitForSlowClick &&
-                     (coords == m_currentCellCoords) &&
-                     CanEnableCellControl())
+                if ( event.ControlDown() )

                 {
                 {

-                    EnableCellEditControl();
-
-                    wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
-                    wxGridCellEditor *editor = attr->GetEditor(this,
-                                                               coords.GetRow(),
-                                                               coords.GetCol());
-                    editor->StartingClick();
-                    editor->DecRef();
-                    attr->DecRef();
-
-                    m_waitForSlowClick = FALSE;
+                    if ( m_selection )
+                    {
+                        m_selection->ToggleCellSelection( coords.GetRow(),
+                                                          coords.GetCol(),
+                                                          event.ControlDown(),
+                                                          event.ShiftDown(),
+                                                          event.AltDown(),
+                                                          event.MetaDown() );
+                    }
+                    m_selectingTopLeft = wxGridNoCellCoords;
+                    m_selectingBottomRight = wxGridNoCellCoords;
+                    m_selectingKeyboard = coords;

                 }
                 else
                 {
                 }
                 else
                 {

-                    if ( event.ControlDown() )
-                    {
-                        if ( m_selection )
-                        {
-                            m_selection->ToggleCellSelection( coords.GetRow(),
-                                                              coords.GetCol(),
-                                                              event.ControlDown(),
-                                                              event.ShiftDown(),
-                                                              event.AltDown(),
-                                                              event.MetaDown() );
-                        }
-                        m_selectingTopLeft = wxGridNoCellCoords;
-                        m_selectingBottomRight = wxGridNoCellCoords;
-                        m_selectingKeyboard = coords;
-                    }
-                    else
+                    m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
+                    SetCurrentCell( coords );
+                    if ( m_selection )

                     {
                     {

-                        SetCurrentCell( coords );
-                        if ( m_selection )
+                        if ( m_selection->GetSelectionMode() !=
+                                wxGrid::wxGridSelectCells )

                         {
                         {

-                            if ( m_selection->GetSelectionMode() !=
-                                    wxGrid::wxGridSelectCells )
-                            {
-                                HighlightBlock( coords, coords );
-                            }
+                            HighlightBlock( coords, coords );

                         }
                     }
                         }
                     }

-                    m_waitForSlowClick = TRUE;

                 }
             }
         }
                 }
             }
         }


@@ -5250,11 +5543,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;
+            }

         }
         }

+

     }
 
 
     }
 
 


@@ -5264,15 +5563,28 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
     {
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {
     {
         if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
         {

-            if ( m_selectingTopLeft != wxGridNoCellCoords &&
-                 m_selectingBottomRight != wxGridNoCellCoords )
+            if (m_winCapture)

             {
             {

-                if (m_winCapture)
-                {
-                    if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
-                    m_winCapture = NULL;
-                }
+                if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse();
+                m_winCapture = NULL;
+            }

 
 

+            if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl())
+            {
+                ClearSelection();
+                EnableCellEditControl();
+
+                wxGridCellAttr* attr = GetCellAttr(coords);
+                wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+                editor->StartingClick();
+                editor->DecRef();
+                attr->DecRef();
+
+                m_waitForSlowClick = false;
+            }
+            else if ( m_selectingTopLeft != wxGridNoCellCoords &&
+                 m_selectingBottomRight != wxGridNoCellCoords )
+            {

                 if ( m_selection )
                 {
                     m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
                 if ( m_selection )
                 {
                     m_selection->SelectBlock( m_selectingTopLeft.GetRow(),


@@ -5287,11 +5599,11 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
 
                 m_selectingTopLeft = wxGridNoCellCoords;
                 m_selectingBottomRight = wxGridNoCellCoords;
 
                 m_selectingTopLeft = wxGridNoCellCoords;
                 m_selectingBottomRight = wxGridNoCellCoords;

-            }

 
 

-            // Show the edit control, if it has been hidden for
-            // drag-shrinking.
-            ShowCellEditControl();
+                // Show the edit control, if it has been hidden for
+                // drag-shrinking.
+                ShowCellEditControl();
+            }

         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {
         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {


@@ -5430,7 +5742,7 @@ void wxGrid::DoEndDragResizeRow()
 
         int rowTop = GetRowTop(m_dragRowOrCol);
         SetRowSize( m_dragRowOrCol,
 
         int rowTop = GetRowTop(m_dragRowOrCol);
         SetRowSize( m_dragRowOrCol,

-                    wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
+                    wxMax( m_dragLastPos - rowTop, m_minAcceptableRowHeight ) );

 
         if ( !GetBatchCount() )
         {
 
         if ( !GetBatchCount() )
         {


@@ -5440,17 +5752,16 @@ 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)
             {
                 int i, cell_rows, cell_cols, subtract_rows = 0;
                 int leftCol = XToCol(left);
             rect.width = cw;
             // if there is a multicell block, paint all of it
             if (m_table)
             {
                 int i, cell_rows, cell_cols, subtract_rows = 0;
                 int leftCol = XToCol(left);

-                int rightCol = XToCol(left+cw);
+                int rightCol = internalXToCol(left+cw);

                 if (leftCol >= 0)
                 {
                 if (leftCol >= 0)
                 {

-                    if (rightCol < 0) rightCol = m_numCols;

                     for (i=leftCol; i<rightCol; i++)
                     {
                         GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
                     for (i=leftCol; i<rightCol; i++)
                     {
                         GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);


@@ -5462,7 +5773,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();


@@ -5500,17 +5811,16 @@ 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)
             {
                 int i, cell_rows, cell_cols, subtract_cols = 0;
                 int topRow = YToRow(top);
             rect.height = ch;
             // if there is a multicell block, paint all of it
             if (m_table)
             {
                 int i, cell_rows, cell_cols, subtract_cols = 0;
                 int topRow = YToRow(top);

-                int bottomRow = YToRow(top+cw);
+                int bottomRow = internalYToRow(top+cw);

                 if (topRow >= 0)
                 {
                 if (topRow >= 0)
                 {

-                    if (bottomRow < 0) bottomRow = m_numRows;

                     for (i=topRow; i<bottomRow; i++)
                     {
                         GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
                     for (i=topRow; i<bottomRow; i++)
                     {
                         GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);


@@ -5522,7 +5832,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();


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

-            return FALSE;
+            return false;

     }
 }
 
     }
 }
 


@@ -5584,7 +5894,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 )


@@ -5592,12 +5902,13 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 

-        return m_table->InsertRows( pos, numRows );
+        bool done = m_table->InsertRows( pos, numRows );
+        return done;

 
         // 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;

 }
 
 
 }
 
 


@@ -5608,12 +5919,17 @@ 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;

     }
 
     }
 

-    return ( m_table && m_table->AppendRows( numRows ) );
-    // the table will have sent the results of the append row
-    // operation to this view object as a grid table message
+    if ( m_table )
+    {
+        bool done = m_table && m_table->AppendRows( numRows );
+        return done;
+        // the table will have sent the results of the append row
+        // operation to this view object as a grid table message
+    }
+    return false;

 }
 
 
 }
 
 


@@ -5624,7 +5940,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 )


@@ -5632,11 +5948,12 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 

-        return (m_table->DeleteRows( pos, numRows ));
+        bool done = m_table->DeleteRows( pos, numRows );
+        return done;

         // 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;

 }
 
 
 }
 
 


@@ -5647,7 +5964,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 )


@@ -5655,11 +5972,12 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 

-        return m_table->InsertCols( pos, numCols );
+        bool done = m_table->InsertCols( pos, numCols );
+        return done;

         // 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;

 }
 
 
 }
 
 


@@ -5670,12 +5988,17 @@ 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;

     }
 
     }
 

-    return ( m_table && m_table->AppendCols( numCols ) );
-    // the table will have sent the results of the append col
-    // operation to this view object as a grid table message
+    if ( m_table )
+    {
+        bool done = m_table->AppendCols( numCols );
+        return done;
+        // the table will have sent the results of the append col
+        // operation to this view object as a grid table message
+    }
+    return false;

 }
 
 
 }
 
 


@@ -5686,7 +6009,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 )


@@ -5694,11 +6017,12 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 
         if (IsCellEditControlEnabled())
             DisableCellEditControl();
 

-        return ( m_table->DeleteCols( pos, numCols ) );
+        bool done = m_table->DeleteCols( pos, numCols );
+        return done;

         // 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;

 }
 
 
 }
 
 


@@ -5715,7 +6039,7 @@ int wxGrid::SendEvent( const wxEventType type,
                         wxMouseEvent& mouseEv )
 {
    bool claimed;
                         wxMouseEvent& mouseEv )
 {
    bool claimed;

-   bool vetoed= FALSE;
+   bool vetoed;

 
    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
    {
 
    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
    {


@@ -5743,7 +6067,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(),


@@ -5760,7 +6084,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(),


@@ -5782,7 +6106,7 @@ int wxGrid::SendEvent( const wxEventType type,
                         int row, int col )
 {
    bool claimed;
                         int row, int col )
 {
    bool claimed;

-   bool vetoed= FALSE;
+   bool vetoed;

 
     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
 
     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {


@@ -5898,7 +6222,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
         else
         {
             m_cornerLabelWin->Refresh(eraseb, NULL);
         else
         {
             m_cornerLabelWin->Refresh(eraseb, NULL);

-            m_colLabelWin->Refresh(eraseb, NULL);     
+            m_colLabelWin->Refresh(eraseb, NULL);

             m_rowLabelWin->Refresh(eraseb, NULL);
             m_gridWin->Refresh(eraseb, NULL);
         }
             m_rowLabelWin->Refresh(eraseb, NULL);
             m_gridWin->Refresh(eraseb, NULL);
         }


@@ -5925,7 +6249,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
     //


@@ -5938,7 +6262,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
 
         // try local handlers
         //
 
         // try local handlers
         //

-        switch ( event.KeyCode() )
+        switch ( event.GetKeyCode() )

         {
             case WXK_UP:
                 if ( event.ControlDown() )
         {
             case WXK_UP:
                 if ( event.ControlDown() )


@@ -5999,8 +6323,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                     else
                     {
                         // at the bottom of a column
                     else
                     {
                         // at the bottom of a column

-                        HideCellEditControl();
-                        SaveEditControlValue();
+                        DisableCellEditControl();

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -6014,26 +6337,24 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     if ( GetGridCursorCol() > 0 )
                     {
                 {
                     if ( GetGridCursorCol() > 0 )
                     {

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

                     }
                     else
                     {
                         // at left of grid
                     }
                     else
                     {
                         // at left of grid

-                        HideCellEditControl();
-                        SaveEditControlValue();
+                        DisableCellEditControl();

                     }
                 }
                 else
                 {
                     if ( GetGridCursorCol() < GetNumberCols()-1 )
                     {
                     }
                 }
                 else
                 {
                     if ( GetGridCursorCol() < GetNumberCols()-1 )
                     {

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

                     }
                     else
                     {
                         // at right of grid
                     }
                     else
                     {
                         // at right of grid

-                        HideCellEditControl();
-                        SaveEditControlValue();
+                        DisableCellEditControl();

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -6086,7 +6407,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


@@ -6103,18 +6424,18 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
 
                     // <F2> is special and will always start editing, for
                     // other keys - ask the editor itself
 
                     // <F2> is special and will always start editing, for
                     // other keys - ask the editor itself

-                    if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
+                    if ( (event.GetKeyCode() == WXK_F2 && !event.HasModifiers())

                          || editor->IsAcceptedKey(event) )
                     {
                          || editor->IsAcceptedKey(event) )
                     {

+                        // ensure cell is visble
+                        MakeCellVisible(row, col);

                         EnableCellEditControl();
 
                         EnableCellEditControl();
 

-                        // the editor could be not shown for a variety of
-                        // reasons (i.e. blocked by the app or whatever), so
-                        // check if it really was created
-                        if ( m_cellEditCtrlEnabled )
-                        {
-                            editor->StartingKey(event);
-                        }
+                        // a problem can arise if the cell is not completely
+                        // visible (even after calling MakeCellVisible the
+                        // control is not created and calling StartingKey will
+                        // crash the app
+                        if( editor->IsCreated() && m_cellEditCtrlEnabled ) editor->StartingKey(event);

                     }
                     else
                     {
                     }
                     else
                     {


@@ -6134,14 +6455,14 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
         }
     }
 
         }
     }
 

-    m_inOnKeyDown = FALSE;
+    m_inOnKeyDown = false;

 }
 
 void wxGrid::OnKeyUp( wxKeyEvent& event )
 {
     // try local handlers
     //
 }
 
 void wxGrid::OnKeyUp( wxKeyEvent& event )
 {
     // try local handlers
     //

-    if ( event.KeyCode() == WXK_SHIFT )
+    if ( event.GetKeyCode() == WXK_SHIFT )

     {
         if ( m_selectingTopLeft != wxGridNoCellCoords &&
              m_selectingBottomRight != wxGridNoCellCoords )
     {
         if ( m_selectingTopLeft != wxGridNoCellCoords &&
              m_selectingBottomRight != wxGridNoCellCoords )


@@ -6153,7 +6474,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() );
             }


@@ -6182,10 +6503,9 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {
 
     if ( m_currentCellCoords != wxGridNoCellCoords )
     {

-        HideCellEditControl();

         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);


@@ -6258,7 +6578,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 ||


@@ -6272,7 +6592,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


@@ -6315,7 +6635,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,


@@ -6326,7 +6646,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,


@@ -6337,7 +6657,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,


@@ -6348,7 +6668,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,


@@ -6358,7 +6678,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;


@@ -6379,10 +6699,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;

 }
 
 
 }
 
 


@@ -6405,10 +6725,10 @@ bool wxGrid::SetModelValues()
             }
         }
 
             }
         }
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -6435,12 +6755,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;
                 }
             }


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

-                        marked = TRUE;
+                        marked = true;

                         break;
                     }
                 }
                         break;
                     }
                 }


@@ -6481,13 +6801,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;
                                 }
                             }


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

-                                        marked = TRUE;
+                                        marked = true;

                                         break;
                                     }
                                 }
                                         break;
                                     }
                                 }


@@ -6624,7 +6944,9 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 
 
         // Now draw the rectangle
 
 
         // Now draw the rectangle

-        dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID));
+        // use the cellHighlightColour if the cell is inside a selection, this
+        // will ensure the cell is always visible.
+        dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID));

         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);
     }
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);
     }


@@ -6754,37 +7076,32 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     // no gridlines inside multicells, clip them out
     bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
 
     // no gridlines inside multicells, clip them out

-    int leftCol   = XToCol(left);
-    int topRow    = YToRow(top);
-    int rightCol  = XToCol(right);
-    int bottomRow = YToRow(bottom);
+    int leftCol   = internalXToCol(left);
+    int topRow    = internalYToRow(top);
+    int rightCol  = internalXToCol(right);
+    int bottomRow = internalYToRow(bottom);

     wxRegion clippedcells(0, 0, cw, ch);
 
     wxRegion clippedcells(0, 0, cw, ch);
 

-    if ((leftCol >= 0) && (topRow >= 0))
-    {
-        if (rightCol  < 0) rightCol  = m_numCols;
-        if (bottomRow < 0) bottomRow = m_numRows;

 
 

-        int i, j, cell_rows, cell_cols;
-        wxRect rect;
+    int i, j, cell_rows, cell_cols;
+    wxRect rect;

 
 

-        for (j=topRow; j<bottomRow; j++)
+    for (j=topRow; j<bottomRow; j++)
+    {
+        for (i=leftCol; i<rightCol; i++)

         {
         {

-            for (i=leftCol; i<rightCol; i++)
+            GetCellSize( j, i, &cell_rows, &cell_cols );
+            if ((cell_rows > 1) || (cell_cols > 1))

             {
             {

-                GetCellSize( j, i, &cell_rows, &cell_cols );
-                if ((cell_rows > 1) || (cell_cols > 1))
-                {
-                    rect = CellToRect(j,i);
-                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-                    clippedcells.Subtract(rect);
-                }
-                else if ((cell_rows < 0) || (cell_cols < 0))
-                {
-                    rect = CellToRect(j+cell_rows, i+cell_cols);
-                    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-                    clippedcells.Subtract(rect);
-                }
+                rect = CellToRect(j,i);
+                CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                clippedcells.Subtract(rect);
+            }
+            else if ((cell_rows < 0) || (cell_cols < 0))
+            {
+                rect = CellToRect(j+cell_rows, i+cell_cols);
+                CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+                clippedcells.Subtract(rect);

             }
         }
     }
             }
         }
     }


@@ -6794,7 +7111,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
     // horizontal grid lines
     //
 
     // horizontal grid lines
     //

-    int i;
+    // already declared above - int i;

     for ( i = internalYToRow(top); i < m_numRows; i++ )
     {
         int bot = GetRowBottom(i) - 1;
     for ( i = internalYToRow(top); i < m_numRows; i++ )
     {
         int bot = GetRowBottom(i) - 1;


@@ -6852,15 +7169,17 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );

     dc.DrawLine( m_rowLabelWidth-1, rowTop,
                  m_rowLabelWidth-1, rowBottom );
 
     dc.DrawLine( m_rowLabelWidth-1, rowTop,
                  m_rowLabelWidth-1, rowBottom );
 

-    dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
+    dc.DrawLine( 0, rowTop, 0, rowBottom );
+
+    dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );

 
     dc.SetPen( *wxWHITE_PEN );
 
     dc.SetPen( *wxWHITE_PEN );

-    dc.DrawLine( 0, rowTop, 0, rowBottom );
-    dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
+    dc.DrawLine( 1, rowTop, 1, rowBottom );
+    dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop );

 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );


@@ -6900,41 +7219,41 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
     int colLeft = GetColLeft(col),
         colRight = GetColRight(col) - 1;
 
     int colLeft = GetColLeft(col),
         colRight = GetColRight(col) - 1;
 

-    dc.SetPen( *wxBLACK_PEN );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) );

     dc.DrawLine( colRight, 0,
                  colRight, m_colLabelHeight-1 );
 
     dc.DrawLine( colRight, 0,
                  colRight, m_colLabelHeight-1 );
 

+    dc.DrawLine( colLeft, 0, colRight, 0 );
+

     dc.DrawLine( colLeft, m_colLabelHeight-1,
     dc.DrawLine( colLeft, m_colLabelHeight-1,

-                 colRight, m_colLabelHeight-1 );
+                 colRight+1, m_colLabelHeight-1 );

 
     dc.SetPen( *wxWHITE_PEN );
 
     dc.SetPen( *wxWHITE_PEN );

-    dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
-    dc.DrawLine( colLeft, 0, colRight, 0 );
+    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, 1, colRight, 1 );

 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );
 
 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
     dc.SetFont( GetLabelFont() );
 

-    dc.SetBackgroundMode( wxTRANSPARENT );
-    dc.SetTextForeground( GetLabelTextColour() );
-    dc.SetFont( GetLabelFont() );
-
-    int hAlign, vAlign;
+    int hAlign, vAlign, orient;

     GetColLabelAlignment( &hAlign, &vAlign );
     GetColLabelAlignment( &hAlign, &vAlign );

+    orient = GetColLabelTextOrientation();

 
     wxRect rect;
     rect.SetX( colLeft + 2 );
     rect.SetY( 2 );
     rect.SetWidth( GetColWidth(col) - 4 );
     rect.SetHeight( m_colLabelHeight - 4 );
 
     wxRect rect;
     rect.SetX( colLeft + 2 );
     rect.SetY( 2 );
     rect.SetWidth( GetColWidth(col) - 4 );
     rect.SetHeight( m_colLabelHeight - 4 );

-    DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
+    DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign, orient );

 }
 
 void wxGrid::DrawTextRectangle( wxDC& dc,
                                 const wxString& value,
                                 const wxRect& rect,
                                 int horizAlign,
 }
 
 void wxGrid::DrawTextRectangle( wxDC& dc,
                                 const wxString& value,
                                 const wxRect& rect,
                                 int horizAlign,

-                                int vertAlign )
+                                int vertAlign,
+                                int textOrientation )

 {
     wxArrayString lines;
 
 {
     wxArrayString lines;
 


@@ -6943,68 +7262,105 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
 
     //Forward to new API.
     DrawTextRectangle(  dc,
 
     //Forward to new API.
     DrawTextRectangle(  dc,

-                        lines,
-                        rect,
-                        horizAlign,
-                        vertAlign );
+        lines,
+        rect,
+        horizAlign,
+        vertAlign,
+        textOrientation );

 
 }
 
 void wxGrid::DrawTextRectangle( wxDC& dc,
 
 }
 
 void wxGrid::DrawTextRectangle( wxDC& dc,

-                                const wxArrayString& lines,
-                                const wxRect& rect,
-                                int horizAlign,
-                                int vertAlign )
+                               const wxArrayString& lines,
+                               const wxRect& rect,
+                               int horizAlign,
+                               int vertAlign,
+                               int textOrientation )

 {
     long textWidth, textHeight;
     long lineWidth, lineHeight;
 {
     long textWidth, textHeight;
     long lineWidth, lineHeight;

+    int nLines;

 
     dc.SetClippingRegion( rect );
 
     dc.SetClippingRegion( rect );

-    if ( lines.GetCount() )
+
+    nLines = lines.GetCount();
+    if( nLines > 0 )

     {
     {

-        GetTextBoxSize( dc, lines, &textWidth, &textHeight );
-        dc.GetTextExtent( lines[0], &lineWidth, &lineHeight );
+        int l;
+        float x = 0.0, y = 0.0;

 
 

-        float x, y;
-        switch ( horizAlign )
+        if( textOrientation == wxHORIZONTAL )
+            GetTextBoxSize(dc, lines, &textWidth, &textHeight);
+        else
+            GetTextBoxSize( dc, lines, &textHeight, &textWidth );
+
+        switch( vertAlign )

         {
         {

-            case wxALIGN_RIGHT:
-                x = rect.x + (rect.width - textWidth - 1);
-                break;
+        case wxALIGN_BOTTOM:
+            if( textOrientation == wxHORIZONTAL )
+                y = rect.y + (rect.height - textHeight - 1);
+            else
+                x = rect.x + rect.width - textWidth;
+            break;

 
 

-            case wxALIGN_CENTRE:
+        case wxALIGN_CENTRE:
+            if( textOrientation == wxHORIZONTAL )
+                y = rect.y + ((rect.height - textHeight)/2);
+            else

                 x = rect.x + ((rect.width - textWidth)/2);
                 x = rect.x + ((rect.width - textWidth)/2);

-                break;
+            break;

 
 

-            case wxALIGN_LEFT:
-            default:
+        case wxALIGN_TOP:
+        default:
+            if( textOrientation == wxHORIZONTAL )
+                y = rect.y + 1;
+            else

                 x = rect.x + 1;
                 x = rect.x + 1;

-                break;
+            break;

         }
 
         }
 

-        switch ( vertAlign )
+        // Align each line of a multi-line label
+        for( l = 0; l < nLines; l++ )

         {
         {

-            case wxALIGN_BOTTOM:
-                y = rect.y + (rect.height - textHeight - 1);
+            dc.GetTextExtent(lines[l], &lineWidth, &lineHeight);
+
+            switch( horizAlign )
+            {
+            case wxALIGN_RIGHT:
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + (rect.width - lineWidth - 1);
+                else
+                    y = rect.y + lineWidth + 1;

                 break;
 
             case wxALIGN_CENTRE:
                 break;
 
             case wxALIGN_CENTRE:

-                y = rect.y + ((rect.height - textHeight)/2);
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + ((rect.width - lineWidth)/2);
+                else
+                    y = rect.y + rect.height - ((rect.height - lineWidth)/2);

                 break;
 
                 break;
 

-            case wxALIGN_TOP:
+            case wxALIGN_LEFT:

             default:
             default:

-                y = rect.y + 1;
+                if( textOrientation == wxHORIZONTAL )
+                    x = rect.x + 1;
+                else
+                    y = rect.y + rect.height - 1;

                 break;
                 break;

-        }
+            }

 
 

-        for ( size_t i = 0;  i < lines.GetCount();  i++ )
-        {
-            dc.DrawText( lines[i], (int)x, (int)y );
-            y += lineHeight;
+            if( textOrientation == wxHORIZONTAL )
+            {
+                dc.DrawText( lines[l], (int)x, (int)y );
+                y += lineHeight;
+            }
+            else
+            {
+                dc.DrawRotatedText( lines[l], (int)x, (int)y, 90.0 );
+                x += lineHeight;
+            }

         }
     }
         }
     }

-

     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 


@@ -7160,19 +7516,21 @@ bool wxGrid::IsCurrentCellReadOnly() const
 
 bool wxGrid::CanEnableCellControl() const
 {
 
 bool wxGrid::CanEnableCellControl() const
 {

-    return m_editable && !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 )
     {


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

-            m_cellEditCtrlEnabled = FALSE;
+            m_cellEditCtrlEnabled = false;

             return;
         }
         else
             return;
         }
         else


@@ -7250,7 +7608,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(),


@@ -7262,7 +7620,6 @@ void wxGrid::ShowCellEditControl()
                 GetEventHandler()->ProcessEvent(evt);
             }
 
                 GetEventHandler()->ProcessEvent(evt);
             }
 

-            editor->Show( TRUE, attr );

 
             // resize editor to overflow into righthand cells if allowed
             int maxWidth = rect.width;
 
             // resize editor to overflow into righthand cells if allowed
             int maxWidth = rect.width;


@@ -7271,38 +7628,46 @@ void wxGrid::ShowCellEditControl()
             {
                 int y;
                 GetTextExtent(value, &maxWidth, &y,
             {
                 int y;
                 GetTextExtent(value, &maxWidth, &y,

-                             NULL, NULL, &attr->GetFont());
+                        NULL, NULL, &attr->GetFont());

                 if (maxWidth < rect.width) maxWidth = rect.width;
             }
             int client_right = m_gridWin->GetClientSize().GetWidth();
             if (rect.x+maxWidth > client_right)
                 if (maxWidth < rect.width) maxWidth = rect.width;
             }
             int client_right = m_gridWin->GetClientSize().GetWidth();
             if (rect.x+maxWidth > client_right)

-               maxWidth = client_right - rect.x;
+                maxWidth = client_right - rect.x;

 
 

-           if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
-           {
+            if ((maxWidth > rect.width) && (col < m_numCols) && m_table)
+            {

                 GetCellSize( row, col, &cell_rows, &cell_cols );
                 GetCellSize( row, col, &cell_rows, &cell_cols );

-               // may have changed earlier
-               for (int i = col+cell_cols; i < m_numCols; i++)
-               {
+                // may have changed earlier
+                for (int i = col+cell_cols; i < m_numCols; i++)
+                {

                     int c_rows, c_cols;
                     GetCellSize( row, i, &c_rows, &c_cols );
                     int c_rows, c_cols;
                     GetCellSize( row, i, &c_rows, &c_cols );

-                   // looks weird going over a multicell
-                   if (m_table->IsEmptyCell(row,i) &&
-                       (rect.width < maxWidth) && (c_rows == 1))
-                       rect.width += GetColWidth(i);
-                   else
-                     break;
-               }
+                    // looks weird going over a multicell
+                    if (m_table->IsEmptyCell(row,i) &&
+                            (rect.width < maxWidth) && (c_rows == 1))
+                        rect.width += GetColWidth(i);
+                    else
+                        break;
+                }

                 if (rect.GetRight() > client_right)
                 if (rect.GetRight() > client_right)

-                   rect.SetRight(client_right-1);
+                    rect.SetRight(client_right-1);

             }
             }

+
+            editor->SetCellAttr(attr);

             editor->SetSize( rect );
             editor->SetSize( rect );

+            editor->Show( true, attr );
+
+            // recalc dimensions in case we need to
+            // expand the scrolled window to account for editor
+            CalcDimensions();

 
             editor->BeginEdit(row, col, this);
 
             editor->BeginEdit(row, col, this);

+            editor->SetCellAttr(NULL);

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

-         }
+        }

     }
 }
 
     }
 }
 


@@ -7316,7 +7681,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();


@@ -7324,7 +7689,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 );

     }
 }
 
     }
 }
 


@@ -7389,10 +7754,16 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,
 
 static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
                            const wxArrayInt& BorderArray, int nMax,

-                           bool maxOnOverflow)
+                           bool clipToMinMax)

 {
 {

+
+    if (coord < 0)
+        return clipToMinMax && (nMax > 0) ? 0 : -1;
+
+

     if (!defaultDist)
         defaultDist = 1;
     if (!defaultDist)
         defaultDist = 1;

+

     size_t i_max = coord / defaultDist,
            i_min = 0;
 
     size_t i_max = coord / defaultDist,
            i_min = 0;
 


@@ -7400,7 +7771,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
     {
         if((int) i_max < nMax)
             return i_max;
     {
         if((int) i_max < nMax)
             return i_max;

-        return maxOnOverflow ? nMax - 1 : -1;
+        return clipToMinMax ? nMax - 1 : -1;

     }
 
     if ( i_max >= BorderArray.GetCount())
     }
 
     if ( i_max >= BorderArray.GetCount())


@@ -7410,13 +7781,16 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
         if ( coord >= BorderArray[i_max])
         {
             i_min = i_max;
         if ( coord >= BorderArray[i_max])
         {
             i_min = i_max;

-            i_max = coord / minDist;
+            if (minDist)
+                i_max = coord / minDist;
+            else
+                i_max =  BorderArray.GetCount() - 1;

         }
         if ( i_max >= BorderArray.GetCount())
             i_max = BorderArray.GetCount() - 1;
     }
     if ( coord >= BorderArray[i_max])
         }
         if ( i_max >= BorderArray.GetCount())
             i_max = BorderArray.GetCount() - 1;
     }
     if ( coord >= BorderArray[i_max])

-        return maxOnOverflow ? (int)i_max : -1;
+        return clipToMinMax ? (int)i_max : -1;

     if ( coord < BorderArray[0] )
         return 0;
 
     if ( coord < BorderArray[0] )
         return 0;
 


@@ -7440,14 +7814,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,

-                           WXGRID_MIN_ROW_HEIGHT, 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,

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

 }
 
 
 }
 
 


@@ -7619,17 +7993,10 @@ void wxGrid::MakeCellVisible( int row, int col )
         }
         else if ( right > cw )
         {
         }
         else if ( right > cw )
         {

-            int w = r.GetWidth();
-            xpos = r.GetLeft();
-            for ( i = col-1;  i >= 0;  i-- )
-            {
-                int colWidth = GetColWidth(i);
-                if ( w + colWidth > cw )
-                    break;
-
-                w += colWidth;
-                xpos -= colWidth;
-            }
+            // position the view so that the cell is on the right
+            int x0, y0;
+            CalcUnscrolledPosition(0, 0, &x0, &y0);
+            xpos = x0 + (right - cw);

 
             // see comment for ypos above
             xpos += GRID_SCROLL_LINE_X;
 
             // see comment for ypos above
             xpos += GRID_SCROLL_LINE_X;


@@ -7678,11 +8045,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;

 }
 
 
 }
 
 


@@ -7712,11 +8079,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;

 }
 
 
 }
 
 


@@ -7746,11 +8113,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;

 }
 
 
 }
 
 


@@ -7780,17 +8147,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 )


@@ -7799,53 +8166,48 @@ bool wxGrid::MovePageUp()
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);

-        int newRow = YToRow( y - ch + 1 );
-        if ( newRow == -1 )
-        {
-            newRow = 0;
-        }
-        else if ( newRow == row )
+        int newRow = internalYToRow( y - ch + 1 );
+
+        if ( newRow == row )

         {
         {

+            //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();
 
     int row = m_currentCellCoords.GetRow();

-    if ( row < m_numRows )
+    if ( (row+1) < m_numRows )

     {
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);
     {
         int cw, ch;
         m_gridWin->GetClientSize( &cw, &ch );
 
         int y = GetRowTop(row);

-        int newRow = YToRow( y + ch );
-        if ( newRow == -1 )
-        {
-            newRow = m_numRows - 1;
-        }
-        else if ( newRow == row )
+        int newRow = internalYToRow( y + ch );
+        if ( newRow == row )

         {
         {

+            // row < m_numRows , so newrow can't overflow 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::MoveCursorUpBlock( bool expandSelection )
 }
 
 bool wxGrid::MoveCursorUpBlock( bool expandSelection )


@@ -7905,10 +8267,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 )


@@ -7969,10 +8331,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 )


@@ -8033,10 +8395,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 )


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

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -8121,6 +8483,11 @@ void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
     *vert  = m_colLabelVertAlign;
 }
 
     *vert  = m_colLabelVertAlign;
 }
 

+int wxGrid::GetColLabelTextOrientation()
+{
+    return m_colLabelTextOrientation;
+}
+

 wxString wxGrid::GetRowLabelValue( int row )
 {
     if ( m_table )
 wxString wxGrid::GetRowLabelValue( int row )
 {
     if ( m_table )


@@ -8157,18 +8524,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 );

     }
 }
 
     }
 }
 


@@ -8180,18 +8547,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 );

     }
 }
 
     }
 }
 


@@ -8303,6 +8670,26 @@ 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
+//
+// Example: wxFont font(9, wxSWISS, wxNORMAL, wxBOLD);
+//                      pGrid->SetLabelFont(font);
+//                      pGrid->SetColLabelTextOrientation(wxVERTICAL);
+//
+void wxGrid::SetColLabelTextOrientation( int textOrientation )
+{
+    if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL )
+    {
+        m_colLabelTextOrientation = textOrientation;
+    }
+
+    if ( !GetBatchCount() )
+    {
+        m_colLabelWin->Refresh();
+    }
+}
+

 void wxGrid::SetRowLabelValue( int row, const wxString& s )
 {
     if ( m_table )
 void wxGrid::SetRowLabelValue( int row, const wxString& s )
 {
     if ( m_table )


@@ -8316,7 +8703,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 );

             }
         }
     }
             }
         }
     }


@@ -8335,7 +8722,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 );

             }
         }
     }
             }
         }
     }


@@ -8380,7 +8767,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);

     }
 }
 
     }
 }
 


@@ -8396,7 +8783,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);

     }
 }
 
     }
 }
 


@@ -8617,7 +9004,7 @@ bool wxGrid::CanHaveAttributes()
 {
     if ( !m_table )
     {
 {
     if ( !m_table )
     {

-        return FALSE;
+        return false;

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


@@ -8635,13 +9022,16 @@ void wxGrid::ClearAttrCache()
 
 void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
 {
 
 void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const
 {

-    wxGrid *self = (wxGrid *)this;  // const_cast
+    if ( attr != NULL )
+    {
+        wxGrid *self = (wxGrid *)this;  // const_cast

 
 

-    self->ClearAttrCache();
-    self->m_attrCache.row = row;
-    self->m_attrCache.col = col;
-    self->m_attrCache.attr = attr;
-    wxSafeIncRef(attr);
+        self->ClearAttrCache();
+        self->m_attrCache.row = row;
+        self->m_attrCache.col = col;
+        self->m_attrCache.attr = attr;
+        wxSafeIncRef(attr);
+    }

 }
 
 bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
 }
 
 bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const


@@ -8655,14 +9045,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;

     }
 }
 
     }
 }
 


@@ -8698,7 +9088,7 @@ wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
 
     wxCHECK_MSG( m_table, attr,
     wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
 
     wxCHECK_MSG( m_table, attr,

-                  _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
+                  _T("we may only be called if CanHaveAttributes() returned true and then m_table should be !NULL") );

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


@@ -8740,9 +9130,7 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision)
 
 void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
 {
 
 void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
 {

-    wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
-
-    attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );
+    wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col );

     if(!attr)
         attr = new wxGridCellAttr;
     wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
     if(!attr)
         attr = new wxGridCellAttr;
     wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);


@@ -9010,7 +9398,7 @@ void wxGrid::EnableDragGridSize( bool enable )
 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {
 
 void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
 {

-    m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
+    m_defaultRowHeight = wxMax( height, m_minAcceptableRowHeight );

 
     if ( resizeExistingRows )
     {
 
     if ( resizeExistingRows )
     {


@@ -9029,6 +9417,9 @@ void wxGrid::SetRowSize( int row, int height )
 {
     wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 
 {
     wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
 

+    // See comment in SetColSize
+    if ( height < GetRowMinimalAcceptableHeight()) { return; }
+

     if ( m_rowHeights.IsEmpty() )
     {
         // need to really create the array
     if ( m_rowHeights.IsEmpty() )
     {
         // need to really create the array


@@ -9050,7 +9441,7 @@ void wxGrid::SetRowSize( int row, int height )
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 {

-    m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH );
+    m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );

 
     if ( resizeExistingCols )
     {
 
     if ( resizeExistingCols )
     {


@@ -9070,6 +9461,14 @@ void wxGrid::SetColSize( int col, int width )
     wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
 
     // should we check that it's bigger than GetColMinimalWidth(col) here?
     wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
 
     // should we check that it's bigger than GetColMinimalWidth(col) here?

+    //                                                                 (VZ)
+    // No, because it is reasonable to assume the library user know's
+    // what he is doing. However whe should test against the weaker
+    // constariant of minimalAcceptableWidth, as this breaks rendering
+    //
+    // This test then fixes sf.net bug #645734
+
+    if ( width < GetColMinimalAcceptableWidth()) { return; }

 
     if ( m_colWidths.IsEmpty() )
     {
 
     if ( m_colWidths.IsEmpty() )
     {


@@ -9077,6 +9476,17 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
         InitColWidths();
     }
 

+    // if < 0 calc new width from label
+    if( width < 0 )
+    {
+      long w, h;
+      wxArrayString lines;
+      wxClientDC dc(m_colLabelWin);
+      dc.SetFont(GetLabelFont());
+      StringToLines(GetColLabelValue(col), lines);
+      GetTextBoxSize(dc, lines, &w, &h);
+      width = w + 6;
+    }

     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;
     int w = wxMax( 0, width );
     int diff = w - m_colWidths[col];
     m_colWidths[col] = w;


@@ -9093,24 +9503,56 @@ void wxGrid::SetColSize( int col, int width )
 
 void wxGrid::SetColMinimalWidth( int col, int width )
 {
 
 void wxGrid::SetColMinimalWidth( int col, int width )
 {

-    m_colMinWidths.Put(col, width);
+    if (width > GetColMinimalAcceptableWidth()) {
+        m_colMinWidths[col] = width;
+    }

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

-    m_rowMinHeights.Put(row, width);
+    if (width > GetRowMinimalAcceptableHeight()) {
+       m_rowMinHeights[row] = width;
+    }

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

-    long value = m_colMinWidths.Get(col);
-    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;
+    wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(col);
+    return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;

 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {
 }
 
 int wxGrid::GetRowMinimalHeight(int row) const
 {

-    long value = m_rowMinHeights.Get(row);
-    return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
+    wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(row);
+    return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
+}
+
+void wxGrid::SetColMinimalAcceptableWidth( int width )
+{
+    // We do allow a width of 0 since this gives us
+    // an easy way to temporarily hidding columns.
+    if ( width<0 )
+        return;
+    m_minAcceptableColWidth = width;
+}
+
+void wxGrid::SetRowMinimalAcceptableHeight( int height )
+{
+    // We do allow a height of 0 since this gives us
+    // an easy way to temporarily hidding rows.
+    if ( height<0 )
+        return;
+    m_minAcceptableRowHeight = height;
+};
+
+int  wxGrid::GetColMinimalAcceptableWidth() const
+{
+    return m_minAcceptableColWidth;
+}
+
+int  wxGrid::GetRowMinimalAcceptableHeight() const
+{
+    return m_minAcceptableRowHeight;

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


@@ -9121,6 +9563,10 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
 {
     wxClientDC dc(m_gridWin);
 
 {
     wxClientDC dc(m_gridWin);
 

+    //Cancel editting of cell
+    HideCellEditControl();
+    SaveEditControlValue();
+

     // init both of them to avoid compiler warnings, even if weo nly need one
     int row = -1,
         col = -1;
     // init both of them to avoid compiler warnings, even if weo nly need one
     int row = -1,
         col = -1;


@@ -9160,7 +9606,11 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     dc.SetFont( GetLabelFont() );
 
     if ( column )
     dc.SetFont( GetLabelFont() );
 
     if ( column )

+    {

         dc.GetTextExtent( GetColLabelValue(col), &w, &h );
         dc.GetTextExtent( GetColLabelValue(col), &w, &h );

+        if( GetColLabelTextOrientation() == wxVERTICAL )
+            w = h;
+    }

     else
         dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
 
     else
         dc.GetTextExtent( GetRowLabelValue(row), &w, &h );
 


@@ -9201,7 +9651,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


@@ -9216,7 +9666,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 )


@@ -9278,17 +9728,21 @@ 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

-    wxSize sizeFit(GetScrollX(size.x) * GRID_SCROLL_LINE_X,
-                   GetScrollY(size.y) * GRID_SCROLL_LINE_Y);
+    // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
+    // scrollbar steps
+    wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
+                   GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);

 
 

-    // distribute the extra space between teh columns/rows to avoid having
+    // distribute the extra space between the columns/rows to avoid having

     // extra white space
     // extra white space

-    wxCoord diff = sizeFit.x - size.x;
-    if ( diff )
+
+    // Remove the extra m_extraWidth + 1 added above
+    wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
+    if ( diff && m_numCols )

     {
         // try to resize the columns uniformly
         wxCoord diffPerCol = diff / m_numCols;
     {
         // try to resize the columns uniformly
         wxCoord diffPerCol = diff / m_numCols;


@@ -9312,8 +9766,8 @@ void wxGrid::AutoSize()
     }
 
     // same for rows
     }
 
     // same for rows

-    diff = sizeFit.y - size.y;
-    if ( diff )
+    diff = sizeFit.y - size.y - (m_extraHeight + 1);
+    if ( diff && m_numRows )

     {
         // try to resize the columns uniformly
         wxCoord diffPerRow = diff / m_numRows;
     {
         // try to resize the columns uniformly
         wxCoord diffPerRow = diff / m_numRows;


@@ -9341,14 +9795,63 @@ void wxGrid::AutoSize()
     SetClientSize(sizeFit);
 }
 
     SetClientSize(sizeFit);
 }
 

+void wxGrid::AutoSizeRowLabelSize( int row )
+{
+    wxArrayString lines;
+    long w, h;
+
+    // Hide the edit control, so it
+    // won't interfer with drag-shrinking.
+    if( IsCellEditControlShown() )
+    {
+        HideCellEditControl();
+        SaveEditControlValue();
+    }
+
+    // autosize row height depending on label text
+    StringToLines( GetRowLabelValue( row ), lines );
+    wxClientDC dc( m_rowLabelWin );
+    GetTextBoxSize( dc, lines, &w, &h);
+    if( h < m_defaultRowHeight )
+        h = m_defaultRowHeight;
+    SetRowSize(row, h);
+    ForceRefresh();
+}
+
+void wxGrid::AutoSizeColLabelSize( int col )
+{
+    wxArrayString lines;
+    long w, h;
+
+    // Hide the edit control, so it
+    // won't interfer with drag-shrinking.
+    if( IsCellEditControlShown() )
+    {
+        HideCellEditControl();
+        SaveEditControlValue();
+    }
+
+    // autosize column width depending on label text
+    StringToLines( GetColLabelValue( col ), lines );
+    wxClientDC dc( m_colLabelWin );
+    if( GetColLabelTextOrientation() == wxHORIZONTAL )
+        GetTextBoxSize( dc, lines, &w, &h);
+    else
+        GetTextBoxSize( dc, lines, &h, &w);
+    if( w < m_defaultColWidth )
+        w = m_defaultColWidth;
+    SetColSize(col, w);
+    ForceRefresh();
+}
+

 wxSize wxGrid::DoGetBestSize() const
 {
     // don't set sizes, only calculate them
     wxGrid *self = (wxGrid *)this;  // const_cast
 
     int width, height;
 wxSize wxGrid::DoGetBestSize() const
 {
     // don't set sizes, only calculate them
     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);

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


@@ -9386,7 +9889,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 &&


@@ -9413,7 +9916,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 );

 }
 
 
 }
 
 


@@ -9423,7 +9926,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 );

 }
 
 
 }
 
 


@@ -9435,7 +9938,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 );

 }
 
 
 }
 
 


@@ -9653,8 +10156,6 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     return rect;
 }
 
     return rect;
 }
 

-
-

 //
 // ------ Grid event classes
 //
 //
 // ------ Grid event classes
 //


@@ -9733,7 +10234,5 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
     m_ctrl = ctrl;
 }
 
     m_ctrl = ctrl;
 }
 

-
-#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID
-

 #endif // wxUSE_GRID
 #endif // wxUSE_GRID

+