X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7419ba028c7e2d0e585a9b043af587d993da16a7..afebb87be1467f24f4ffe5e8cca2a94acc5248c8:/src/univ/themes/mono.cpp diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp index 68a9864869..4fd27cea1e 100644 --- a/src/univ/themes/mono.cpp +++ b/src/univ/themes/mono.cpp @@ -24,14 +24,18 @@ #pragma hdrstop #endif +#include "wx/univ/theme.h" + +#if wxUSE_THEME_MONO + #ifndef WX_PRECOMP + #include "wx/dc.h" #endif // WX_PRECOMP #include "wx/artprov.h" #include "wx/univ/stdrend.h" #include "wx/univ/inphand.h" #include "wx/univ/colschem.h" -#include "wx/univ/theme.h" class wxMonoColourScheme; @@ -58,6 +62,8 @@ public: int indexAccel = -1, wxRect *rectBounds = NULL); + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); + virtual void DrawButtonBorder(wxDC& dc, const wxRect& rect, int flags = 0, @@ -202,6 +208,12 @@ public: const wxMenu& menu) const; #endif // wxUSE_MENUS +#if wxUSE_STATUSBAR + virtual wxCoord GetStatusBarBorderBetweenFields() const; + + virtual wxSize GetStatusBarFieldMargins() const; +#endif // wxUSE_STATUSBAR + protected: // override base class border drawing routines: we always draw just a // single simple border @@ -231,6 +243,7 @@ protected: { return GetIndicator(IndicatorType_Radio, flags); } virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type); + virtual int GetFrameBorderWidth(int flags) const; private: // the bitmaps returned by GetIndicator() @@ -510,7 +523,7 @@ wxMonoTheme::~wxMonoTheme() { delete m_renderer; delete m_scheme; - wxArtProvider::RemoveProvider(m_artProvider); + delete m_artProvider; } wxRenderer *wxMonoTheme::GetRenderer() @@ -583,10 +596,11 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const case SCROLLBAR: case SCROLLBAR_PRESSED: case GAUGE: - case HIGHLIGHT: case TITLEBAR: case TITLEBAR_ACTIVE: + case HIGHLIGHT_TEXT: case DESKTOP: + case FRAME: return GetBg(); case MAX: @@ -601,9 +615,9 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const case CONTROL_TEXT: case CONTROL_TEXT_DISABLED: case CONTROL_TEXT_DISABLED_SHADOW: - case HIGHLIGHT_TEXT: case TITLEBAR_TEXT: case TITLEBAR_ACTIVE_TEXT: + case HIGHLIGHT: return GetFg(); } @@ -688,6 +702,18 @@ wxMonoRenderer::DrawVerticalLine(wxDC& dc, wxCoord x, wxCoord y1, wxCoord y2) dc.DrawLine(x, y1, x, y2 + 1); } +void wxMonoRenderer::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) +{ + // no need to draw the focus rect for selected items, it would be invisible + // anyhow + if ( !(flags & wxCONTROL_SELECTED) ) + { + dc.SetPen(m_penFg); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRectangle(rect); + } +} + // ---------------------------------------------------------------------------- // label // ---------------------------------------------------------------------------- @@ -701,7 +727,6 @@ void wxMonoRenderer::DrawButtonLabel(wxDC& dc, int indexAccel, wxRect *rectBounds) { - dc.SetTextForeground(m_penFg.GetColour()); dc.DrawLabel(label, image, rect, alignment, indexAccel, rectBounds); if ( flags & wxCONTROL_DISABLED ) @@ -776,18 +801,18 @@ wxBitmap wxMonoRenderer::GetFrameButtonBitmap(FrameButtonType type) #if wxUSE_TOOLBAR -void wxMonoRenderer::DrawToolBarButton(wxDC& dc, - const wxString& label, - const wxBitmap& bitmap, - const wxRect& rect, - int flags, - long style, - int tbarStyle) +void wxMonoRenderer::DrawToolBarButton(wxDC& WXUNUSED(dc), + const wxString& WXUNUSED(label), + const wxBitmap& WXUNUSED(bitmap), + const wxRect& WXUNUSED(rect), + int WXUNUSED(flags), + long WXUNUSED(style), + int WXUNUSED(tbarStyle)) { wxFAIL_MSG(_T("TODO")); } -wxSize wxMonoRenderer::GetToolBarButtonSize(wxCoord *separator) const +wxSize wxMonoRenderer::GetToolBarButtonSize(wxCoord *WXUNUSED(separator)) const { wxFAIL_MSG(_T("TODO")); @@ -809,13 +834,13 @@ wxSize wxMonoRenderer::GetToolBarMargin() const #if wxUSE_NOTEBOOK -void wxMonoRenderer::DrawTab(wxDC& dc, - const wxRect& rect, - wxDirection dir, - const wxString& label, - const wxBitmap& bitmap, - int flags, - int indexAccel) +void wxMonoRenderer::DrawTab(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + wxDirection WXUNUSED(dir), + const wxString& WXUNUSED(label), + const wxBitmap& WXUNUSED(bitmap), + int WXUNUSED(flags), + int WXUNUSED(indexAccel)) { wxFAIL_MSG(_T("TODO")); } @@ -842,10 +867,10 @@ wxSize wxMonoRenderer::GetTabPadding() const #if wxUSE_COMBOBOX -void wxMonoRenderer::GetComboBitmaps(wxBitmap *bmpNormal, - wxBitmap *bmpFocus, - wxBitmap *bmpPressed, - wxBitmap *bmpDisabled) +void wxMonoRenderer::GetComboBitmaps(wxBitmap *WXUNUSED(bmpNormal), + wxBitmap *WXUNUSED(bmpFocus), + wxBitmap *WXUNUSED(bmpPressed), + wxBitmap *WXUNUSED(bmpDisabled)) { wxFAIL_MSG(_T("TODO")); } @@ -858,43 +883,43 @@ void wxMonoRenderer::GetComboBitmaps(wxBitmap *bmpNormal, #if wxUSE_MENUS -void wxMonoRenderer::DrawMenuBarItem(wxDC& dc, - const wxRect& rect, - const wxString& label, - int flags, - int indexAccel) +void wxMonoRenderer::DrawMenuBarItem(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + const wxString& WXUNUSED(label), + int WXUNUSED(flags), + int WXUNUSED(indexAccel)) { wxFAIL_MSG(_T("TODO")); } -void wxMonoRenderer::DrawMenuItem(wxDC& dc, - wxCoord y, - const wxMenuGeometryInfo& geometryInfo, - const wxString& label, - const wxString& accel, - const wxBitmap& bitmap, - int flags, - int indexAccel) +void wxMonoRenderer::DrawMenuItem(wxDC& WXUNUSED(dc), + wxCoord WXUNUSED(y), + const wxMenuGeometryInfo& WXUNUSED(geometryInfo), + const wxString& WXUNUSED(label), + const wxString& WXUNUSED(accel), + const wxBitmap& WXUNUSED(bitmap), + int WXUNUSED(flags), + int WXUNUSED(indexAccel)) { wxFAIL_MSG(_T("TODO")); } -void wxMonoRenderer::DrawMenuSeparator(wxDC& dc, - wxCoord y, - const wxMenuGeometryInfo& geomInfo) +void wxMonoRenderer::DrawMenuSeparator(wxDC& WXUNUSED(dc), + wxCoord WXUNUSED(y), + const wxMenuGeometryInfo& WXUNUSED(geomInfo)) { wxFAIL_MSG(_T("TODO")); } -wxSize wxMonoRenderer::GetMenuBarItemSize(const wxSize& sizeText) const +wxSize wxMonoRenderer::GetMenuBarItemSize(const wxSize& WXUNUSED(sizeText)) const { wxFAIL_MSG(_T("TODO")); return wxSize(); } -wxMenuGeometryInfo *wxMonoRenderer::GetMenuGeometry(wxWindow *win, - const wxMenu& menu) const +wxMenuGeometryInfo *wxMonoRenderer::GetMenuGeometry(wxWindow *WXUNUSED(win), + const wxMenu& WXUNUSED(menu)) const { wxFAIL_MSG(_T("TODO")); @@ -909,36 +934,36 @@ wxMenuGeometryInfo *wxMonoRenderer::GetMenuGeometry(wxWindow *win, #if wxUSE_SLIDER -void wxMonoRenderer::DrawSliderShaft(wxDC& dc, - const wxRect& rect, - int lenThumb, - wxOrientation orient, - int flags, - long style, - wxRect *rectShaft) +void wxMonoRenderer::DrawSliderShaft(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient), + int WXUNUSED(flags), + long WXUNUSED(style), + wxRect *WXUNUSED(rectShaft)) { wxFAIL_MSG(_T("TODO")); } -void wxMonoRenderer::DrawSliderThumb(wxDC& dc, - const wxRect& rect, - wxOrientation orient, - int flags, - long style) +void wxMonoRenderer::DrawSliderThumb(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + wxOrientation WXUNUSED(orient), + int WXUNUSED(flags), + long WXUNUSED(style)) { wxFAIL_MSG(_T("TODO")); } -void wxMonoRenderer::DrawSliderTicks(wxDC& dc, - const wxRect& rect, - int lenThumb, - wxOrientation orient, - int start, - int end, - int step, - int flags, - long style) +void wxMonoRenderer::DrawSliderTicks(wxDC& WXUNUSED(dc), + const wxRect& WXUNUSED(rect), + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient), + int WXUNUSED(start), + int WXUNUSED(end), + int WXUNUSED(step), + int WXUNUSED(flags), + long WXUNUSED(style)) { wxFAIL_MSG(_T("TODO")); } @@ -958,19 +983,19 @@ wxCoord wxMonoRenderer::GetSliderTickLen() const } -wxRect wxMonoRenderer::GetSliderShaftRect(const wxRect& rect, - int lenThumb, - wxOrientation orient, - long style) const +wxRect wxMonoRenderer::GetSliderShaftRect(const wxRect& WXUNUSED(rect), + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient), + long WXUNUSED(style)) const { wxFAIL_MSG(_T("TODO")); return wxRect(); } -wxSize wxMonoRenderer::GetSliderThumbSize(const wxRect& rect, - int lenThumb, - wxOrientation orient) const +wxSize wxMonoRenderer::GetSliderThumbSize(const wxRect& WXUNUSED(rect), + int WXUNUSED(lenThumb), + wxOrientation WXUNUSED(orient)) const { wxFAIL_MSG(_T("TODO")); @@ -1014,7 +1039,18 @@ void wxMonoRenderer::DrawScrollbarThumb(wxDC& dc, const wxRect& rect, int WXUNUSED(flags)) { - DrawSolidRect(dc, wxMONO_FG_COL, rect); + DrawSolidRect(dc, wxMONO_BG_COL, rect); + + // manually draw stipple pattern (wxDFB doesn't implement the wxSTIPPLE + // brush style): + dc.SetPen(m_penFg); + for ( wxCoord y = rect.GetTop(); y <= rect.GetBottom(); y++ ) + { + for ( wxCoord x = rect.GetLeft() + (y % 2); x <= rect.GetRight(); x+=2 ) + { + dc.DrawPoint(x, y); + } + } } void wxMonoRenderer::DrawScrollbarShaft(wxDC& dc, @@ -1025,10 +1061,33 @@ void wxMonoRenderer::DrawScrollbarShaft(wxDC& dc, DrawSolidRect(dc, wxMONO_BG_COL, rect); } +// ---------------------------------------------------------------------------- +// status bar +// ---------------------------------------------------------------------------- + +#if wxUSE_STATUSBAR + +wxCoord wxMonoRenderer::GetStatusBarBorderBetweenFields() const +{ + return 1; +} + +wxSize wxMonoRenderer::GetStatusBarFieldMargins() const +{ + return wxSize(1, 1); +} + +#endif // wxUSE_STATUSBAR + // ---------------------------------------------------------------------------- // top level windows // ---------------------------------------------------------------------------- +int wxMonoRenderer::GetFrameBorderWidth(int WXUNUSED(flags)) const +{ + // all our borders are simple + return 1; +} // ---------------------------------------------------------------------------- // wxMonoArtProvider @@ -1041,3 +1100,4 @@ wxBitmap wxMonoArtProvider::CreateBitmap(const wxArtID& WXUNUSED(id), return wxNullBitmap; } +#endif // wxUSE_THEME_MONO