projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GetBestFittingSize --> GetEffectiveMinSize
[wxWidgets.git]
/
include
/
wx
/
x11
/
brush.h
diff --git
a/include/wx/x11/brush.h
b/include/wx/x11/brush.h
index 58160f1fc3cb37b69c8b152a18a4ccaa18b7bd76..c261ba205ac91eb04db0d59320536441eda488c2 100644
(file)
--- a/
include/wx/x11/brush.h
+++ b/
include/wx/x11/brush.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: brush.h
+// Name:
wx/x11/
brush.h
// Purpose: wxBrush class
// Author: Julian Smart, Robert Roebling
// Modified by:
// Purpose: wxBrush class
// Author: Julian Smart, Robert Roebling
// Modified by:
@@
-12,37
+12,31
@@
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "brush.h"
-#endif
-
#include "wx/gdiobj.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
#include "wx/gdiobj.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxBrush;
-class wxColour;
-class wxBitmap;
+class
WXDLLIMPEXP_CORE
wxBrush;
+class
WXDLLIMPEXP_CORE
wxColour;
+class
WXDLLIMPEXP_CORE
wxBitmap;
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrush: public wxBrushBase
+class
WXDLLIMPEXP_CORE
wxBrush: public wxBrushBase
{
public:
wxBrush() { }
wxBrush( const wxColour &colour, int style = wxSOLID );
wxBrush( const wxBitmap &stippleBitmap );
{
public:
wxBrush() { }
wxBrush( const wxColour &colour, int style = wxSOLID );
wxBrush( const wxBitmap &stippleBitmap );
- ~wxBrush();
-
- wxBrush( const wxBrush &brush ) { Ref(brush); }
- wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
+ virtual ~wxBrush();
- bool Ok() const { return m_refData != NULL; }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return m_refData != NULL; }
bool operator == ( const wxBrush& brush ) const;
bool operator != (const wxBrush& brush) const { return !(*this == brush); }
bool operator == ( const wxBrush& brush ) const;
bool operator != (const wxBrush& brush) const { return !(*this == brush); }
@@
-56,7
+50,7
@@
public:
void SetStyle( int style );
void SetStipple( const wxBitmap& stipple );
void SetStyle( int style );
void SetStipple( const wxBitmap& stipple );
-pr
ivate
:
+pr
otected
:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;