Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index a0a1bd7471b880ae9d4fe6505853bd1cbf997423..365a4a0575b634ec0a78777f5482ac189156164f 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        brush.h
 // Purpose:     wxBrush class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        brush.h
 // Purpose:     wxBrush class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// 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"
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"


@@ -27,57 +23,66 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxBrush;
 public:
     wxBrushRefData();
     friend class WXDLLEXPORT wxBrush;
 public:
     wxBrushRefData();

-    wxBrushRefData(const wxBrushRefData& data);
+    wxBrushRefData(const wxBrushRefData& rData);

     ~wxBrushRefData();
 
 protected:
     ~wxBrushRefData();
 
 protected:

-    int           m_style;
-    wxBitmap      m_stipple ;
-    wxColour      m_colour;
-
-/* TODO: implementation
-    WXHBRUSH      m_hBrush;
-*/
+    int                             m_nStyle;
+    wxBitmap                        m_vStipple ;
+    wxColour                        m_vColour;
+    WXHBRUSH                        m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with
+    AREABUNDLE                      m_vBundle;

 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 // Brush
 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 // Brush

-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBrush)
+    DECLARE_DYNAMIC_CLASS(wxBrush)

 
 public:
 
 public:

-  wxBrush();
-  wxBrush(const wxColour& col, int style);
-  wxBrush(const wxBitmap& stipple);
-  inline wxBrush(const wxBrush& brush) { Ref(brush); }
-  ~wxBrush();
-
-  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)  ;
-
-  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 wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
-  inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
-  inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-// Implementation
-
-  // Useful helper: create the brush resource
-  bool RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
-};
+    wxBrush();
+    wxBrush( const wxColour& rCol
+            ,int             nStyle = wxSOLID
+           );
+    wxBrush(const wxBitmap& rStipple);
+    inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
+    ~wxBrush();
+
+    inline wxBrush& operator = (const wxBrush& rBrush) { if (*this == rBrush) return (*this); Ref(rBrush); return *this; }
+    inline bool operator == (const wxBrush& rBrush) const { return m_refData == rBrush.m_refData; }
+    inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; }
+
+    virtual void SetColour(const wxColour& rColour);
+    virtual void SetColour( unsigned char cRed
+                           ,unsigned char cGreen
+                           ,unsigned char cBrush
+                          );
+    virtual void SetPS(HPS hPS);
+    virtual void SetStyle(int nStyle)  ;
+    virtual void SetStipple(const wxBitmap& rStipple);
+
+    inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); };
+    virtual int      GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); };
+    inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
+    inline int       GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
+
+    inline virtual bool Ok(void) const { return (m_refData != NULL) ; }
+
+    //
+    // Implementation
+    //
+
+    //
+    // Useful helper: create the brush resource
+    //
+    bool     RealizeResource(void);
+    WXHANDLE GetResourceHandle(void) ;
+    bool     FreeResource(bool bForce = false);
+    bool     IsFree(void) const;
+    void     Unshare(void);
+}; // end of CLASS wxBrush

 
 #endif
     // _WX_BRUSH_H_
 
 #endif
     // _WX_BRUSH_H_