X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2125bdc32ec2f09fa19433e0ee96b7a3845b69e..9b49405777342458dc1666001865eef7309b6c30:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 7c07f55ff1..4fcd52f56f 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -37,6 +37,10 @@ #include "wx/splitter.h" #include "wx/dcmirror.h" +#ifdef __WXMAC__ + #include "wx/osx/private.h" +#endif + // ---------------------------------------------------------------------------- // wxRendererGeneric: our wxRendererNative implementation // ---------------------------------------------------------------------------- @@ -94,6 +98,8 @@ public: const wxRect& rect, int flags = 0); + virtual wxSize GetCheckBoxSize(wxWindow *win); + virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -106,6 +112,14 @@ 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 DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); virtual wxRendererVersion GetVersion() const @@ -214,8 +228,6 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win, wxHeaderSortIconType sortArrow, wxHeaderButtonParams* params) { - const int CORNER = 1; - const wxCoord x = rect.x, y = rect.y, w = rect.width, @@ -228,18 +240,16 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win, 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.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.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); } @@ -314,13 +324,42 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, 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; labelWidth += bmpWidth + 2*margin; + // 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(); + + x = margin + rect.x; + y = rect.y + wxMax(1, (rect.height - h) / 2); + + if (params->m_labelText.empty()) + { + // use the alignment flags + 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); + break; + case wxALIGN_RIGHT: + x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w); + break; + } + } + dc.DrawBitmap(params->m_labelBitmap, x, y, true); + } + // Draw a label if one is given if ( params && !params->m_labelText.empty() ) { @@ -333,12 +372,15 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, dc.SetFont(font); dc.SetTextForeground(clr); - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); int tw, th, td, x, y; dc.GetTextExtent( label, &tw, &th, &td); labelWidth += tw; y = rect.y + wxMax(0, (rect.height - (th+td)) / 2); +#ifdef __WXGTK__ + y += 2; // No idea why. +#endif // truncate and add an ellipsis (...) if the text is too wide. int targetWidth = rect.width - arrowSpace - bmpWidth - 2*margin; @@ -368,42 +410,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, 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 ) - { - x = txtEnd; - } - // otherwise use the alignment flags - else - { - 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); - break; - case wxALIGN_RIGHT: - x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w); - break; - } - } - dc.DrawBitmap(params->m_labelBitmap, x, y, true); + dc.DrawText(label, x + bmpWidth, y); } return labelWidth; } @@ -618,6 +625,11 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), } } +wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win)) +{ + return wxSize(16, 16); +} + void wxRendererGeneric::DrawPushButton(wxWindow *win, wxDC& dc, @@ -635,10 +647,17 @@ 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 ) @@ -658,7 +677,14 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), } 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 ); } @@ -705,6 +731,33 @@ 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::DrawRadioButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) +{ + wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioButton"); +} + +void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) +{ + wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawTextCtrl"); +} + + + + // ---------------------------------------------------------------------------- // A module to allow cleanup of generic renderer. // ----------------------------------------------------------------------------