projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workaround for mingw 3.2.3 DLL build with wxUSE_STL=1
[wxWidgets.git]
/
include
/
wx
/
msw
/
brush.h
diff --git
a/include/wx/msw/brush.h
b/include/wx/msw/brush.h
index 05ae288300eec6458a2cb47100b6f06994f6d117..4a83d7b57d678626b81d518ad9ed3ac1d145dd32 100644
(file)
--- a/
include/wx/msw/brush.h
+++ b/
include/wx/msw/brush.h
@@
-1,77
+1,58
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: brush.h
+// Name:
wx/msw/
brush.h
// Purpose: wxBrush class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxBrush class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#ifdef __GNUG__
-#pragma interface "brush.h"
-#endif
-
#include "wx/gdicmn.h"
#include "wx/gdiobj.h"
#include "wx/bitmap.h"
class WXDLLEXPORT wxBrush;
#include "wx/gdicmn.h"
#include "wx/gdiobj.h"
#include "wx/bitmap.h"
class WXDLLEXPORT wxBrush;
-class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+// ----------------------------------------------------------------------------
+// wxBrush
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxBrush : public wxBrushBase
{
{
- friend class WXDLLEXPORT wxBrush;
public:
public:
- wxBrushRefData(void);
- wxBrushRefData(const wxBrushRefData& data);
- ~wxBrushRefData(void);
-
-protected:
- int m_style;
- wxBitmap m_stipple ;
- wxColour m_colour;
- WXHBRUSH m_hBrush;
-};
+ wxBrush();
+ wxBrush(const wxColour& col, int style = wxSOLID);
+ wxBrush(const wxBitmap& stipple);
+ virtual ~wxBrush();
-#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+ virtual void SetColour(const wxColour& col);
+ virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
+ virtual void SetStyle(int style);
+ virtual void SetStipple(const wxBitmap& stipple);
-// Brush
-class WXDLLEXPORT wxBrush: public wxGDIObject
-{
- DECLARE_DYNAMIC_CLASS(wxBrush)
+ bool operator==(const wxBrush& brush) const;
+ bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
-public:
- wxBrush(void);
- wxBrush(const wxColour& col, int style);
- wxBrush(const wxBitmap& stipple);
- inline wxBrush(const wxBrush& brush) { Ref(brush); }
- ~wxBrush(void);
+ wxColour GetColour() const;
+ virtual int GetStyle() const;
+ wxBitmap *GetStipple() const;
- virtual void SetColour(const wxColour& col) ;
- virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
- virtual void SetStyle(int style) ;
- virtual void SetStipple(const wxBitmap& stipple) ;
+ bool Ok() const { return m_refData != NULL; }
- inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
- inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; }
- inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; }
+ // return the HBRUSH for this brush
+ virtual WXHANDLE GetResourceHandle() const;
- inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
- inline int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
- inline wxBitmap *GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
-
- virtual bool Ok(void) const { return (m_refData != NULL) ; }
+protected:
+ virtual wxObjectRefData *CreateRefData() const;
+ virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
- // Internal
- bool RealizeResource(void);
- WXHANDLE GetResourceHandle(void) ;
- bool FreeResource(bool force = FALSE);
- bool IsFree() const;
- void Unshare();
+private:
+ DECLARE_DYNAMIC_CLASS(wxBrush)
};
#endif
};
#endif