missing commit

[wxWidgets.git] / src / html / m_hline.cpp

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 6bf88c77322ec75d573a0c0ab42ccccb52d63edb..c83704ad4cc7a438119b8e380395dca2d6942117 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -15,7 +15,7 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
 
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/brush.h"
     #include "wx/pen.h"
     #include "wx/dc.h"
     #include "wx/brush.h"
     #include "wx/pen.h"
     #include "wx/dc.h"


@@ -46,7 +46,7 @@ class wxHtmlLineCell : public wxHtmlCell
         // Should we draw 3-D shading or not
       bool m_HasShading;
 
         // Should we draw 3-D shading or not
       bool m_HasShading;
 

-      DECLARE_NO_COPY_CLASS(wxHtmlLineCell)
+      wxDECLARE_NO_COPY_CLASS(wxHtmlLineCell);

 };
 
 
 };
 
 


@@ -54,8 +54,8 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y,
                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                           wxHtmlRenderingInfo& WXUNUSED(info))
 {
                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                           wxHtmlRenderingInfo& WXUNUSED(info))
 {

-    wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxTRANSPARENT : wxSOLID);
-    wxPen mypen(wxT("GREY"), 1, wxSOLID);
+    wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxBRUSHSTYLE_TRANSPARENT : wxBRUSHSTYLE_SOLID);
+    wxPen mypen(wxT("GREY"), 1, wxPENSTYLE_SOLID);

     dc.SetBrush(mybrush);
     dc.SetPen(mypen);
     dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);
     dc.SetBrush(mybrush);
     dc.SetPen(mypen);
     dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);