fix for crash under wxX11: we get text event there when m_popup is still NULL

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

diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp
index 58fa6ac55183be0fcd8c5f29ed63994733d1e9a5..45079a1384fb51e7cd94b1d2c7dbd01ea787c2dc 100644 (file)
--- a/src/univ/themes/mono.cpp
+++ b/src/univ/themes/mono.cpp
@@ -62,7 +62,7 @@ public:
                                  int indexAccel = -1,
                                  wxRect *rectBounds = NULL);
 
                                  int indexAccel = -1,
                                  wxRect *rectBounds = NULL);
 

-    virtual void DrawFocusRect(wxDC& dc, const wxRect& rect, int flags = 0);
+    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,


@@ -600,6 +600,7 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const
         case TITLEBAR_ACTIVE:
         case HIGHLIGHT_TEXT:
         case DESKTOP:
         case TITLEBAR_ACTIVE:
         case HIGHLIGHT_TEXT:
         case DESKTOP:

+        case FRAME:

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


@@ -649,13 +650,14 @@ 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:
             wxFAIL_MSG(_T("unknown border type"));
             // fall through
         default:
             wxFAIL_MSG(_T("unknown border type"));
             // fall through


@@ -701,7 +703,7 @@ 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(wxDC& dc, const wxRect& rect, int flags)
+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
 {
     // no need to draw the focus rect for selected items, it would be invisible
     // anyhow


@@ -726,7 +728,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 )


@@ -1039,7 +1040,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,