Add doc for wxGraphicsContext.Create(), which is a lightweight context with no target...

[wxWidgets.git] / src / univ / themes / mono.cpp

diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp
index cbdfe6da7ca5ef2112f8b60695fd4b79fe2cba05..7719bfa1862e467a7799fdb15dbc4acc16960317 100644 (file)
--- a/src/univ/themes/mono.cpp
+++ b/src/univ/themes/mono.cpp
@@ -24,14 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/univ/theme.h"
+
+#if wxUSE_THEME_MONO
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/window.h"
+    #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"
 #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;
 
 
 class wxMonoColourScheme;
 


@@ -49,6 +54,13 @@ class wxMonoRenderer : public wxStdRenderer
 public:
     wxMonoRenderer(const wxColourScheme *scheme);
 
 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,
     virtual void DrawButtonLabel(wxDC& dc,
                                  const wxString& label,
                                  const wxBitmap& image,


@@ -58,11 +70,7 @@ public:
                                  int indexAccel = -1,
                                  wxRect *rectBounds = NULL);
 
                                  int indexAccel = -1,
                                  wxRect *rectBounds = NULL);
 

-    virtual void DrawBorder(wxDC& dc,
-                            wxBorder border,
-                            const wxRect& rect,
-                            int flags = 0,
-                            wxRect *rectIn = NULL);
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);

 
     virtual void DrawButtonBorder(wxDC& dc,
                                   const wxRect& rect,
 
     virtual void DrawButtonBorder(wxDC& dc,
                                   const wxRect& rect,


@@ -155,38 +163,6 @@ public:
                                    const wxMenuGeometryInfo& geomInfo);
 #endif // wxUSE_MENUS
 
                                    const wxMenuGeometryInfo& geomInfo);
 #endif // wxUSE_MENUS
 

-    virtual void DrawFrameTitleBar(wxDC& dc,
-                                   const wxRect& rect,
-                                   const wxString& title,
-                                   const wxIcon& icon,
-                                   int flags,
-                                   int specialButton = 0,
-                                   int specialButtonFlags = 0);
-
-    virtual void DrawFrameBorder(wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags);
-
-    virtual void DrawFrameBackground(wxDC& dc,
-                                     const wxRect& rect,
-                                     int flags);
-
-    virtual void DrawFrameTitle(wxDC& dc,
-                                const wxRect& rect,
-                                const wxString& title,
-                                int flags);
-
-    virtual void DrawFrameIcon(wxDC& dc,
-                               const wxRect& rect,
-                               const wxIcon& icon,
-                               int flags);
-
-    virtual void DrawFrameButton(wxDC& dc,
-                                 wxCoord x, wxCoord y,
-                                 int button,
-                                 int flags = 0);
-
-

 #if wxUSE_COMBOBOX
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
                                  wxBitmap *bmpFocus,
 #if wxUSE_COMBOBOX
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
                                  wxBitmap *bmpFocus,


@@ -240,17 +216,11 @@ public:
                                                 const wxMenu& menu) const;
 #endif // wxUSE_MENUS
 
                                                 const wxMenu& menu) const;
 #endif // wxUSE_MENUS
 

-    virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const;
-
-    virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const;
-
-    virtual wxSize GetFrameMinSize(int flags) const;
-
-    virtual wxSize GetFrameIconSize() const;
+#if wxUSE_STATUSBAR
+    virtual wxCoord GetStatusBarBorderBetweenFields() const;

 
 

-    virtual int HitTestFrame(const wxRect& rect,
-                             const wxPoint& pt,
-                             int flags = 0) const;
+    virtual wxSize GetStatusBarFieldMargins() const;
+#endif // wxUSE_STATUSBAR

 
 protected:
     // override base class border drawing routines: we always draw just a
 
 protected:
     // override base class border drawing routines: we always draw just a


@@ -264,8 +234,12 @@ protected:
         { DrawSimpleBorder(dc, rect); }
     virtual void DrawAntiSunkenBorder(wxDC& dc, wxRect *rect)
         { DrawSimpleBorder(dc, rect); }
         { DrawSimpleBorder(dc, rect); }
     virtual void DrawAntiSunkenBorder(wxDC& dc, wxRect *rect)
         { DrawSimpleBorder(dc, rect); }

-    virtual void DrawFrameBorder(wxDC& dc, wxRect *rect)
+    virtual void DrawBoxBorder(wxDC& dc, wxRect *rect)

         { DrawSimpleBorder(dc, rect); }
         { DrawSimpleBorder(dc, rect); }

+    virtual void DrawStaticBorder(wxDC& dc, wxRect *rect)
+        { DrawSimpleBorder(dc, rect); }
+    virtual void DrawExtraBorder(wxDC& WXUNUSED(dc), wxRect * WXUNUSED(rect))
+        { /* no extra borders for us */ }

 
     // all our XPMs are of this size
     static wxSize GetStdBmpSize() { return wxSize(8, 8); }
 
     // all our XPMs are of this size
     static wxSize GetStdBmpSize() { return wxSize(8, 8); }


@@ -276,6 +250,9 @@ protected:
     virtual wxBitmap GetRadioBitmap(int flags)
         { return GetIndicator(IndicatorType_Radio, flags); }
 
     virtual wxBitmap GetRadioBitmap(int flags)
         { return GetIndicator(IndicatorType_Radio, flags); }
 

+    virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type);
+    virtual int GetFrameBorderWidth(int flags) const;
+

 private:
     // the bitmaps returned by GetIndicator()
     wxBitmap m_bmpIndicators[IndicatorType_MaxCtrl]
 private:
     // the bitmaps returned by GetIndicator()
     wxBitmap m_bmpIndicators[IndicatorType_MaxCtrl]


@@ -291,6 +268,9 @@ private:
 
     static const char **ms_xpmArrows[Arrow_Max];
 
 
     static const char **ms_xpmArrows[Arrow_Max];
 

+    // the close bitmap for the frame for GetFrameButtonBitmap()
+    wxBitmap m_bmpFrameClose;
+

     // pen used for foreground drawing
     wxPen m_penFg;
 };
     // pen used for foreground drawing
     wxPen m_penFg;
 };


@@ -551,7 +531,7 @@ wxMonoTheme::~wxMonoTheme()
 {
     delete m_renderer;
     delete m_scheme;
 {
     delete m_renderer;
     delete m_scheme;

-    wxArtProvider::RemoveProvider(m_artProvider);
+    delete m_artProvider;

 }
 
 wxRenderer *wxMonoTheme::GetRenderer()
 }
 
 wxRenderer *wxMonoTheme::GetRenderer()


@@ -605,7 +585,7 @@ wxColour wxMonoColourScheme::GetBackground(wxWindow *win) const
     }
 
     // doesn't depend on the state
     }
 
     // doesn't depend on the state

-    if ( !col.Ok() )
+    if ( !col.IsOk() )

     {
         col = GetBg();
     }
     {
         col = GetBg();
     }


@@ -624,15 +604,16 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const
         case SCROLLBAR:
         case SCROLLBAR_PRESSED:
         case GAUGE:
         case SCROLLBAR:
         case SCROLLBAR_PRESSED:
         case GAUGE:

-        case HIGHLIGHT:

         case TITLEBAR:
         case TITLEBAR_ACTIVE:
         case TITLEBAR:
         case TITLEBAR_ACTIVE:

+        case HIGHLIGHT_TEXT:

         case DESKTOP:
         case DESKTOP:

+        case FRAME:

             return GetBg();
 
         case MAX:
         default:
             return GetBg();
 
         case MAX:
         default:

-            wxFAIL_MSG(_T("invalid standard colour"));
+            wxFAIL_MSG(wxT("invalid standard colour"));

             // fall through
 
         case SHADOW_DARK:
             // fall through
 
         case SHADOW_DARK:


@@ -642,9 +623,9 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const
         case CONTROL_TEXT:
         case CONTROL_TEXT_DISABLED:
         case CONTROL_TEXT_DISABLED_SHADOW:
         case CONTROL_TEXT:
         case CONTROL_TEXT_DISABLED:
         case CONTROL_TEXT_DISABLED_SHADOW:

-        case HIGHLIGHT_TEXT:

         case TITLEBAR_TEXT:
         case TITLEBAR_ACTIVE_TEXT:
         case TITLEBAR_TEXT:
         case TITLEBAR_ACTIVE_TEXT:

+        case HIGHLIGHT:

             return GetFg();
 
     }
             return GetFg();
 
     }


@@ -677,15 +658,16 @@ wxRect wxMonoRenderer::GetBorderDimensions(wxBorder border) const
         case wxBORDER_STATIC:
         case wxBORDER_RAISED:
         case wxBORDER_SUNKEN:
         case wxBORDER_STATIC:
         case wxBORDER_RAISED:
         case wxBORDER_SUNKEN:

+        case wxBORDER_THEME:

             width = 1;
             break;
             width = 1;
             break;

-
+  /*

         case wxBORDER_DOUBLE:
             width = 2;
             break;
         case wxBORDER_DOUBLE:
             width = 2;
             break;

-
+   */

         default:
         default:

-            wxFAIL_MSG(_T("unknown border type"));
+            wxFAIL_MSG(wxT("unknown border type"));

             // fall through
 
         case wxBORDER_DEFAULT:
             // fall through
 
         case wxBORDER_DEFAULT:


@@ -703,40 +685,6 @@ wxRect wxMonoRenderer::GetBorderDimensions(wxBorder border) const
     return rect;
 }
 
     return rect;
 }
 

-void wxMonoRenderer::DrawBorder(wxDC& dc,
-                                wxBorder border,
-                                const wxRect& rectTotal,
-                                int WXUNUSED(flags),
-                                wxRect *rectIn)
-{
-    wxRect rect = rectTotal;
-
-    switch ( border )
-    {
-        case wxBORDER_DOUBLE:
-            DrawSimpleBorder(dc, &rect);
-            // fall through
-
-        case wxBORDER_SUNKEN:
-        case wxBORDER_STATIC:
-        case wxBORDER_RAISED:
-        case wxBORDER_SIMPLE:
-            DrawSimpleBorder(dc, &rect);
-            break;
-
-        default:
-            wxFAIL_MSG(_T("unknown border type"));
-            // fall through
-
-        case wxBORDER_DEFAULT:
-        case wxBORDER_NONE:
-            break;
-    }
-
-    if ( rectIn )
-        *rectIn = rect;
-}
-

 void wxMonoRenderer::DrawButtonBorder(wxDC& dc,
                                      const wxRect& rect,
                                      int flags,
 void wxMonoRenderer::DrawButtonBorder(wxDC& dc,
                                      const wxRect& rect,
                                      int flags,


@@ -763,10 +711,33 @@ wxMonoRenderer::DrawVerticalLine(wxDC& dc, wxCoord x, wxCoord y1, wxCoord y2)
     dc.DrawLine(x, y1, x, y2 + 1);
 }
 
     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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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,
 void wxMonoRenderer::DrawButtonLabel(wxDC& dc,
                                      const wxString& label,
                                      const wxBitmap& image,


@@ -776,7 +747,6 @@ void wxMonoRenderer::DrawButtonLabel(wxDC& dc,
                                      int indexAccel,
                                      wxRect *rectBounds)
 {
                                      int indexAccel,
                                      wxRect *rectBounds)
 {

-    dc.SetTextForeground(m_penFg.GetColour());

     dc.DrawLabel(label, image, rect, alignment, indexAccel, rectBounds);
 
     if ( flags & wxCONTROL_DISABLED )
     dc.DrawLabel(label, image, rect, alignment, indexAccel, rectBounds);
 
     if ( flags & wxCONTROL_DISABLED )


@@ -790,7 +760,7 @@ void wxMonoRenderer::DrawButtonLabel(wxDC& dc,
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// check/radion buttons
+// bitmaps

 // ----------------------------------------------------------------------------
 
 wxBitmap wxMonoRenderer::GetIndicator(IndicatorType indType, int flags)
 // ----------------------------------------------------------------------------
 
 wxBitmap wxMonoRenderer::GetIndicator(IndicatorType indType, int flags)


@@ -800,7 +770,7 @@ wxBitmap wxMonoRenderer::GetIndicator(IndicatorType indType, int flags)
     GetIndicatorsFromFlags(flags, indState, indStatus);
 
     wxBitmap& bmp = m_bmpIndicators[indType][indState][indStatus];
     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 )
     {
         const char **xpm = ms_xpmIndicators[indType][indState][indStatus];
         if ( xpm )


@@ -813,33 +783,65 @@ wxBitmap wxMonoRenderer::GetIndicator(IndicatorType indType, int flags)
     return bmp;
 }
 
     return bmp;
 }
 

+wxBitmap wxMonoRenderer::GetFrameButtonBitmap(FrameButtonType type)
+{
+    if ( type == FrameButton_Close )
+    {
+        if ( !m_bmpFrameClose.IsOk() )
+        {
+            static const char *xpmFrameClose[] = {
+            /* columns rows colors chars-per-pixel */
+            "8 8 2 1",
+            "  c white",
+            "X c black",
+            /* pixels */
+            "        ",
+            " XX  XX ",
+            "  X  X  ",
+            "   XX   ",
+            "   XX   ",
+            "  X  X  ",
+            " XX  XX ",
+            "        ",
+            };
+
+            m_bmpFrameClose = wxBitmap(xpmFrameClose);
+        }
+
+        return m_bmpFrameClose;
+    }
+
+    // we don't show any other buttons than close
+    return wxNullBitmap;
+}
+

 // ----------------------------------------------------------------------------
 // toolbar
 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // toolbar
 // ----------------------------------------------------------------------------
 
 #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
 {
 
     return wxSize();
 }
 
 wxSize wxMonoRenderer::GetToolBarMargin() const
 {

-    wxFAIL_MSG(_T("TODO"));
+    wxFAIL_MSG(wxT("TODO"));

 
     return wxSize();
 }
 
     return wxSize();
 }


@@ -852,27 +854,27 @@ wxSize wxMonoRenderer::GetToolBarMargin() const
 
 #if wxUSE_NOTEBOOK
 
 
 #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
 {
 }
 
 wxSize wxMonoRenderer::GetTabIndent() const
 {

-    wxFAIL_MSG(_T("TODO"));
+    wxFAIL_MSG(wxT("TODO"));

 
     return wxSize();
 }
 
 wxSize wxMonoRenderer::GetTabPadding() const
 {
 
     return wxSize();
 }
 
 wxSize wxMonoRenderer::GetTabPadding() const
 {

-    wxFAIL_MSG(_T("TODO"));
+    wxFAIL_MSG(wxT("TODO"));

 
     return wxSize();
 }
 
     return wxSize();
 }


@@ -885,12 +887,12 @@ wxSize wxMonoRenderer::GetTabPadding() const
 
 #if wxUSE_COMBOBOX
 
 
 #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
 }
 
 #endif // wxUSE_COMBOBOX


@@ -901,45 +903,45 @@ void wxMonoRenderer::GetComboBitmaps(wxBitmap *bmpNormal,
 
 #if wxUSE_MENUS
 
 
 #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();
 }
 
 
     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;
 }
 
     return NULL;
 }


@@ -952,70 +954,70 @@ wxMenuGeometryInfo *wxMonoRenderer::GetMenuGeometry(wxWindow *win,
 
 #if wxUSE_SLIDER
 
 
 #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
 {
 }
 
 wxCoord wxMonoRenderer::GetSliderDim() const
 {

-    wxFAIL_MSG(_T("TODO"));
+    wxFAIL_MSG(wxT("TODO"));

 
     return 0;
 }
 
 wxCoord wxMonoRenderer::GetSliderTickLen() const
 {
 
     return 0;
 }
 
 wxCoord wxMonoRenderer::GetSliderTickLen() const
 {

-    wxFAIL_MSG(_T("TODO"));
+    wxFAIL_MSG(wxT("TODO"));

 
     return 0;
 }
 
 
 
     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();
 }
 
 
     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();
 }
 
     return wxSize();
 }


@@ -1024,7 +1026,7 @@ wxSize wxMonoRenderer::GetSliderThumbSize(const wxRect& rect,
 
 wxSize wxMonoRenderer::GetProgressBarStep() const
 {
 
 wxSize wxMonoRenderer::GetProgressBarStep() const
 {

-    wxFAIL_MSG(_T("TODO"));
+    wxFAIL_MSG(wxT("TODO"));

 
     return wxSize();
 }
 
     return wxSize();
 }


@@ -1040,10 +1042,10 @@ void wxMonoRenderer::DrawArrow(wxDC& dc,
                                int WXUNUSED(flags))
 {
     ArrowDirection arrowDir = GetArrowDirection(dir);
                                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];
 
     wxBitmap& bmp = m_bmpArrows[arrowDir];

-    if ( !bmp.Ok() )
+    if ( !bmp.IsOk() )

     {
         bmp = wxBitmap(ms_xpmArrows[arrowDir]);
     }
     {
         bmp = wxBitmap(ms_xpmArrows[arrowDir]);
     }


@@ -1057,7 +1059,18 @@ void wxMonoRenderer::DrawScrollbarThumb(wxDC& dc,
                                         const wxRect& rect,
                                         int WXUNUSED(flags))
 {
                                         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,
 }
 
 void wxMonoRenderer::DrawScrollbarShaft(wxDC& dc,


@@ -1069,86 +1082,33 @@ void wxMonoRenderer::DrawScrollbarShaft(wxDC& dc,
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// top level windows
+// status bar

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxMonoRenderer::DrawFrameTitleBar(wxDC& WXUNUSED(dc),
-                                      const wxRect& WXUNUSED(rect),
-                                      const wxString& WXUNUSED(title),
-                                      const wxIcon& WXUNUSED(icon),
-                                      int WXUNUSED(flags),
-                                      int WXUNUSED(specialButton),
-                                      int WXUNUSED(specialButtonFlag))
-{
-}
-
-void wxMonoRenderer::DrawFrameBorder(wxDC& WXUNUSED(dc),
-                                    const wxRect& WXUNUSED(rect),
-                                    int WXUNUSED(flags))
-{
-}
-
-void wxMonoRenderer::DrawFrameBackground(wxDC& WXUNUSED(dc),
-                                        const wxRect& WXUNUSED(rect),
-                                        int WXUNUSED(flags))
-{
-}
-
-void wxMonoRenderer::DrawFrameTitle(wxDC& WXUNUSED(dc),
-                                   const wxRect& WXUNUSED(rect),
-                                   const wxString& WXUNUSED(title),
-                                   int WXUNUSED(flags))
-{
-}
-
-void wxMonoRenderer::DrawFrameIcon(wxDC& WXUNUSED(dc),
-                                  const wxRect& WXUNUSED(rect),
-                                  const wxIcon& WXUNUSED(icon),
-                                  int WXUNUSED(flags))
-{
-}
+#if wxUSE_STATUSBAR

 
 

-void wxMonoRenderer::DrawFrameButton(wxDC& WXUNUSED(dc),
-                                    wxCoord WXUNUSED(x),
-                                    wxCoord WXUNUSED(y),
-                                    int WXUNUSED(button),
-                                    int WXUNUSED(flags))
+wxCoord wxMonoRenderer::GetStatusBarBorderBetweenFields() const

 {
 {

+    return 1;

 }
 
 }
 

-wxRect
-wxMonoRenderer::GetFrameClientArea(const wxRect& rect,
-                                  int WXUNUSED(flags)) const
+wxSize wxMonoRenderer::GetStatusBarFieldMargins() const

 {
 {

-    return rect;
+    return wxSize(1, 1);

 }
 
 }
 

-wxSize
-wxMonoRenderer::GetFrameTotalSize(const wxSize& clientSize,
-                                 int WXUNUSED(flags)) const
-{
-    return clientSize;
-}
-
-wxSize wxMonoRenderer::GetFrameMinSize(int WXUNUSED(flags)) const
-{
-    return wxSize(0,0);
-}
+#endif // wxUSE_STATUSBAR

 
 

-wxSize wxMonoRenderer::GetFrameIconSize() const
-{
-    return wxSize(wxDefaultCoord, wxDefaultCoord);
-}
+// ----------------------------------------------------------------------------
+// top level windows
+// ----------------------------------------------------------------------------

 
 

-int
-wxMonoRenderer::HitTestFrame(const wxRect& WXUNUSED(rect),
-                            const wxPoint& WXUNUSED(pt),
-                            int WXUNUSED(flags)) const
+int wxMonoRenderer::GetFrameBorderWidth(int WXUNUSED(flags)) const

 {
 {

-    return wxHT_TOPLEVEL_CLIENT_AREA;
+    // all our borders are simple
+    return 1;

 }
 
 }
 

-

 // ----------------------------------------------------------------------------
 // wxMonoArtProvider
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMonoArtProvider
 // ----------------------------------------------------------------------------


@@ -1160,3 +1120,4 @@ wxBitmap wxMonoArtProvider::CreateBitmap(const wxArtID& WXUNUSED(id),
     return wxNullBitmap;
 }
 
     return wxNullBitmap;
 }
 

+#endif // wxUSE_THEME_MONO