Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added mising AddBitmapList in wxBitmap

Browse Source 
Added missing deletion of wxFrame's toolbar
  Removed a few superfluous ; (sorry)
  Mentioned dmalloc in INSTALL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-16 19:39:29 +00:00
parent 11026f7b59
commit ff7b1510ea
40 changed files with 786 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk1/brush.cpp
View File

@@ -32,7 +32,7 @@ class wxBrushRefData: public wxObjectRefData
wxBrushRefData::wxBrushRefData(void)
{
m_style = 0;
};
}
//-----------------------------------------------------------------------------
@@ -43,7 +43,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
wxBrush::wxBrush(void)
{
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
}
wxBrush::wxBrush( const wxColour &colour, int style )
{
@@ -52,7 +52,7 @@ wxBrush::wxBrush( const wxColour &colour, int style )
M_BRUSHDATA->m_colour = colour;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
}
wxBrush::wxBrush( const wxString &colourName, int style )
{
@@ -61,7 +61,7 @@ wxBrush::wxBrush( const wxString &colourName, int style )
M_BRUSHDATA->m_colour = colourName;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
}
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
@@ -71,62 +71,62 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
M_BRUSHDATA->m_stipple = stippleBitmap;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
}
wxBrush::wxBrush( const wxBrush &brush )
{
Ref( brush );
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
};
}
wxBrush::wxBrush( const wxBrush *brush )
{
if (brush) Ref( *brush );
if (wxTheBrushList) wxTheBrushList->Append( this );
};
}
wxBrush::~wxBrush(void)
{
if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
};
}
wxBrush& wxBrush::operator = ( const wxBrush& brush )
{
if (*this == brush) return (*this);
Ref( brush );
return *this;
};
}
bool wxBrush::operator == ( const wxBrush& brush )
{
return m_refData == brush.m_refData;
};
}
bool wxBrush::operator != ( const wxBrush& brush )
{
return m_refData != brush.m_refData;
};
}
bool wxBrush::Ok(void) const
{
return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
};
}
int wxBrush::GetStyle(void) const
{
return M_BRUSHDATA->m_style;
};
}
wxColour &wxBrush::GetColour(void) const
{
return M_BRUSHDATA->m_colour;
};
}
wxBitmap *wxBrush::GetStipple(void) const
{
return &M_BRUSHDATA->m_stipple;
};
}