Return correct values for GetFieldRect() when using themes.

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

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index f1109f4633f645a716f062dfa698dd05ac407640..e377793c1ce38fc40fbf2d2e03d462c1ed5aad07 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -103,7 +99,8 @@ wxBrushRefData::wxBrushRefData(const wxBitmap& stipple)
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)

-              : m_stipple(data.m_stipple),
+              : wxGDIRefData(),
+                m_stipple(data.m_stipple),

                 m_colour(data.m_colour)
 {
     m_style = data.m_style;
                 m_colour(data.m_colour)
 {
     m_style = data.m_style;


@@ -149,9 +146,10 @@ void wxBrushRefData::Free()
     }
 }
 
     }
 }
 

-static int TransllateHatchStyle(int style)
-{

 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

+
+static int TranslateHatchStyle(int style)
+{

     switch ( style )
     {
         case wxBDIAGONAL_HATCH: return HS_BDIAGONAL;
     switch ( style )
     {
         case wxBDIAGONAL_HATCH: return HS_BDIAGONAL;


@@ -162,19 +160,18 @@ static int TransllateHatchStyle(int style)
         case wxVERTICAL_HATCH:  return HS_VERTICAL;
         default:                return -1;
     }
         case wxVERTICAL_HATCH:  return HS_VERTICAL;
         default:                return -1;
     }

-#else // __WXMICROWIN__
-    return -1;
-#endif

 }
 
 }
 

+#endif // !__WXMICROWIN__ && !__WXWINCE__
+

 HBRUSH wxBrushRefData::GetHBRUSH()
 {
     if ( !m_hBrush )
     {
 HBRUSH wxBrushRefData::GetHBRUSH()
 {
     if ( !m_hBrush )
     {

-#ifndef __WXWINCE__
-        int hatchStyle = TransllateHatchStyle(m_style);
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+        int hatchStyle = TranslateHatchStyle(m_style);

         if ( hatchStyle == -1 )
         if ( hatchStyle == -1 )

-#endif
+#endif // !__WXMICROWIN__ && !__WXWINCE__

         {
             switch ( m_style )
             {
         {
             switch ( m_style )
             {


@@ -248,7 +245,7 @@ wxBrush::~wxBrush()
 
 wxBrush& wxBrush::operator=(const wxBrush& brush)
 {
 
 wxBrush& wxBrush::operator=(const wxBrush& brush)
 {

-    if ( *this != brush )
+    if ( this != &brush )

     {
         Ref(brush);
     }
     {
         Ref(brush);
     }


@@ -337,5 +334,3 @@ void wxBrush::SetStipple(const wxBitmap& stipple)
 
     M_BRUSHDATA->SetStipple(stipple);
 }
 
     M_BRUSHDATA->SetStipple(stipple);
 }

-
-