Cleanup of previous fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 15f5469bb490551669da9031d1983913637d4b9a..83fd6e1aae7c77d041a6e7a02e5fc5c5ea6a511d 100644 (file)
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -70,7 +70,7 @@ protected:
     void Refresh();
 
     // draw the caret on the given DC
     void Refresh();
 
     // draw the caret on the given DC

-    void DoDraw(wxDC *dc);
+    void DoDraw(wxDC *dc, wxWindow* win);

 
 private:
     // GTK specific initialization
 
 private:
     // GTK specific initialization

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index cf90f5985161a70d9840513f67cea46c3e86f849..6fb06d61a372f84b9fdd17f9edb263481b9ef866 100644 (file)
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -225,7 +225,7 @@ void wxCaret::Refresh()
     }
     else
     {
     }
     else
     {

-        DoDraw( &dcWin );
+        DoDraw( &dcWin, GetWindow() );

     }
 #else
     wxMemoryDC dcMem;
     }
 #else
     wxMemoryDC dcMem;


@@ -261,44 +261,28 @@ void wxCaret::Refresh()
         //      more
 
         // and draw the caret there
         //      more
 
         // and draw the caret there

-        DoDraw(&dcWin);
+        DoDraw(&dcWin, GetWindow());

     }
 #endif
 }
 
     }
 #endif
 }
 

-void wxCaret::DoDraw(wxDC *dc)
+void wxCaret::DoDraw(wxDC *dc, wxWindow* win)

 {
 {

-#if defined(__WXGTK__) || defined(__WXMAC__)
-    wxClientDC* clientDC = wxDynamicCast(dc, wxClientDC);
-    if (clientDC)
+    wxPen pen(*wxBLACK_PEN);
+    wxBrush brush(*wxBLACK_BRUSH);
+    if (win)

     {
     {

-        wxPen pen(*wxBLACK_PEN);
-        wxBrush brush(*wxBLACK_BRUSH);
-#ifdef __WXGTK__
-        wxWindow* win = clientDC->m_owner;
-#else
-        wxWindow* win = clientDC->GetWindow();
-#endif
-        if (win)
+        wxColour backgroundColour(win->GetBackgroundColour());
+        if (backgroundColour.Red() < 100 &&
+            backgroundColour.Green() < 100 &&
+            backgroundColour.Blue() < 100)

         {
         {

-            wxColour backgroundColour(win->GetBackgroundColour());
-            if (backgroundColour.Red() < 100 &&
-                backgroundColour.Green() < 100 &&
-                backgroundColour.Blue() < 100)
-            {
-                pen = *wxWHITE_PEN;
-                brush = *wxWHITE_BRUSH;
-            }
+            pen = *wxWHITE_PEN;
+            brush = *wxWHITE_BRUSH;

         }
         }

-        dc->SetPen( pen );
-        dc->SetBrush(m_hasFocus ? brush : *wxTRANSPARENT_BRUSH);
-    }
-    else
-#endif
-    {
-        dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
-        dc->SetPen(*wxBLACK_PEN);

     }
     }

+    dc->SetPen( pen );
+    dc->SetBrush(m_hasFocus ? brush : *wxTRANSPARENT_BRUSH);

 
     // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
     //     done under wxGTK - no idea why
 
     // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
     //     done under wxGTK - no idea why