X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/530a427a4c33986eb452b0c8b711823d147f499a..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/generic/renderg.cpp?ds=inline diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 0a8193808b..0601a60f38 100644 --- 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 -// License: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -32,6 +32,7 @@ #include "wx/settings.h" #include "wx/gdicmn.h" #include "wx/module.h" + #include "wx/control.h" #endif //WX_PRECOMP #include "wx/splitter.h" @@ -66,6 +67,8 @@ public: virtual int GetHeaderButtonHeight(wxWindow *win); + virtual int GetHeaderButtonMargin(wxWindow *win); + virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -112,6 +115,22 @@ public: 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 @@ -166,10 +185,7 @@ wxRendererNative& wxRendererNative::GetGeneric() void wxRendererGeneric::Cleanup() { - if (sm_rendererGeneric) - delete sm_rendererGeneric; - - sm_rendererGeneric = NULL; + wxDELETE(sm_rendererGeneric); } wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL; @@ -265,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; - 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); @@ -306,29 +322,66 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, 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); - dc.SetPen(wxPen(c)); - dc.SetBrush(wxBrush(c)); + + wxDCPenChanger setPen(dc, c); + wxDCBrushChanger setBrush(dc, c); + + wxDCClipper clip(dc, rect); dc.DrawPolygon( 3, triPt, ar.x, ar.y); } labelWidth += arrowSpace; - const int margin = 5; // number of pixels to reserve on either side of the label int bmpWidth = 0; - int txtEnd = 0; - if ( params && params->m_labelBitmap.Ok() ) - bmpWidth = params->m_labelBitmap.GetWidth() + 2; + // 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; - labelWidth += bmpWidth + 2*margin; + 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() ) { - 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(); - wxColour clr = params->m_labelColour.Ok() ? + wxColour clr = params->m_labelColour.IsOk() ? params->m_labelColour : win->GetForegroundColour(); wxString label( params->m_labelText ); @@ -337,76 +390,48 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, dc.SetTextForeground(clr); dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - int tw, th, td, x, y; + int 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; - } + int x = rect.x + bmpWidth + margin; + const int y = rect.y + wxMax(0, (rect.height - (th+td)) / 2); - 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; - } - - // 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: - x = rect.x + margin; break; + case wxALIGN_CENTER: - x = rect.x + wxMax(1, (rect.width - arrowSpace - w)/2); + x += (availWidth - tw)/2; break; + case wxALIGN_RIGHT: - x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w); + x += availWidth - tw; break; } } - dc.DrawBitmap(params->m_labelBitmap, x, y, true); + + dc.DrawText(label, x, y); + + labelWidth += tw; } + return labelWidth; } @@ -424,6 +449,11 @@ int wxRendererGeneric::GetHeaderButtonHeight(wxWindow *win) return h + d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT; } +int wxRendererGeneric::GetHeaderButtonMargin(wxWindow *WXUNUSED(win)) +{ + return 5; +} + // draw the plus or minus sign void @@ -642,17 +672,10 @@ wxRendererGeneric::DrawPushButton(wxWindow *win, } void -#ifdef __WXMAC__ wxRendererGeneric::DrawItemSelectionRect(wxWindow * win, wxDC& dc, const wxRect& rect, int flags) -#else -wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) -#endif { wxBrush brush; if ( flags & wxCONTROL_SELECTED ) @@ -682,6 +705,9 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), dc.SetPen( *wxTRANSPARENT_PEN ); dc.DrawRectangle( rect ); + + // it's unused everywhere except in wxOSX/Carbon + wxUnusedVar(win); } void @@ -726,6 +752,48 @@ wxRendererGeneric::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect 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. // ----------------------------------------------------------------------------