#pragma hdrstop
#endif
-#if wxUSE_ALL_THEMES || wxUSE_THEME_MONO
+#include "wx/univ/theme.h"
+
+#if wxUSE_THEME_MONO
#ifndef WX_PRECOMP
+ #include "wx/window.h"
#include "wx/dc.h"
#endif // WX_PRECOMP
#include "wx/univ/stdrend.h"
#include "wx/univ/inphand.h"
#include "wx/univ/colschem.h"
-#include "wx/univ/theme.h"
class wxMonoColourScheme;
public:
wxMonoRenderer(const wxColourScheme *scheme);
+ virtual void DrawLabel(wxDC& dc,
+ const wxString& label,
+ const wxRect& rect,
+ int flags = 0,
+ int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+ int indexAccel = -1,
+ wxRect *rectBounds = NULL);
virtual void DrawButtonLabel(wxDC& dc,
const wxString& label,
const wxBitmap& image,
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,
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
}
// doesn't depend on the state
- if ( !col.Ok() )
+ if ( !col.IsOk() )
{
col = GetBg();
}
case TITLEBAR_ACTIVE:
case HIGHLIGHT_TEXT:
case DESKTOP:
+ case FRAME:
return GetBg();
case MAX:
default:
- wxFAIL_MSG(_T("invalid standard colour"));
+ wxFAIL_MSG(wxT("invalid standard colour"));
// fall through
case SHADOW_DARK:
case wxBORDER_STATIC:
case wxBORDER_RAISED:
case wxBORDER_SUNKEN:
+ case wxBORDER_THEME:
width = 1;
break;
-
+ /*
case wxBORDER_DOUBLE:
width = 2;
break;
-
+ */
default:
- wxFAIL_MSG(_T("unknown border type"));
+ wxFAIL_MSG(wxT("unknown border type"));
// fall through
case wxBORDER_DEFAULT:
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
// ----------------------------------------------------------------------------
+void wxMonoRenderer::DrawLabel(wxDC& dc,
+ const wxString& label,
+ const wxRect& rect,
+ int WXUNUSED(flags),
+ int alignment,
+ int indexAccel,
+ wxRect *rectBounds)
+{
+ dc.DrawLabel(label, wxNullBitmap, rect, alignment, indexAccel, rectBounds);
+}
+
void wxMonoRenderer::DrawButtonLabel(wxDC& dc,
const wxString& label,
const wxBitmap& image,
int indexAccel,
wxRect *rectBounds)
{
- dc.SetTextForeground(m_penFg.GetColour());
dc.DrawLabel(label, image, rect, alignment, indexAccel, rectBounds);
if ( flags & wxCONTROL_DISABLED )
GetIndicatorsFromFlags(flags, indState, indStatus);
wxBitmap& bmp = m_bmpIndicators[indType][indState][indStatus];
- if ( !bmp.Ok() )
+ if ( !bmp.IsOk() )
{
const char **xpm = ms_xpmIndicators[indType][indState][indStatus];
if ( xpm )
{
if ( type == FrameButton_Close )
{
- if ( !m_bmpFrameClose.Ok() )
+ if ( !m_bmpFrameClose.IsOk() )
{
static const char *xpmFrameClose[] = {
/* columns rows colors chars-per-pixel */
#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"));
+ wxFAIL_MSG(wxT("TODO"));
}
-wxSize wxMonoRenderer::GetToolBarButtonSize(wxCoord *separator) const
+wxSize wxMonoRenderer::GetToolBarButtonSize(wxCoord *WXUNUSED(separator)) const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return wxSize();
}
wxSize wxMonoRenderer::GetToolBarMargin() const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return wxSize();
}
#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"));
+ wxFAIL_MSG(wxT("TODO"));
}
wxSize wxMonoRenderer::GetTabIndent() const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return wxSize();
}
wxSize wxMonoRenderer::GetTabPadding() const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return wxSize();
}
#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"));
+ wxFAIL_MSG(wxT("TODO"));
}
#endif // wxUSE_COMBOBOX
#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"));
+ wxFAIL_MSG(wxT("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"));
+ wxFAIL_MSG(wxT("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"));
+ wxFAIL_MSG(wxT("TODO"));
}
-wxSize wxMonoRenderer::GetMenuBarItemSize(const wxSize& sizeText) const
+wxSize wxMonoRenderer::GetMenuBarItemSize(const wxSize& WXUNUSED(sizeText)) const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("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"));
+ wxFAIL_MSG(wxT("TODO"));
return NULL;
}
#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"));
+ wxFAIL_MSG(wxT("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"));
+ wxFAIL_MSG(wxT("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"));
+ wxFAIL_MSG(wxT("TODO"));
}
wxCoord wxMonoRenderer::GetSliderDim() const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return 0;
}
wxCoord wxMonoRenderer::GetSliderTickLen() const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return 0;
}
-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"));
+ wxFAIL_MSG(wxT("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"));
+ wxFAIL_MSG(wxT("TODO"));
return wxSize();
}
wxSize wxMonoRenderer::GetProgressBarStep() const
{
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
return wxSize();
}
int WXUNUSED(flags))
{
ArrowDirection arrowDir = GetArrowDirection(dir);
- wxCHECK_RET( arrowDir != Arrow_Max, _T("invalid arrow direction") );
+ wxCHECK_RET( arrowDir != Arrow_Max, wxT("invalid arrow direction") );
wxBitmap& bmp = m_bmpArrows[arrowDir];
- if ( !bmp.Ok() )
+ if ( !bmp.IsOk() )
{
bmp = wxBitmap(ms_xpmArrows[arrowDir]);
}
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,
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
// ----------------------------------------------------------------------------
return wxNullBitmap;
}
-#endif // wxUSE_ALL_THEMES || wxUSE_THEME_MONO
+#endif // wxUSE_THEME_MONO
projects / wxWidgets.git / blobdiff