Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is

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

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index e68db683b576352552d8aa2eae6073c4ef99be99..1ec1b80b7e5f7513006575f6b0ac1f739e0935b1 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -47,21 +47,18 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
   wxBrush(void);
   wxBrush(const wxColour& col, int style);
 public:
   wxBrush(void);
   wxBrush(const wxColour& col, int style);

-  wxBrush(const wxString& col, int style);

   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }
   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }

-  inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }

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

-  virtual void SetColour(const wxString& col)  ;
-  virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b)  ;
+  virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;

   virtual void SetStyle(int style)  ;
   virtual void SetStipple(const wxBitmap& stipple)  ;
 
   inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
   virtual void SetStyle(int style)  ;
   virtual void SetStipple(const wxBitmap& stipple)  ;
 
   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; }
+  inline bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; }
+  inline bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; }

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


@@ -73,7 +70,7 @@ public:
   bool RealizeResource(void);
   WXHANDLE GetResourceHandle(void) ;
   bool FreeResource(bool force = FALSE);
   bool RealizeResource(void);
   WXHANDLE GetResourceHandle(void) ;
   bool FreeResource(bool force = FALSE);

-  bool IsFree(void);
+  bool IsFree() const;

   void Unshare();
 };
 
   void Unshare();
 };