projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed const operator[]s (should fix 1162115)
[wxWidgets.git]
/
include
/
wx
/
x11
/
brush.h
diff --git
a/include/wx/x11/brush.h
b/include/wx/x11/brush.h
index 8e42e3e03b4239cc6efee20b0a34d26874dea62d..58160f1fc3cb37b69c8b152a18a4ccaa18b7bd76 100644
(file)
--- a/
include/wx/x11/brush.h
+++ b/
include/wx/x11/brush.h
@@
-6,13
+6,13
@@
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#if defined(__GNUG__) && !defined(
__APPLE__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface "brush.h"
#endif
#pragma interface "brush.h"
#endif
@@
-30,24
+30,24
@@
class wxBitmap;
// wxBrush
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrush: public wx
GDIObject
+class wxBrush: public wx
BrushBase
{
public:
wxBrush() { }
{
public:
wxBrush() { }
-
- wxBrush( const wxColour &colour, int style );
+
+ wxBrush( const wxColour &colour, int style
= wxSOLID
);
wxBrush( const wxBitmap &stippleBitmap );
~wxBrush();
wxBrush( const wxBitmap &stippleBitmap );
~wxBrush();
-
+
wxBrush( const wxBrush &brush ) { Ref(brush); }
wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
wxBrush( const wxBrush &brush ) { Ref(brush); }
wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
-
+
bool Ok() const { return m_refData != NULL; }
bool Ok() 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); }
- int GetStyle() const;
+
virtual
int GetStyle() const;
wxColour &GetColour() const;
wxBitmap *GetStipple() const;
wxColour &GetColour() const;
wxBitmap *GetStipple() const;
@@
-60,7
+60,7
@@
private:
// 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;
-
+
DECLARE_DYNAMIC_CLASS(wxBrush)
};
DECLARE_DYNAMIC_CLASS(wxBrush)
};