Added clipboard cut and paste

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

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index 7e107855c927f359167757ad11f125f5ad95febe..66206940e6eeb252df6dd25eb9ab459d4945eff5 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -58,14 +58,10 @@ wxBrushRefData::~wxBrushRefData(void)
 // Brushes
 wxBrush::wxBrush(void)
 {
 // Brushes
 wxBrush::wxBrush(void)
 {

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

 }
 
 wxBrush::~wxBrush()
 {
 }
 
 wxBrush::~wxBrush()
 {

-    if (wxTheBrushList)
-        wxTheBrushList->RemoveBrush(this);

 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)
 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)


@@ -78,25 +74,25 @@ wxBrush::wxBrush(const wxColour& col, int Style)
 
   RealizeResource();
 
 
   RealizeResource();
 

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

 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
   m_refData = new wxBrushRefData;
 
 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
   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();
 

-  if ( wxTheBrushList )
-    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))
   {


@@ -123,6 +119,7 @@ bool wxBrush::RealizeResource(void)
                       // - could choose white always for a quick solution
       break;
 ***/
                       // - could choose white always for a quick solution
       break;
 ***/

+#ifndef __WXMICROWIN__

       case wxBDIAGONAL_HATCH:
         M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateHatchBrush(HS_BDIAGONAL,ms_colour) ;
         break ;
       case wxBDIAGONAL_HATCH:
         M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateHatchBrush(HS_BDIAGONAL,ms_colour) ;
         break ;


@@ -147,6 +144,13 @@ 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 ;
+#endif

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


@@ -230,6 +234,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();
 }