Fix line indices translation in wxGrid::DoEndDragResizeLine().

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

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index fd6f1c38472deb5027642b0a0a8091c8afaffe94..a03abbfb1cd586ea5f3f9143d1dae0d52672238a 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -133,11 +133,20 @@ wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)
     M_BRUSHDATA->m_colour = colour;
 }
 
     M_BRUSHDATA->m_colour = colour;
 }
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData;
+    M_BRUSHDATA->m_style = (wxBrushStyle)style;
+    M_BRUSHDATA->m_colour = colour;
+}
+#endif
+

 wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 {
 wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 {

-    wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( stippleBitmap.Ok(), wxT("invalid bitmap") );

     wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8,
     wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8,

-                  _T("stipple bitmap must be 8x8") );
+                  wxT("stipple bitmap must be 8x8") );

 
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_colour = *wxBLACK;
 
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_colour = *wxBLACK;


@@ -168,33 +177,21 @@ bool wxBrush::operator != (const wxBrush& brush) const
 
 wxBrushStyle wxBrush::GetStyle() const
 {
 
 wxBrushStyle wxBrush::GetStyle() const
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return 0;
-    }
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );

 
     return M_BRUSHDATA->m_style;
 }
 
 
     return M_BRUSHDATA->m_style;
 }
 

-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const

 {
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return wxNullColour;
-    }
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );

 
     return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
 
     return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return &wxNullBitmap;
-    }
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") );

 
     return &M_BRUSHDATA->m_stipple;
 }
 
     return &M_BRUSHDATA->m_stipple;
 }


@@ -235,9 +232,9 @@ void wxBrush::SetStipple(const wxBitmap& stipple)
 {
     AllocExclusive();
 
 {
     AllocExclusive();
 

-    wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") );

     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,

-                  _T("stipple bitmap must be 8x8") );
+                  wxT("stipple bitmap must be 8x8") );

 
     M_BRUSHDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_BRUSHDATA->m_pixPattern),
 
     M_BRUSHDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_BRUSHDATA->m_pixPattern),