use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 4a09bd55fd413420496175ccfd39eded8c399a22..2ba9c636e89da794ba21ea3edac21c711563adef 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -132,12 +132,14 @@ public:
                     int additionalStyle = 0,
                     const wxString& name = wxPanelNameStr)
         : wxWindow(owner, id, pos, size,
                     int additionalStyle = 0,
                     const wxString& name = wxPanelNameStr)
         : wxWindow(owner, id, pos, size,

-                   wxWANTS_CHARS | wxBORDER_NONE | additionalStyle,
+                   wxBORDER_NONE | additionalStyle,

                    name)
     {
         m_owner = owner;
     }
 
                    name)
     {
         m_owner = owner;
     }
 

+    virtual bool AcceptsFocus() const { return false; }
+

     wxGrid *GetOwner() { return m_owner; }
 
 protected:
     wxGrid *GetOwner() { return m_owner; }
 
 protected:


@@ -160,9 +162,6 @@ private:
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );

-    void OnKeyDown( wxKeyEvent& event );
-    void OnKeyUp( wxKeyEvent& );
-    void OnChar( wxKeyEvent& );

 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
     DECLARE_EVENT_TABLE()


@@ -181,9 +180,6 @@ private:
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );

-    void OnKeyDown( wxKeyEvent& event );
-    void OnKeyUp( wxKeyEvent& );
-    void OnChar( wxKeyEvent& );

 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
     DECLARE_EVENT_TABLE()


@@ -201,9 +197,6 @@ public:
 private:
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
 private:
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );

-    void OnKeyDown( wxKeyEvent& event );
-    void OnKeyUp( wxKeyEvent& );
-    void OnChar( wxKeyEvent& );

     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)


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

+    virtual bool AcceptsFocus() const { return true; }
+

 private:
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;
 private:
     wxGridRowLabelWindow     *m_rowLabelWin;
     wxGridColLabelWindow     *m_colLabelWin;


@@ -490,7 +485,7 @@ void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
         gridWindow->GetOwner()->PrepareDC(dc);
 
     dc.SetPen(*wxTRANSPARENT_PEN);
         gridWindow->GetOwner()->PrepareDC(dc);
 
     dc.SetPen(*wxTRANSPARENT_PEN);

-    dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+    dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID));

     dc.DrawRectangle(rectCell);
 
     // redraw the control we just painted over
     dc.DrawRectangle(rectCell);
 
     // redraw the control we just painted over


@@ -650,12 +645,10 @@ void wxGridCellTextEditor::DoCreate(wxWindow* parent,
                                     wxEvtHandler* evtHandler,
                                     long style)
 {
                                     wxEvtHandler* evtHandler,
                                     long style)
 {

-#if defined(__WXMSW__)

     style |= wxTE_PROCESS_ENTER |
              wxTE_PROCESS_TAB |
              wxTE_AUTO_SCROLL |
              wxNO_BORDER;
     style |= wxTE_PROCESS_ENTER |
              wxTE_PROCESS_TAB |
              wxTE_AUTO_SCROLL |
              wxNO_BORDER;

-#endif

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


@@ -1522,10 +1515,16 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent,
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 {
                                     wxWindowID id,
                                     wxEvtHandler* evtHandler)
 {

+    int style = wxTE_PROCESS_ENTER |
+                wxTE_PROCESS_TAB |
+                wxBORDER_NONE;
+
+    if ( !m_allowOthers )
+        style |= wxCB_READONLY;

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

-                               m_allowOthers ? 0 : wxCB_READONLY);
+                               style);

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


@@ -1804,23 +1803,28 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
                               int WXUNUSED(row), int WXUNUSED(col),
                               bool isSelected)
 {
                               int WXUNUSED(row), int WXUNUSED(col),
                               bool isSelected)
 {

-    dc.SetBackgroundMode( wxSOLID );
+    dc.SetBackgroundMode( wxBRUSHSTYLE_SOLID );

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

-            dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+            wxColour clr;
+            if ( grid.HasFocus() )
+                clr = grid.GetSelectionBackground();
+            else
+                clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW);
+            dc.SetBrush( wxBrush(clr, wxBRUSHSTYLE_SOLID) );

         }
         else
         {
         }
         else
         {

-            dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+            dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxBRUSHSTYLE_SOLID) );

         }
     }
     else
     {
         }
     }
     else
     {

-        dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
+        dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxBRUSHSTYLE_SOLID));

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


@@ -1836,7 +1840,7 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
                                                      wxDC& dc,
                                                      bool isSelected)
 {
                                                      wxDC& dc,
                                                      bool isSelected)
 {

-    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT );

 
     // TODO some special colours for attr.IsReadOnly() case?
 
 
     // TODO some special colours for attr.IsReadOnly() case?
 


@@ -1845,7 +1849,12 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
     {
         if ( isSelected )
         {
     {
         if ( isSelected )
         {

-            dc.SetTextBackground( grid.GetSelectionBackground() );
+            wxColour clr;
+            if ( grid.HasFocus() )
+                clr = grid.GetSelectionBackground();
+            else
+                clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW);
+            dc.SetTextBackground( clr );

             dc.SetTextForeground( grid.GetSelectionForeground() );
         }
         else
             dc.SetTextForeground( grid.GetSelectionForeground() );
         }
         else


@@ -2206,8 +2215,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
 
         wxSize size = checkbox->GetBestSize();
         wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
 

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

         checkSize -= size.y / 2;
 #endif
 
         checkSize -= size.y / 2;
 #endif
 


@@ -2236,7 +2244,7 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     if ( size.x >= minSize || size.y >= minSize )
     {
         // and even leave (at least) 1 pixel margin
     if ( size.x >= minSize || size.y >= minSize )
     {
         // and even leave (at least) 1 pixel margin

-        size.x = size.y = minSize - 2;
+        size.x = size.y = minSize;

     }
 
     // draw a border around checkmark
     }
 
     // draw a border around checkmark


@@ -2277,26 +2285,11 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
         value = wxGridCellBoolEditor::IsTrueValue(cellval);
     }
 
         value = wxGridCellBoolEditor::IsTrueValue(cellval);
     }
 

-    if ( value )
-    {
-        wxRect rectMark = rectBorder;
-
-#ifdef __WXMSW__
-        // MSW DrawCheckMark() is weird (and should probably be changed...)
-        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN / 2);
-        rectMark.x++;
-        rectMark.y++;
-#else
-        rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-#endif
-
-        dc.SetTextForeground(attr.GetTextColour());
-        dc.DrawCheckMark(rectMark);
-    }
-
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
-    dc.DrawRectangle(rectBorder);
+    int flags = 0;
+    if (value)
+        flags |= wxCONTROL_CHECKED; 
+        
+    wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags );

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


@@ -3790,9 +3783,6 @@ BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )

-    EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
-    EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
-    EVT_CHAR( wxGridRowLabelWindow::OnChar )

 END_EVENT_TABLE()
 
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
 END_EVENT_TABLE()
 
 wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,


@@ -3832,27 +3822,6 @@ void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
     m_owner->GetEventHandler()->ProcessEvent( event );
 }
 
     m_owner->GetEventHandler()->ProcessEvent( event );
 }
 

-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-
-void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-
-void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-

 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )


@@ -3861,9 +3830,6 @@ BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )

-    EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
-    EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
-    EVT_CHAR( wxGridColLabelWindow::OnChar )

 END_EVENT_TABLE()
 
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
 END_EVENT_TABLE()
 
 wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,


@@ -3906,27 +3872,6 @@ void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
     m_owner->GetEventHandler()->ProcessEvent( event );
 }
 
     m_owner->GetEventHandler()->ProcessEvent( event );
 }
 

-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-
-void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-
-void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-

 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )


@@ -3935,9 +3880,6 @@ BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
     EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint )

-    EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
-    EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
-    EVT_CHAR( wxGridCornerLabelWindow::OnChar )

 END_EVENT_TABLE()
 
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
 END_EVENT_TABLE()
 
 wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,


@@ -3967,7 +3909,7 @@ def __WXGTK__
 
     wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
 #else // !__WXGTK__
 
     wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
 #else // !__WXGTK__

-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxPENSTYLE_SOLID) );

     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( 0, 0, client_width, 0 );
     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( 0, 0, client_width, 0 );


@@ -3989,27 +3931,6 @@ void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
     m_owner->GetEventHandler()->ProcessEvent(event);
 }
 
     m_owner->GetEventHandler()->ProcessEvent(event);
 }
 

-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-
-void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-
-void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
-{
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-        event.Skip();
-}
-

 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
 //////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )


@@ -4033,7 +3954,8 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             const wxPoint &pos,
                             const wxSize &size )
             : wxGridSubwindow(parent, id, pos, size,
                             const wxPoint &pos,
                             const wxSize &size )
             : wxGridSubwindow(parent, id, pos, size,

-                              wxCLIP_CHILDREN, wxT("grid window") )
+                              wxWANTS_CHARS | wxCLIP_CHILDREN,
+                              wxT("grid window") )

 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;


@@ -4103,6 +4025,29 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 
 void wxGridWindow::OnFocus(wxFocusEvent& event)
 {
 
 void wxGridWindow::OnFocus(wxFocusEvent& event)
 {

+    // and if we have any selection, it has to be repainted, because it
+    // uses different colour when the grid is not focused:
+    if ( m_owner->IsSelection() )
+    {
+        Refresh();
+    }
+    else
+    {
+        // NB: Note that this code is in "else" branch only because the other
+        //     branch refreshes everything and so there's no point in calling
+        //     Refresh() again, *not* because it should only be done if
+        //     !IsSelection(). If the above code is ever optimized to refresh
+        //     only selected area, this needs to be moved out of the "else"
+        //     branch so that it's always executed.
+
+        // current cell cursor {dis,re}appears on focus change:
+        const wxGridCellCoords cursorCoords(m_owner->GetGridCursorRow(),
+                                            m_owner->GetGridCursorCol());
+        const wxRect cursor =
+            m_owner->BlockToDeviceRect(cursorCoords, cursorCoords);
+        Refresh(true, &cursor);
+    }
+

     if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
         event.Skip();
 }
     if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
         event.Skip();
 }


@@ -4190,12 +4135,7 @@ END_EVENT_TABLE()
 
 wxGrid::wxGrid()
 {
 
 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;
+    InitVars();

 }
 
 wxGrid::wxGrid( wxWindow *parent,
 }
 
 wxGrid::wxGrid( wxWindow *parent,


@@ -4204,12 +4144,9 @@ wxGrid::wxGrid( wxWindow *parent,
                  const wxSize& size,
                  long style,
                  const wxString& name )
                  const wxSize& size,
                  long style,
                  const wxString& name )

-  : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
-    m_colMinWidths(GRID_HASH_SIZE),
-    m_rowMinHeights(GRID_HASH_SIZE)

 {
 {

-    Create();
-    SetInitialSize(size);
+    InitVars();
+    Create(parent, id, pos, size, style, name);

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


@@ -4266,15 +4203,8 @@ wxGrid::~wxGrid()
 
 void wxGrid::Create()
 {
 
 void wxGrid::Create()
 {

-    // set to true by CreateGrid
-    m_created = false;
-

     // create the type registry
     m_typeRegistry = new wxGridTypeRegistry;
     // create the type registry
     m_typeRegistry = new wxGridTypeRegistry;

-    m_selection = NULL;
-
-    m_table = (wxGridTableBase *) NULL;
-    m_ownTable = false;

 
     m_cellEditCtrlEnabled = false;
 
 
     m_cellEditCtrlEnabled = false;
 


@@ -4468,6 +4398,24 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
     return m_created;
 }
 
     return m_created;
 }
 

+void wxGrid::InitVars()
+{
+    m_created = false;
+
+    m_cornerLabelWin = NULL;
+    m_rowLabelWin = NULL;
+    m_colLabelWin = NULL;
+    m_gridWin = NULL;
+
+    m_table = NULL;
+    m_ownTable = false;
+
+    m_selection = NULL;
+    m_defaultCellAttr = NULL;
+    m_typeRegistry = NULL;
+    m_winCapture = NULL;
+}
+

 void wxGrid::Init()
 {
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
 void wxGrid::Init()
 {
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;


@@ -4531,6 +4479,7 @@ void wxGrid::Init()
     m_dragRowOrCol = -1;
     m_isDragging = false;
     m_startDragPos = wxDefaultPosition;
     m_dragRowOrCol = -1;
     m_isDragging = false;
     m_startDragPos = wxDefaultPosition;

+    m_nativeColumnLabels = false;

 
     m_waitForSlowClick = false;
 
 
     m_waitForSlowClick = false;
 


@@ -4727,17 +4676,26 @@ void wxGrid::CalcWindowSizes()
         }
     }
 
         }
     }
 

+    // the grid may be too small to have enough space for the labels yet, don't
+    // size the windows to negative sizes in this case
+    int gw = cw - m_rowLabelWidth;
+    int gh = ch - m_colLabelHeight;
+    if (gw < 0)
+        gw = 0;
+    if (gh < 0)
+        gh = 0;
+

     if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
     if ( m_colLabelWin && m_colLabelWin->IsShown() )
     if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
         m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
 
     if ( m_colLabelWin && m_colLabelWin->IsShown() )

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

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

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

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

-        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw - m_rowLabelWidth, ch - m_colLabelHeight );
+        m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, gw, gh );

 }
 
 // this is called when the grid table sends a message
 }
 
 // this is called when the grid table sends a message


@@ -6298,7 +6256,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragRowSize() && CanDragGridSize() )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragRowSize() && CanDragGridSize() )

-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false);

             }
         }
         else if ( dragCol >= 0 )
             }
         }
         else if ( dragCol >= 0 )


@@ -6308,7 +6266,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragColSize() && CanDragGridSize() )
             if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
             {
                 if ( CanDragColSize() && CanDragGridSize() )

-                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
+                    ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false);

             }
         }
         else // Neither on a row or col edge
             }
         }
         else // Neither on a row or col edge


@@ -6871,7 +6829,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
 {
     // Don't do anything if between Begin/EndBatch...
     // EndBatch() will do all this on the last nested one anyway.
 {
     // Don't do anything if between Begin/EndBatch...
     // EndBatch() will do all this on the last nested one anyway.

-    if (! GetBatchCount())
+    if ( m_created && !GetBatchCount() )

     {
         // Refresh to get correct scrolled position:
         wxScrolledWindow::Refresh(eraseb, rect);
     {
         // Refresh to get correct scrolled position:
         wxScrolledWindow::Refresh(eraseb, rect);


@@ -7218,7 +7176,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         return;
     }
 
         return;
     }
 

-#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+#if !defined(__WXMAC__)

     wxClientDC dc( m_gridWin );
     PrepareDC( dc );
 #endif
     wxClientDC dc( m_gridWin );
     PrepareDC( dc );
 #endif


@@ -7244,7 +7202,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 

-#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
+#if defined(__WXMAC__)

             m_gridWin->Refresh(true /*, & r */);
 #else
             DrawGridCellArea( dc, cells );
             m_gridWin->Refresh(true /*, & r */);
 #else
             DrawGridCellArea( dc, cells );


@@ -7256,7 +7214,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
     m_currentCellCoords = coords;
 
     wxGridCellAttr *attr = GetCellAttr( coords );
     m_currentCellCoords = coords;
 
     wxGridCellAttr *attr = GetCellAttr( coords );

-#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+#if !defined(__WXMAC__) 

     DrawCellHighlight( dc, attr );
 #endif
     attr->DecRef();
     DrawCellHighlight( dc, attr );
 #endif
     attr->DecRef();


@@ -7591,7 +7549,7 @@ void wxGrid::DrawGridSpace( wxDC& dc )
       int left, top;
       CalcUnscrolledPosition( 0, 0, &left, &top );
 
       int left, top;
       CalcUnscrolledPosition( 0, 0, &left, &top );
 

-      dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+      dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxBRUSHSTYLE_SOLID) );

       dc.SetPen( *wxTRANSPARENT_PEN );
 
       if ( right > rightCol )
       dc.SetPen( *wxTRANSPARENT_PEN );
 
       if ( right > rightCol )


@@ -7653,6 +7611,10 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
 
 void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 {
 
 void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 {

+    // don't show highlight when the grid doesn't have focus
+    if ( !HasFocus() )
+        return;
+

     int row = m_currentCellCoords.GetRow();
     int col = m_currentCellCoords.GetCol();
 
     int row = m_currentCellCoords.GetRow();
     int col = m_currentCellCoords.GetCol();
 


@@ -7682,7 +7644,7 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
         // Now draw the rectangle
         // use the cellHighlightColour if the cell is inside a selection, this
         // will ensure the cell is always visible.
         // Now draw the rectangle
         // 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.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxPENSTYLE_SOLID));

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


@@ -7711,7 +7673,7 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
 
 wxPen wxGrid::GetDefaultGridLinePen()
 {
 
 wxPen wxGrid::GetDefaultGridLinePen()
 {

-    return wxPen(GetGridLineColour(), 1, wxSOLID);
+    return wxPen(GetGridLineColour(), 1, wxPENSTYLE_SOLID);

 }
 
 wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))
 }
 
 wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))


@@ -7829,7 +7791,6 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     int rightCol = GetColPos( internalXToCol(right) );
     int bottomRow = internalYToRow(bottom);
 
     int rightCol = GetColPos( internalXToCol(right) );
     int bottomRow = internalYToRow(bottom);
 

-#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS

     wxRegion clippedcells(0, 0, cw, ch);
 
     int i, j, cell_rows, cell_cols;
     wxRegion clippedcells(0, 0, cw, ch);
 
     int i, j, cell_rows, cell_cols;


@@ -7857,30 +7818,6 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             }
         }
     }
             }
         }
     }

-#else
-    wxRegion clippedcells( left, top, right - left, bottom - top );
-
-    int i, j, cell_rows, cell_cols;
-    wxRect rect;
-
-    for (j=topRow; j<=bottomRow; j++)
-    {
-        for (i=leftCol; i<=rightCol; i++)
-        {
-            GetCellSize( j, i, &cell_rows, &cell_cols );
-            if ((cell_rows > 1) || (cell_cols > 1))
-            {
-                rect = CellToRect(j, i);
-                clippedcells.Subtract(rect);
-            }
-            else if ((cell_rows < 0) || (cell_cols < 0))
-            {
-                rect = CellToRect(j + cell_rows, i + cell_cols);
-                clippedcells.Subtract(rect);
-            }
-        }
-    }
-#endif

 
     dc.SetClippingRegion( clippedcells );
 
 
     dc.SetClippingRegion( clippedcells );
 


@@ -7953,23 +7890,10 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 
     wxRect rect;
 
 
     wxRect rect;
 

-#if 0
-def __WXGTK20__
-    rect.SetX( 1 );
-    rect.SetY( GetRowTop(row) + 1 );
-    rect.SetWidth( m_rowLabelWidth - 2 );
-    rect.SetHeight( GetRowHeight(row) - 2 );
-
-    CalcScrolledPosition( 0, rect.y, NULL, &rect.y );
-
-    wxWindowDC *win_dc = (wxWindowDC*) &dc;
-
-    wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
-#else

     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 
     int rowTop = GetRowTop(row),
         rowBottom = GetRowBottom(row) - 1;
 

-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
+    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxPENSTYLE_SOLID) );

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


@@ -7977,9 +7901,8 @@ def __WXGTK20__
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( 1, rowTop, 1, rowBottom );
     dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );
     dc.SetPen( *wxWHITE_PEN );
     dc.DrawLine( 1, rowTop, 1, rowBottom );
     dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );

-#endif

 
 

-    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT );

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


@@ -7993,6 +7916,18 @@ def __WXGTK20__
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 
     DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
 }
 

+void wxGrid::SetUseNativeColLabels( bool native )
+{
+    m_nativeColumnLabels = native;
+    if (native)
+    {
+        int height = wxRendererNative::Get().GetHeaderButtonHeight( this );
+        SetColLabelSize( height );
+    }
+    
+    m_colLabelWin->Refresh();
+}
+

 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
     if ( !m_numCols )
 void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
 {
     if ( !m_numCols )


@@ -8016,31 +7951,32 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
 
     wxRect rect;
 
 
     wxRect rect;
 

-#if 0
-def __WXGTK20__
-    rect.SetX( colLeft + 1 );
-    rect.SetY( 1 );
-    rect.SetWidth( GetColWidth(col) - 2 );
-    rect.SetHeight( m_colLabelHeight - 2 );
-
-    wxWindowDC *win_dc = (wxWindowDC*) &dc;
+    if (m_nativeColumnLabels)
+    {
+        rect.SetX( colLeft);
+        rect.SetY( 0 );
+        rect.SetWidth( GetColWidth(col));
+        rect.SetHeight( m_colLabelHeight );

 
 

-    wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
-#else
-    int colRight = GetColRight(col) - 1;
+        wxWindowDC *win_dc = (wxWindowDC*) &dc;
+        wxRendererNative::Get().DrawHeaderButton( win_dc->GetWindow(), dc, rect, 0 );
+    }
+    else
+    {
+        int colRight = GetColRight(col) - 1;

 
 

-    dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
-    dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
-    dc.DrawLine( colLeft, 0, colRight, 0 );
-    dc.DrawLine( colLeft, m_colLabelHeight - 1,
+        dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxPENSTYLE_SOLID) );
+        dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
+        dc.DrawLine( colLeft, 0, colRight, 0 );
+        dc.DrawLine( colLeft, m_colLabelHeight - 1,

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

-    dc.SetPen( *wxWHITE_PEN );
-    dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
-    dc.DrawLine( colLeft, 1, colRight, 1 );
-#endif
+        dc.SetPen( *wxWHITE_PEN );
+        dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
+        dc.DrawLine( colLeft, 1, colRight, 1 );
+    }

 
 

-    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT );

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


@@ -8181,6 +8117,7 @@ void wxGrid::DrawTextRectangle(wxDC& dc,
 // Split multi-line text up into an array of strings.
 // Any existing contents of the string array are preserved.
 //
 // Split multi-line text up into an array of strings.
 // Any existing contents of the string array are preserved.
 //

+// TODO: refactor wxTextFile::Read() and reuse the same code from here

 void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
 {
     int startPos = 0;
 void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
 {
     int startPos = 0;


@@ -8201,15 +8138,15 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
         }
         else
         {
         }
         else
         {

-            lines.Add( value.Mid(startPos, pos) );
+            lines.Add( tVal.Mid(startPos, pos) );

         }
 
         startPos += pos + 1;
     }
 
         }
 
         startPos += pos + 1;
     }
 

-    if ( startPos < (int)value.length() )
+    if ( startPos < (int)tVal.length() )

     {
     {

-        lines.Add( value.Mid( startPos ) );
+        lines.Add( tVal.Mid( startPos ) );

     }
 }
 
     }
 }
 


@@ -8403,7 +8340,7 @@ void wxGrid::ShowCellEditControl()
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );
             wxGridCellAttr* attr = GetCellAttr(row, col);
             wxClientDC dc( m_gridWin );
             PrepareDC( dc );
             wxGridCellAttr* attr = GetCellAttr(row, col);

-            dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+            dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID));

             dc.SetPen(*wxTRANSPARENT_PEN);
             dc.DrawRectangle(rect);
 
             dc.SetPen(*wxTRANSPARENT_PEN);
             dc.DrawRectangle(rect);
 


@@ -8475,7 +8412,7 @@ void wxGrid::ShowCellEditControl()
                 if (rect.GetRight() > client_right)
                     rect.SetRight( client_right - 1 );
             }
                 if (rect.GetRight() > client_right)
                     rect.SetRight( client_right - 1 );
             }

-
+            

             editor->SetCellAttr( attr );
             editor->SetSize( rect );
             if (nXMove != 0)
             editor->SetCellAttr( attr );
             editor->SetSize( rect );
             if (nXMove != 0)


@@ -10578,6 +10515,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
 
     if ( column )
     {
 
     if ( column )
     {

+        // Ensure automatic width is not less than minimal width. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetColSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetColMinimalWidth(col));
+

         SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {
         SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {


@@ -10593,6 +10536,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
     }
     else
     {
     }
     else
     {

+        // Ensure automatic width is not less than minimal height. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetRowSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
+

         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {
         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {


@@ -11165,6 +11114,20 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
     return rect;
 }
 
     return rect;
 }
 

+// ----------------------------------------------------------------------------
+// drop target
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+// this allow setting drop target directly on wxGrid
+void wxGrid::SetDropTarget(wxDropTarget *dropTarget)
+{
+    GetGridWindow()->SetDropTarget(dropTarget);
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+

 // ----------------------------------------------------------------------------
 // grid event classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // grid event classes
 // ----------------------------------------------------------------------------