wxDFB compilation fixes after recent brushes/pens changes (patch #1939986)

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

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index b4e4d058c08a7739dd4b341d9d9abc0111370d50..e636ecc33eaef44ea0c3e37668ea3bb04444652b 100644 (file)
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -48,7 +48,7 @@ public:
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
             wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
             wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );

-            style = wxSOLID;
+            style = wxBRUSHSTYLE_SOLID;

         }
 
         m_style = style;
         }
 
         m_style = style;

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index 4db8f6df5514e030702cb2d52741ca58e447d59f..5b70c698bf0afbc17a5c12826f26b411c23b1b7e 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -40,7 +40,7 @@ public:
 
     virtual bool IsOk() const { return m_colour.IsOk(); }
 
 
     virtual bool IsOk() const { return m_colour.IsOk(); }
 

-    void SetStyle(int style)
+    void SetStyle(wxPenStyle style)

     {
         if ( style != wxPENSTYLE_SOLID && style != wxPENSTYLE_TRANSPARENT )
         {
     {
         if ( style != wxPENSTYLE_SOLID && style != wxPENSTYLE_TRANSPARENT )
         {