Commited updated list of files to compile.

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

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index 9c33fc9eddd345af0dac585414b1ce0023646fba..825410a28bdf161b3c5a9d5bac59ce72b3d584af 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -33,9 +33,7 @@
 
 #include "assert.h"
 
 
 #include "assert.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)

-#endif

 
 wxBrushRefData::wxBrushRefData(void)
 {
 
 wxBrushRefData::wxBrushRefData(void)
 {


@@ -88,8 +86,12 @@ wxBrush::wxBrush(const wxBitmap& stipple)
 {
   m_refData = new wxBrushRefData;
 
 {
   m_refData = new wxBrushRefData;
 

-  M_BRUSHDATA->m_style = wxSTIPPLE;

   M_BRUSHDATA->m_stipple = stipple;
   M_BRUSHDATA->m_stipple = stipple;

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

   M_BRUSHDATA->m_hBrush = 0;
 
   RealizeResource();
   M_BRUSHDATA->m_hBrush = 0;
 
   RealizeResource();


@@ -98,7 +100,7 @@ wxBrush::wxBrush(const wxBitmap& stipple)
     wxTheBrushList->AddBrush(this);
 }
 
     wxTheBrushList->AddBrush(this);
 }
 

-bool wxBrush::RealizeResource(void) 
+bool wxBrush::RealizeResource(void)

 {
   if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0))
   {
 {
   if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0))
   {


@@ -149,6 +151,12 @@ bool wxBrush::RealizeResource(void)
         else
           M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateSolidBrush(ms_colour) ;
         break ;
         else
           M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateSolidBrush(ms_colour) ;
         break ;

+      case wxSTIPPLE_MASK_OPAQUE:
+        if (M_BRUSHDATA->m_stipple.Ok() && M_BRUSHDATA->m_stipple.GetMask())
+          M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreatePatternBrush((HBITMAP) M_BRUSHDATA->m_stipple.GetMask()->GetMaskBitmap());
+        else
+          M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateSolidBrush(ms_colour) ;
+        break ;

       case wxSOLID:
       default:
         M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateSolidBrush(ms_colour) ;
       case wxSOLID:
       default:
         M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateSolidBrush(ms_colour) ;


@@ -179,7 +187,7 @@ bool wxBrush::FreeResource(bool WXUNUSED(force))
   else return FALSE;
 }
 
   else return FALSE;
 }
 

-bool wxBrush::IsFree(void)
+bool wxBrush::IsFree() const

 {
   return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
 }
 {
   return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
 }


@@ -232,6 +240,10 @@ 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;

 
     RealizeResource();
 }
 
     RealizeResource();
 }