1. removed 'B' flag from treebase.cpp and regenerated the makefiles

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 938908b56be96ad67d784c31278619e7fd13ef5a..6488a6b416b55b830152ce0ed8cf687cc891ab81 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -1,26 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        pen.h
 // Purpose:     wxPen class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/10/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
-#pragma interface "pen.h"
-#endif
-
 #include "wx/gdiobj.h"
-#include "wx/colour.h"
 #include "wx/bitmap.h"
 
-typedef    long wxDash ;
+typedef long wxPMDash;
 
 class WXDLLEXPORT wxPen;
 
@@ -39,11 +34,9 @@ protected:
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;
-  wxDash *      m_dash ;
+  wxPMDash *    m_dash ;
   wxColour      m_colour;
-/* TODO: implementation
   WXHPEN        m_hPen;
-*/
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
@@ -81,8 +74,10 @@ public:
   inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
   inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
   inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+  inline int GetDashes(wxDash **ptr) const
+  {
+    *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+    return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
   }
 
   inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
@@ -91,9 +86,9 @@ public:
 
   // Useful helper: create the brush resource
   bool RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
+  bool FreeResource(bool force = FALSE);
+  WXHANDLE GetResourceHandle() ;
+  bool IsFree() const;
   void Unshare();
 };