projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changing ES_LEFT/CENTER/RIGHT styles only works for plain (not rich) controls and...
[wxWidgets.git]
/
src
/
gtk1
/
brush.cpp
diff --git
a/src/gtk1/brush.cpp
b/src/gtk1/brush.cpp
index 68d4d985f9722bef02dac87bac37afae3935c41c..3b9330bb1a42ded7ae74d126376f56db9b75a064 100644
(file)
--- a/
src/gtk1/brush.cpp
+++ b/
src/gtk1/brush.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/brush.cpp
+// Name: src/gtk
1
/brush.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,12
+7,15
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/brush.h"
#include "wx/brush.h"
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
+
#include <gdk/gdk.h>
//-----------------------------------------------------------------------------
#include <gdk/gdk.h>
//-----------------------------------------------------------------------------
@@
-22,25
+25,30
@@
class wxBrushRefData: public wxObjectRefData
{
public:
class wxBrushRefData: public wxObjectRefData
{
public:
- wxBrushRefData();
- wxBrushRefData( const wxBrushRefData& data );
+ wxBrushRefData()
+ {
+ m_style = 0;
+ }
- int m_style;
- wxBitmap m_stipple;
- wxColour m_colour;
-};
+ wxBrushRefData( const wxBrushRefData& data )
+ : wxObjectRefData()
+ {
+ m_style = data.m_style;
+ m_stipple = data.m_stipple;
+ m_colour = data.m_colour;
+ }
-wxBrushRefData::wxBrushRefData()
-{
- m_style = 0;
-}
+ bool operator == (const wxBrushRefData& data) const
+ {
+ return (m_style == data.m_style &&
+ m_stipple.IsSameAs(data.m_stipple) &&
+ m_colour == data.m_colour);
+ }
-wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
-{
- m_style = data.m_style;
- m_stipple = data.m_stipple;
- m_colour = data.m_colour;
-}
+ int m_style;
+ wxColour m_colour;
+ wxBitmap m_stipple;
+};
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@
-48,10
+56,6
@@
wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
-wxBrush::wxBrush()
-{
-}
-
wxBrush::wxBrush( const wxColour &colour, int style )
{
m_refData = new wxBrushRefData();
wxBrush::wxBrush( const wxColour &colour, int style )
{
m_refData = new wxBrushRefData();
@@
-72,36
+76,28
@@
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
M_BRUSHDATA->m_style = wxSTIPPLE;
}
M_BRUSHDATA->m_style = wxSTIPPLE;
}
-wxBrush::
wxBrush( const wxBrush &brush
)
+wxBrush::
~wxBrush(
)
{
{
- Ref( brush );
+ // m_refData unrefed in ~wxObject
}
}
-wx
Brush::~wxBrush()
+wx
ObjectRefData *wxBrush::CreateRefData() const
{
{
+ return new wxBrushRefData;
}
}
-wx
Brush& wxBrush::operator = ( const wxBrush& brush )
+wx
ObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
{
{
- if ( m_refData != brush.m_refData )
- Ref( brush );
-
- return *this;
+ return new wxBrushRefData(*(wxBrushRefData *)data);
}
bool wxBrush::operator == ( const wxBrush& brush ) const
{
}
bool wxBrush::operator == ( const wxBrush& brush ) const
{
- return m_refData == brush.m_refData;
-}
+ if (m_refData == brush.m_refData) return true;
-bool wxBrush::operator != ( const wxBrush& brush ) const
-{
- return m_refData != brush.m_refData;
-}
+ if (!m_refData || !brush.m_refData) return false;
-bool wxBrush::Ok() const
-{
- return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+ return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
}
int wxBrush::GetStyle() const
}
int wxBrush::GetStyle() const
@@
-139,25
+135,29
@@
wxBitmap *wxBrush::GetStipple() const
void wxBrush::SetColour( const wxColour& col )
{
void wxBrush::SetColour( const wxColour& col )
{
- Unshare();
+ AllocExclusive();
+
M_BRUSHDATA->m_colour = col;
}
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
M_BRUSHDATA->m_colour = col;
}
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
- Unshare();
+ AllocExclusive();
+
M_BRUSHDATA->m_colour.Set( r, g, b );
}
void wxBrush::SetStyle( int style )
{
M_BRUSHDATA->m_colour.Set( r, g, b );
}
void wxBrush::SetStyle( int style )
{
- Unshare();
+ AllocExclusive();
+
M_BRUSHDATA->m_style = style;
}
void wxBrush::SetStipple( const wxBitmap& stipple )
{
M_BRUSHDATA->m_style = style;
}
void wxBrush::SetStipple( const wxBitmap& stipple )
{
- Unshare();
+ AllocExclusive();
+
M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask())
{
M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask())
{
@@
-168,18
+168,3
@@
void wxBrush::SetStipple( const wxBitmap& stipple )
M_BRUSHDATA->m_style = wxSTIPPLE;
}
}
M_BRUSHDATA->m_style = wxSTIPPLE;
}
}
-
-void wxBrush::Unshare()
-{
- if (!m_refData)
- {
- m_refData = new wxBrushRefData();
- }
- else
- {
- wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
- UnRef();
- m_refData = ref;
- }
-}
-