Don't crash in generic wxDataViewCtrl if selected column is removed.

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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 38348c55433a6672b54a09d02089f900a2d57672..0601a60f381e090d56a9919657fde2a1c1bde35b 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -32,11 +32,16 @@
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"

+    #include "wx/control.h"

 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 
 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 

+#ifdef __WXMAC__
+    #include "wx/osx/private.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxRendererGeneric: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRendererGeneric: our wxRendererNative implementation
 // ----------------------------------------------------------------------------


@@ -62,6 +67,8 @@ public:
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 

+    virtual int GetHeaderButtonMargin(wxWindow *win);
+

     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,


@@ -94,6 +101,8 @@ public:
                               const wxRect& rect,
                               int flags = 0);
 
                               const wxRect& rect,
                               int flags = 0);
 

+    virtual wxSize GetCheckBoxSize(wxWindow *win);
+

     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,


@@ -104,6 +113,24 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
                                        const wxRect& rect,
                                        int flags = 0);
 

+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+
+    virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+    virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+    virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+    virtual void DrawTitleBarBitmap(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    wxTitleBarButton button,
+                                    int flags = 0);
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
+

     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
     virtual wxRendererVersion GetVersion() const
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
     virtual wxRendererVersion GetVersion() const


@@ -158,10 +185,7 @@ wxRendererNative& wxRendererNative::GetGeneric()
 
 void wxRendererGeneric::Cleanup()
 {
 
 void wxRendererGeneric::Cleanup()
 {

-    if (sm_rendererGeneric)
-        delete sm_rendererGeneric;
-
-    sm_rendererGeneric = NULL;
+    wxDELETE(sm_rendererGeneric);

 }
 
 wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;
 }
 
 wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;


@@ -212,8 +236,6 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win,
                                     wxHeaderSortIconType sortArrow,
                                     wxHeaderButtonParams* params)
 {
                                     wxHeaderSortIconType sortArrow,
                                     wxHeaderButtonParams* params)
 {

-    const int CORNER = 1;
-

     const wxCoord x = rect.x,
                   y = rect.y,
                   w = rect.width,
     const wxCoord x = rect.x,
                   y = rect.y,
                   w = rect.width,


@@ -222,22 +244,20 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win,
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.DrawRectangle(rect);
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.DrawRectangle(rect);

-    
+

     dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
     dc.SetPen(m_penBlack);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
     dc.SetPen(m_penBlack);

-    dc.DrawLine( x+w-CORNER+1, y, x+w, y+h );  // right (outer)
-    dc.DrawRectangle( x, y+h, w+1, 1 );        // bottom (outer)
+    dc.DrawLine( x+w-1, y, x+w-1, y+h );  // right (outer)
+    dc.DrawLine( x, y+h-1, x+w, y+h-1 );  // bottom (outer)

 
     dc.SetPen(m_penDarkGrey);
 
     dc.SetPen(m_penDarkGrey);

-    dc.DrawLine( x+w-CORNER, y, x+w-1, y+h );  // right (inner)
-    dc.DrawRectangle( x+1, y+h-1, w-2, 1 );    // bottom (inner)
+    dc.DrawLine( x+w-2, y+1, x+w-2, y+h-1 );  // right (inner)
+    dc.DrawLine( x+1, y+h-2, x+w-1, y+h-2 );  // bottom (inner)

 
     dc.SetPen(m_penHighlight);
 
     dc.SetPen(m_penHighlight);

-    dc.DrawRectangle( x, y, w-CORNER+1, 1 );   // top (outer)
-    dc.DrawRectangle( x, y, 1, h );            // left (outer)
-    dc.DrawLine( x, y+h-1, x+1, y+h-1 );
-    dc.DrawLine( x+w-1, y, x+w-1, y+1 );
+    dc.DrawLine( x, y, x, y+h-1 ); // left (outer)
+    dc.DrawLine( x, y, x+w-1, y ); // top (outer)

 
     return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
 
     return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }


@@ -252,7 +272,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
                                             wxHeaderButtonParams* params)
 {
     int labelWidth = 0;
                                             wxHeaderButtonParams* params)
 {
     int labelWidth = 0;

-    
+

     // Mark this item as selected.  For the generic version we'll just draw an
     // underline
     if ( flags & wxCONTROL_SELECTED )
     // Mark this item as selected.  For the generic version we'll just draw an
     // underline
     if ( flags & wxCONTROL_SELECTED )


@@ -261,7 +281,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
         // native hot-tracking line (on XP)
         const int penwidth = 3;
         int y = rect.y + rect.height + 1 - penwidth;
         // native hot-tracking line (on XP)
         const int penwidth = 3;
         int y = rect.y + rect.height + 1 - penwidth;

-        wxColour c = (params && params->m_selectionColour.Ok()) ?
+        wxColour c = (params && params->m_selectionColour.IsOk()) ?

             params->m_selectionColour : wxColour(0x66, 0x66, 0x66);
         wxPen pen(c, penwidth);
         pen.SetCap(wxCAP_BUTT);
             params->m_selectionColour : wxColour(0x66, 0x66, 0x66);
         wxPen pen(c, penwidth);
         pen.SetCap(wxCAP_BUTT);


@@ -281,7 +301,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
         ar.y += (rect.height - ar.height)/2;
         ar.x = ar.x + rect.width - 3*ar.width/2;
         arrowSpace = 3*ar.width/2; // space to preserve when drawing the label
         ar.y += (rect.height - ar.height)/2;
         ar.x = ar.x + rect.width - 3*ar.width/2;
         arrowSpace = 3*ar.width/2; // space to preserve when drawing the label

-        
+

         wxPoint triPt[3];
         if ( sortArrow & wxHDR_SORT_ICON_UP )
         {
         wxPoint triPt[3];
         if ( sortArrow & wxHDR_SORT_ICON_UP )
         {


@@ -302,107 +322,116 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
             triPt[2].y = ar.height;
         }
 
             triPt[2].y = ar.height;
         }
 

-        wxColour c = (params && params->m_arrowColour.Ok()) ?
+        wxColour c = (params && params->m_arrowColour.IsOk()) ?

             params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
             params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);

-        dc.SetPen(wxPen(c));
-        dc.SetBrush(wxBrush(c));
-        dc.DrawPolygon( 3, triPt, ar.x, ar.y);                  
+
+        wxDCPenChanger setPen(dc, c);
+        wxDCBrushChanger setBrush(dc, c);
+
+        wxDCClipper clip(dc, rect);
+        dc.DrawPolygon( 3, triPt, ar.x, ar.y);

     }
     labelWidth += arrowSpace;
     }
     labelWidth += arrowSpace;

-    
-    const int margin = 5;   // number of pixels to reserve on either side of the label
+

     int bmpWidth = 0;
     int bmpWidth = 0;

-    int txtEnd = 0;
-    
-    if ( params && params->m_labelBitmap.Ok() )
-        bmpWidth = params->m_labelBitmap.GetWidth() + 2;

 
 

-    labelWidth += bmpWidth + 2*margin;
-    
+    // draw the bitmap if there is one
+    if ( params && params->m_labelBitmap.IsOk() )
+    {
+        int w = params->m_labelBitmap.GetWidth();
+        int h = params->m_labelBitmap.GetHeight();
+
+        const int margin = 1; // an extra pixel on either side of the bitmap
+
+        bmpWidth = w + 2*margin;
+        labelWidth += bmpWidth;
+
+        int x = rect.x + margin;
+        const int y = rect.y + wxMax(1, (rect.height - h) / 2);
+
+        const int extraSpace = rect.width - labelWidth;
+        if ( params->m_labelText.empty() && extraSpace > 0 )
+        {
+            // use the alignment flags
+            switch (params->m_labelAlignment)
+            {
+                default:
+                case wxALIGN_LEFT:
+                    break;
+
+                case wxALIGN_CENTER:
+                    x += extraSpace/2;
+                    break;
+
+                case wxALIGN_RIGHT:
+                    x += extraSpace;
+                    break;
+            }
+        }
+
+        wxDCClipper clip(dc, rect);
+        dc.DrawBitmap(params->m_labelBitmap, x, y, true);
+    }
+

     // Draw a label if one is given
     if ( params && !params->m_labelText.empty() )
     {
     // Draw a label if one is given
     if ( params && !params->m_labelText.empty() )
     {

-        wxFont font  = params->m_labelFont.Ok() ?
+        const int margin = 5;   // number of pixels to reserve on either side of the label
+        labelWidth += 2*margin;
+
+        wxFont font  = params->m_labelFont.IsOk() ?

             params->m_labelFont : win->GetFont();
             params->m_labelFont : win->GetFont();

-        wxColour clr = params->m_labelColour.Ok() ?
+        wxColour clr = params->m_labelColour.IsOk() ?

             params->m_labelColour : win->GetForegroundColour();
 
         wxString label( params->m_labelText );
             params->m_labelColour : win->GetForegroundColour();
 
         wxString label( params->m_labelText );

-        
+

         dc.SetFont(font);
         dc.SetTextForeground(clr);
         dc.SetFont(font);
         dc.SetTextForeground(clr);

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

 
 

-        int tw, th, td, x, y;
+        int tw, th, td;

         dc.GetTextExtent( label, &tw, &th, &td);
         dc.GetTextExtent( label, &tw, &th, &td);

-        labelWidth += tw;
-        y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
-        
-        // truncate and add an ellipsis (...) if the text is too wide.
-        int targetWidth = rect.width - arrowSpace - bmpWidth - 2*margin;
-        if ( tw > targetWidth )        
-        {
-            int ellipsisWidth;
-            dc.GetTextExtent( wxT("..."), &ellipsisWidth, NULL);
-            do {
-                label.Truncate( label.length() - 1 );
-                dc.GetTextExtent( label, &tw, &th);
-            } while (tw + ellipsisWidth > targetWidth && label.length() );
-            label.append( wxT("...") );
-            tw += ellipsisWidth;
-        }
-        
-        switch (params->m_labelAlignment)
-        {
-            default:
-            case wxALIGN_LEFT:
-                x = rect.x + margin;
-                break;
-            case wxALIGN_CENTER:
-                x = rect.x + wxMax(0, (rect.width - arrowSpace  - tw - bmpWidth)/2);
-                break;
-            case wxALIGN_RIGHT:
-                x = rect.x + wxMax(0, rect.width - arrowSpace - margin - tw - bmpWidth);
-                break;
-        }

 
 

-        dc.DrawText(label, x, y);
-        txtEnd = x + tw + 2;
-    }
+        int x = rect.x + bmpWidth + margin;
+        const int y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);

 
 

-    // draw the bitmap if there is one
-    if ( params && params->m_labelBitmap.Ok() )
-    {
-        int w, h, x, y;
-        w = params->m_labelBitmap.GetWidth();
-        h = params->m_labelBitmap.GetHeight();
-
-        y = rect.y + wxMax(1, (rect.height - h) / 2);
-
-        // if there is a text label, then put the bitmap at the end of the label
-        if ( txtEnd != 0 )
+        // truncate and add an ellipsis (...) if the text is too wide.
+        const int availWidth = rect.width - labelWidth;
+#if wxUSE_CONTROLS
+        if ( tw > availWidth )

         {
         {

-            x = txtEnd;
+            label = wxControl::Ellipsize(label,
+                                         dc,
+                                         wxELLIPSIZE_END,
+                                         availWidth,
+                                         wxELLIPSIZE_FLAGS_NONE);
+            tw = dc.GetTextExtent(label).x;

         }
         }

-        // otherwise use the alignment flags
-        else
+        else // enough space, we can respect alignment
+#endif // wxUSE_CONTROLS

         {
             switch (params->m_labelAlignment)
             {
                 default:
                 case wxALIGN_LEFT:
         {
             switch (params->m_labelAlignment)
             {
                 default:
                 case wxALIGN_LEFT:

-                    x = rect.x + margin;

                     break;
                     break;

+

                 case wxALIGN_CENTER:
                 case wxALIGN_CENTER:

-                    x = rect.x + wxMax(1, (rect.width - arrowSpace - w)/2);
+                    x += (availWidth - tw)/2;

                     break;
                     break;

+

                 case wxALIGN_RIGHT:
                 case wxALIGN_RIGHT:

-                    x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w);
+                    x += availWidth - tw;

                     break;
             }
         }
                     break;
             }
         }

-        dc.DrawBitmap(params->m_labelBitmap, x, y, true);
+
+        dc.DrawText(label, x, y);
+
+        labelWidth += tw;

     }
     }

+

     return labelWidth;
 }
 
     return labelWidth;
 }
 


@@ -420,6 +449,11 @@ int wxRendererGeneric::GetHeaderButtonHeight(wxWindow *win)
     return h + d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
 }
 
     return h + d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
 }
 

+int wxRendererGeneric::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+    return 5;
+}
+

 
 // draw the plus or minus sign
 void
 
 // draw the plus or minus sign
 void


@@ -616,6 +650,11 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win),
     }
 }
 
     }
 }
 

+wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win))
+{
+    return wxSize(16, 16);
+}
+

 void
 wxRendererGeneric::DrawPushButton(wxWindow *win,
                                   wxDC& dc,
 void
 wxRendererGeneric::DrawPushButton(wxWindow *win,
                                   wxDC& dc,


@@ -633,7 +672,7 @@ wxRendererGeneric::DrawPushButton(wxWindow *win,
 }
 
 void
 }
 
 void

-wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
+wxRendererGeneric::DrawItemSelectionRect(wxWindow * win,

                                          wxDC& dc,
                                          const wxRect& rect,
                                          int flags)
                                          wxDC& dc,
                                          const wxRect& rect,
                                          int flags)


@@ -656,11 +695,104 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
     }
 
     dc.SetBrush(brush);
     }
 
     dc.SetBrush(brush);

-    dc.SetPen(flags & wxCONTROL_CURRENT ? *wxBLACK_PEN : *wxTRANSPARENT_PEN);
+    if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
+                && IsControlActive( (ControlRef)win->GetHandle() )
+#endif
+    )
+        dc.SetPen( *wxBLACK_PEN );
+    else
+        dc.SetPen( *wxTRANSPARENT_PEN );

 
     dc.DrawRectangle( rect );
 
     dc.DrawRectangle( rect );

+
+    // it's unused everywhere except in wxOSX/Carbon
+    wxUnusedVar(win);
+}
+
+void
+wxRendererGeneric::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect& rect, int WXUNUSED(flags))
+{
+    // draw the pixels manually because the "dots" in wxPen with wxDOT style
+    // may be short traits and not really dots
+    //
+    // note that to behave in the same manner as DrawRect(), we must exclude
+    // the bottom and right borders from the rectangle
+    wxCoord x1 = rect.GetLeft(),
+            y1 = rect.GetTop(),
+            x2 = rect.GetRight(),
+            y2 = rect.GetBottom();
+
+    dc.SetPen(m_penBlack);
+
+#ifdef __WXMAC__
+    dc.SetLogicalFunction(wxCOPY);
+#else
+    // this seems to be closer than what Windows does than wxINVERT although
+    // I'm still not sure if it's correct
+    dc.SetLogicalFunction(wxAND_REVERSE);
+#endif
+
+    wxCoord z;
+    for ( z = x1 + 1; z < x2; z += 2 )
+        dc.DrawPoint(z, rect.GetTop());
+
+    wxCoord shift = z == x2 ? 0 : 1;
+    for ( z = y1 + shift; z < y2; z += 2 )
+        dc.DrawPoint(x2, z);
+
+    shift = z == y2 ? 0 : 1;
+    for ( z = x2 - shift; z > x1; z -= 2 )
+        dc.DrawPoint(z, y2);
+
+    shift = z == x1 ? 0 : 1;
+    for ( z = y2 - shift; z > y1; z -= 2 )
+        dc.DrawPoint(x1, z);
+
+    dc.SetLogicalFunction(wxCOPY);

 }
 
 }
 

+void wxRendererGeneric::DrawChoice(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawChoice");
+}
+
+void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox");
+}
+
+void wxRendererGeneric::DrawRadioBitmap(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioBitmap");
+}
+
+void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawTextCtrl");
+}
+
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+
+void wxRendererGeneric::DrawTitleBarBitmap(wxWindow * WXUNUSED(win),
+                                           wxDC& WXUNUSED(dc),
+                                           const wxRect& WXUNUSED(rect),
+                                           wxTitleBarButton WXUNUSED(button),
+                                           int WXUNUSED(flags))
+{
+    // no need to fail here, if wxHAS_DRAW_TITLE_BAR_BITMAP is defined this
+    // will be implemented in the native renderer and this version is never
+    // going to be used -- but we still need to define it to allow
+    // instantiation of this class (which would have been pure virtual
+    // otherwise)
+}
+
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
+

 
 // ----------------------------------------------------------------------------
 // A module to allow cleanup of generic renderer.
 
 // ----------------------------------------------------------------------------
 // A module to allow cleanup of generic renderer.