set eol-style

[wxWidgets.git] / include / wx / msw / brush.h

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 782bc57f2d0ff6b205405df4813f447f6d088f18..6e21585ad1fc1d8ef4aaf38ac1d18214a0861eee 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -12,15 +12,11 @@
 #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/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 // ----------------------------------------------------------------------------
 // wxBrush
 
 // ----------------------------------------------------------------------------
 // wxBrush


@@ -32,7 +28,6 @@ public:
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);

-    wxBrush(const wxBrush& brush) : wxBrushBase(brush) { Ref(brush); }

     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);
     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);


@@ -40,7 +35,6 @@ public:
     virtual void SetStyle(int style);
     virtual void SetStipple(const wxBitmap& stipple);
 
     virtual void SetStyle(int style);
     virtual void SetStipple(const wxBitmap& stipple);
 

-    wxBrush& operator=(const wxBrush& brush);

     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); }
 


@@ -48,7 +42,8 @@ public:
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;