Avoid clash with control container event handlers

[wxWidgets.git] / src / os2 / pen.cpp

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index 4a1063dffdd1ed468ca526249e9b7f720055ae22..24d89e39b2a1397e725dee7130e09f71d7f27f1a 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -1,25 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/os2/pen.cpp

 // Purpose:     wxPen
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxPen
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"

 #include "wx/pen.h"
 #include "wx/pen.h"

-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"


@@ -33,6 +33,8 @@ wxPenRefData::wxPenRefData()
     m_nWidth  = 1;
     m_nJoin   = wxJOIN_ROUND ;
     m_nCap    = wxCAP_ROUND ;
     m_nWidth  = 1;
     m_nJoin   = wxJOIN_ROUND ;
     m_nCap    = wxCAP_ROUND ;

+    m_nbDash  = 0 ;
+    m_dash    = (wxDash*)NULL;

     m_hPen    = 0L;
 } // end of wxPenRefData::wxPenRefData
 
     m_hPen    = 0L;
 } // end of wxPenRefData::wxPenRefData
 


@@ -44,6 +46,8 @@ wxPenRefData::wxPenRefData(
     m_nWidth  = rData.m_nWidth;
     m_nJoin   = rData.m_nJoin;
     m_nCap    = rData.m_nCap;
     m_nWidth  = rData.m_nWidth;
     m_nJoin   = rData.m_nJoin;
     m_nCap    = rData.m_nCap;

+    m_nbDash  = rData.m_nbDash;
+    m_dash    = rData.m_dash;

     m_vColour = rData.m_vColour;
     m_hPen    = 0L;
 } // end of wxPenRefData::wxPenRefData
     m_vColour = rData.m_vColour;
     m_hPen    = 0L;
 } // end of wxPenRefData::wxPenRefData


@@ -57,14 +61,10 @@ wxPenRefData::~wxPenRefData()
 //
 wxPen::wxPen()
 {
 //
 wxPen::wxPen()
 {

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 } // end of wxPen::wxPen
 
 wxPen::~wxPen()
 {
 } // end of wxPen::wxPen
 
 wxPen::~wxPen()
 {

-    if (wxThePenList)
-        wxThePenList->RemovePen(this);

 } // end of wxPen::wxPen
 
 // Should implement Create
 } // end of wxPen::wxPen
 
 // Should implement Create


@@ -84,9 +84,6 @@ wxPen::wxPen(
     M_PENDATA->m_hPen    = 0L;
 
     RealizeResource();
     M_PENDATA->m_hPen    = 0L;
 
     RealizeResource();

-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 } // end of wxPen::wxPen
 
 wxPen::wxPen(
 } // end of wxPen::wxPen
 
 wxPen::wxPen(


@@ -104,9 +101,6 @@ wxPen::wxPen(
     M_PENDATA->m_hPen     = 0;
 
     RealizeResource();
     M_PENDATA->m_hPen     = 0;
 
     RealizeResource();

-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 } // end of wxPen::wxPen
 
 int wx2os2PenStyle(
 } // end of wxPen::wxPen
 
 int wx2os2PenStyle(


@@ -151,16 +145,16 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError.c_str());
-            return FALSE;
+            wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
+            return false;

         }
         if (M_PENDATA->m_nStyle == wxTRANSPARENT)
         {
         }
         if (M_PENDATA->m_nStyle == wxTRANSPARENT)
         {

-            return TRUE;
+            return true;

         }
 
         }
 

-        COLORREF                    vPmColour = 0L;
-        USHORT                      uLineType = wx2os2PenStyle(M_PENDATA->m_nStyle);
+        COLORREF vPmColour = 0L;
+        USHORT   uLineType = (USHORT)wx2os2PenStyle(M_PENDATA->m_nStyle);

 
         vPmColour = M_PENDATA->m_vColour.GetPixel();
 
 
         vPmColour = M_PENDATA->m_vColour.GetPixel();
 


@@ -199,6 +193,8 @@ bool wxPen::RealizeResource()
         }
         m_vLineBundle.lColor     = (LONG)vPmColour;
         m_vLineBundle.usMixMode  = FM_OVERPAINT;
         }
         m_vLineBundle.lColor     = (LONG)vPmColour;
         m_vLineBundle.usMixMode  = FM_OVERPAINT;

+        if (M_PENDATA->m_nWidth < 1)
+            M_PENDATA->m_nWidth = 1;

         m_vLineBundle.fxWidth    = M_PENDATA->m_nWidth;
         m_vLineBundle.lGeomWidth = M_PENDATA->m_nWidth;
         m_vLineBundle.usType     = uLineType;
         m_vLineBundle.fxWidth    = M_PENDATA->m_nWidth;
         m_vLineBundle.lGeomWidth = M_PENDATA->m_nWidth;
         m_vLineBundle.usType     = uLineType;


@@ -215,8 +211,8 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n", sError.c_str());
-            return FALSE;
+            wxLogError(_T("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n"), sError.c_str());
+            return false;

         }
 
         ULONG                           flAttrMask = 0L;
         }
 
         ULONG                           flAttrMask = 0L;


@@ -300,14 +296,15 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError.c_str());
+            wxLogError(_T("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str());

         }
         }

-        return bOk;
+
+        return (bool)bOk;

     }
     }

-    return FALSE;
+    return false;

 } // end of wxPen::RealizeResource
 
 } // end of wxPen::RealizeResource
 

-WXHANDLE wxPen::GetResourceHandle()
+WXHANDLE wxPen::GetResourceHandle() const

 {
     if (!M_PENDATA)
         return 0;
 {
     if (!M_PENDATA)
         return 0;


@@ -315,16 +312,14 @@ WXHANDLE wxPen::GetResourceHandle()
         return (WXHANDLE)M_PENDATA->m_hPen;
 } // end of wxPen::GetResourceHandle
 
         return (WXHANDLE)M_PENDATA->m_hPen;
 } // end of wxPen::GetResourceHandle
 

-bool wxPen::FreeResource(
-  bool                              bForce
-)
+bool wxPen::FreeResource( bool WXUNUSED(bForce) )

 {
     if (M_PENDATA && (M_PENDATA->m_hPen != 0))
     {
         M_PENDATA->m_hPen = 0;
 {
     if (M_PENDATA && (M_PENDATA->m_hPen != 0))
     {
         M_PENDATA->m_hPen = 0;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 } // end of wxPen::FreeResource
 
 bool wxPen::IsFree() const
 } // end of wxPen::FreeResource
 
 bool wxPen::IsFree() const


@@ -347,29 +342,21 @@ void wxPen::Unshare()
     }
 } // end of wxPen::Unshare
 
     }
 } // end of wxPen::Unshare
 

-void wxPen::SetColour(
-  const wxColour&                   rColour
-)
+void wxPen::SetColour( const wxColour& rColour )

 {
     Unshare();
     M_PENDATA->m_vColour = rColour;
     RealizeResource();
 } // end of wxPen::SetColour
 
 {
     Unshare();
     M_PENDATA->m_vColour = rColour;
     RealizeResource();
 } // end of wxPen::SetColour
 

-void wxPen::SetColour(
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
+void wxPen::SetColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue)

 {
     Unshare();
     M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
     RealizeResource();
 } // end of wxPen::SetColour
 
 {
     Unshare();
     M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
     RealizeResource();
 } // end of wxPen::SetColour
 

-void wxPen::SetPS(
-  HPS                               hPS
-)
+void wxPen::SetPS( HPS hPS )

 {
     Unshare();
     if (M_PENDATA->m_hPen)
 {
     Unshare();
     if (M_PENDATA->m_hPen)


@@ -406,10 +393,8 @@ void wxPen::SetStipple(
     RealizeResource();
 } // end of wxPen::SetStipple
 
     RealizeResource();
 } // end of wxPen::SetStipple
 

-void wxPen::SetDashes(
-  int                               nNbDashes
-, const wxDash*                     pDash
-)
+void wxPen::SetDashes( int WXUNUSED(nNbDashes),
+                       const wxDash* WXUNUSED(pDash) )

 {
     //
     // Does nothing under OS/2
 {
     //
     // Does nothing under OS/2


@@ -473,5 +458,3 @@ int wx2os2PenStyle(
     }
     return nPMStyle;
 } // end of wx2os2PenStyle
     }
     return nPMStyle;
 } // end of wx2os2PenStyle

-
-