Fix assert in Simple Preferences: use window foreground color for CTransparentStaticLine if skin does not specify <static_line_color>

checkin_notes

@@ -6222,11 +6222,13 @@ Charlie 25 Oct 2012
     - Mac: Eliminate some unnecessary code.
     - Mac: Fix Quit command in Simple View and a crash bug with Quit AppleEvent.
     - Fix a bad FlexGridSizer in Simple Preferences dialog which caused assert.
-    
+    - Fix assert in Simple Preferences: use window foreground color for 
+        CTransparentStaticLine if skin does not specify <static_line_color>.
+
     clientgui/
         BOINCGUIApp.cpp
         DlgEventLog.cpp
         mac/
             MacBitmapComboBox.cpp,.h
         sg_CustomControls.cpp,.h
-        sg_DlgPreferences.cpp
+        sg_DlgPreferences.cpp

clientgui/sg_CustomControls.cpp

@@ -43,13 +43,14 @@ bool CTransparentStaticLine::Create(wxWindow* parent, wxWindowID id, const wxPoi
     SetBackgroundColour(parent->GetBackgroundColour());
     SetBackgroundStyle(wxBG_STYLE_COLOUR);
     SetForegroundColour(parent->GetForegroundColour());
+    SetLineColor(GetForegroundColour());
 
     return bRetVal;
 }
 
 
 void CTransparentStaticLine::OnPaint(wxPaintEvent& /*event*/) {
-    wxPaintDC dc(this); 
+    wxPaintDC dc(this);
     wxPen pen = wxPen(GetLineColor(), 1);
     dc.SetPen(pen);
     dc.DrawLine(0, 0, GetSize().GetWidth(), 0); 

clientgui/sg_CustomControls.h

@@ -48,7 +48,7 @@ public:
     );
 
     wxColour GetLineColor() const { return m_LineColor ; }
-    void     SetLineColor(wxColour value) { m_LineColor = value ; }
+    void     SetLineColor(wxColour value) { if (value != wxNullColour) m_LineColor = value ; }
 
     virtual bool HasTransparentBackground() { return true; };