no more _ftime instead of ftime

[wxWidgets.git] / src / gtk1 / brush.cpp

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 2f945402ce47202fb9a70cdabc1bd1c1cffdc481..ca0987080c1b7503d8e0ed4e123f0a7a88442cb0 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -65,9 +65,16 @@ wxBrush::wxBrush( const wxColour &colour, int style )
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
     m_refData = new wxBrushRefData();
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
     m_refData = new wxBrushRefData();

-    M_BRUSHDATA->m_style = wxSTIPPLE;

     M_BRUSHDATA->m_colour = *wxBLACK;
     M_BRUSHDATA->m_stipple = stippleBitmap;
     M_BRUSHDATA->m_colour = *wxBLACK;
     M_BRUSHDATA->m_stipple = stippleBitmap;

+    if (M_BRUSHDATA->m_stipple.GetMask())
+    {
+                  M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+        }
+        else
+        {              
+                  M_BRUSHDATA->m_style = wxSTIPPLE;
+        }              

 
     if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
     if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }


@@ -161,6 +168,14 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
 {
     Unshare();
     M_BRUSHDATA->m_stipple = stipple;
 {
     Unshare();
     M_BRUSHDATA->m_stipple = stipple;

+    if (M_BRUSHDATA->m_stipple.GetMask())
+    {
+                  M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+        }
+        else
+        {              
+                  M_BRUSHDATA->m_style = wxSTIPPLE;
+        }              

 }
 
 void wxBrush::Unshare()
 }
 
 void wxBrush::Unshare()