// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "pen.h"
#endif
#endif
#include "wx/msw/private.h"
-#include "assert.h"
IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ;
m_nbDash = 0 ;
- m_dash = (wxMSWDash*)NULL;
+ m_dash = (wxDash*)NULL;
m_hPen = 0;
}
wxPen::wxPen()
{
- if (wxThePenList)
- wxThePenList->AddPen(this);
}
wxPen::~wxPen()
{
- if (wxThePenList)
- wxThePenList->RemovePen(this);
}
// Should implement Create
M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = (wxMSWDash*)NULL;
+ M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ;
#ifndef __WIN32__
#endif
RealizeResource();
- if ( wxThePenList )
- wxThePenList->AddPen(this);
}
wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = (wxMSWDash*)NULL;
+ M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ;
RealizeResource();
- if (wxThePenList)
- wxThePenList->AddPen(this);
}
bool wxPen::RealizeResource()
return TRUE;
}
- COLORREF ms_colour = 0;
- ms_colour = M_PENDATA->m_colour.GetPixel();
+ COLORREF ms_colour = M_PENDATA->m_colour.GetPixel();
// Join style, Cap style, Pen Stippling only on Win32.
// Currently no time to find equivalent on Win3.1, sorry
// [if such equiv exist!!]
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
if (M_PENDATA->m_join==wxJOIN_ROUND &&
M_PENDATA->m_cap==wxCAP_ROUND &&
M_PENDATA->m_style!=wxUSER_DASH &&
if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
{
real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
- int i;
- for (i=0; i<M_PENDATA->m_nbDash; i++)
- real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
+ int rw = M_PENDATA->m_width > 1 ? M_PENDATA->m_width : 1;
+ for ( int i = 0; i < M_PENDATA->m_nbDash; i++ )
+ real_dash[i] = M_PENDATA->m_dash[i] * rw;
}
else
{
return FALSE;
}
-WXHANDLE wxPen::GetResourceHandle()
+WXHANDLE wxPen::GetResourceHandle() const
{
if ( !M_PENDATA )
return 0;
return (WXHANDLE)M_PENDATA->m_hPen;
}
-bool wxPen::FreeResource(bool force)
+bool wxPen::FreeResource(bool WXUNUSED(force))
{
if (M_PENDATA && (M_PENDATA->m_hPen != 0))
{
Unshare();
M_PENDATA->m_nbDash = nb_dashes;
- M_PENDATA->m_dash = (wxMSWDash *)Dash;
+ M_PENDATA->m_dash = (wxDash *)Dash;
RealizeResource();
}
int cstyle;
switch (wx_style)
{
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
case wxDOT:
cstyle = PS_DOT;
break;
case wxTRANSPARENT:
cstyle = PS_NULL;
break;
+#endif
case wxUSER_DASH:
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#ifdef __WIN32__
// Win32s doesn't have PS_USERSTYLE
if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
cstyle = PS_DOT; // We must make a choice... This is mine!
#else
cstyle = PS_DASH;
+#endif
#endif
break;
case wxSOLID: