/////////////////////////////////////////////////////////////////////////////
-// Name: pen.cpp
+// Name: msw/pen.cpp
// Purpose: wxPen
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ;
m_nbDash = 0 ;
- m_dash = 0 ;
+ m_dash = (wxDash*)NULL;
m_hPen = 0;
}
wxPenRefData::~wxPenRefData()
{
- if ( m_hPen )
- ::DeleteObject((HPEN) m_hPen);
+ if ( m_hPen )
+ ::DeleteObject((HPEN) m_hPen);
}
// Pens
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 = 0 ;
+ M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ;
#ifndef __WIN32__
(Style == wxUSER_DASH))
M_PENDATA->m_width = 1;
}
-#endif
+#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 = 0 ;
+ M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ;
RealizeResource();
- if (wxThePenList)
- wxThePenList->AddPen(this);
}
bool wxPen::RealizeResource()
// 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__)
if (M_PENDATA->m_join==wxJOIN_ROUND &&
M_PENDATA->m_cap==wxCAP_ROUND &&
M_PENDATA->m_style!=wxUSER_DASH &&
M_PENDATA->m_style!=wxSTIPPLE &&
- M_PENDATA->m_width <= 1)
+ M_PENDATA->m_width <= 1)
{
- M_PENDATA->m_hPen =
- (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
- M_PENDATA->m_width,
- ms_colour );
+ M_PENDATA->m_hPen =
+ (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+ M_PENDATA->m_width,
+ ms_colour );
}
else
{
- DWORD ms_style = PS_GEOMETRIC | wx2msPenStyle(M_PENDATA->m_style);
+ DWORD ms_style = PS_GEOMETRIC | wx2msPenStyle(M_PENDATA->m_style);
- switch(M_PENDATA->m_join)
+ switch(M_PENDATA->m_join)
{
case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL; break;
case wxJOIN_MITER: ms_style |= PS_JOIN_MITER; break;
case wxCAP_ROUND: ms_style |= PS_ENDCAP_ROUND; break;
}
- LOGBRUSH logb;
+ LOGBRUSH logb;
- switch(M_PENDATA->m_style)
+ switch(M_PENDATA->m_style)
{
case wxSTIPPLE:
logb.lbStyle = BS_PATTERN ;
logb.lbHatch = (LONG)0;
break;
case wxBDIAGONAL_HATCH:
- logb.lbStyle = BS_HATCHED;
- logb.lbHatch = HS_BDIAGONAL;
- break;
- case wxCROSSDIAG_HATCH:
- logb.lbStyle = BS_HATCHED;
- logb.lbHatch = HS_DIAGCROSS;
- break;
- case wxFDIAGONAL_HATCH:
- logb.lbStyle = BS_HATCHED;
- logb.lbHatch = HS_FDIAGONAL;
- break;
- case wxCROSS_HATCH:
- logb.lbStyle = BS_HATCHED;
- logb.lbHatch = HS_CROSS;
- break;
- case wxHORIZONTAL_HATCH:
- logb.lbStyle = BS_HATCHED;
- logb.lbHatch = HS_HORIZONTAL;
- break;
- case wxVERTICAL_HATCH:
- logb.lbStyle = BS_HATCHED;
- logb.lbHatch = HS_VERTICAL;
- break;
- default:
+ logb.lbStyle = BS_HATCHED;
+ logb.lbHatch = HS_BDIAGONAL;
+ break;
+ case wxCROSSDIAG_HATCH:
+ logb.lbStyle = BS_HATCHED;
+ logb.lbHatch = HS_DIAGCROSS;
+ break;
+ case wxFDIAGONAL_HATCH:
+ logb.lbStyle = BS_HATCHED;
+ logb.lbHatch = HS_FDIAGONAL;
+ break;
+ case wxCROSS_HATCH:
+ logb.lbStyle = BS_HATCHED;
+ logb.lbHatch = HS_CROSS;
+ break;
+ case wxHORIZONTAL_HATCH:
+ logb.lbStyle = BS_HATCHED;
+ logb.lbHatch = HS_HORIZONTAL;
+ break;
+ case wxVERTICAL_HATCH:
+ logb.lbStyle = BS_HATCHED;
+ logb.lbHatch = HS_VERTICAL;
+ break;
+ default:
logb.lbStyle = BS_SOLID;
#ifdef __WXDEBUG__
- // this should be unnecessary (it's unused) but suppresses the Purigy
+ // this should be unnecessary (it's unused) but suppresses the Purigy
// messages about uninitialized memory read
- logb.lbHatch = 0;
+ logb.lbHatch = 0;
#endif
- break;
- }
+ break;
+ }
- logb.lbColor = ms_colour;
+ logb.lbColor = ms_colour;
- wxDash *real_dash;
+ wxMSWDash *real_dash;
if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
- {
- real_dash = new wxDash[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;
+ {
+ real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
+ for ( int i = 0; i < M_PENDATA->m_nbDash; i++ )
+ real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
}
- else
+ else
{
- real_dash = 0;
+ real_dash = (wxMSWDash*)NULL;
}
// Win32s doesn't have ExtCreatePen function...
- if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
- {
- M_PENDATA->m_hPen =
- (WXHPEN) ExtCreatePen( ms_style,
- M_PENDATA->m_width,
- &logb,
- M_PENDATA->m_style==wxUSER_DASH
- ? M_PENDATA->m_nbDash
- : 0,
- (const DWORD*)real_dash );
- }
- else
+ if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
{
- M_PENDATA->m_hPen =
- (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
- M_PENDATA->m_width,
- ms_colour );
+ M_PENDATA->m_hPen =
+ (WXHPEN) ExtCreatePen( ms_style,
+ M_PENDATA->m_width,
+ &logb,
+ M_PENDATA->m_style == wxUSER_DASH
+ ? M_PENDATA->m_nbDash
+ : 0,
+ (LPDWORD)real_dash );
+ }
+ else
+ {
+ M_PENDATA->m_hPen =
+ (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+ M_PENDATA->m_width,
+ ms_colour );
}
if (real_dash)
}
#else
M_PENDATA->m_hPen =
- (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
- M_PENDATA->m_width,
- ms_colour );
+ (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+ M_PENDATA->m_width,
+ ms_colour );
#endif
#ifdef WXDEBUG_CREATE
if (M_PENDATA->m_hPen==0)
return FALSE;
}
-WXHANDLE wxPen::GetResourceHandle()
+WXHANDLE wxPen::GetResourceHandle() const
{
- if ( !M_PENDATA )
- return 0;
- else
- return (WXHANDLE)M_PENDATA->m_hPen;
+ if ( !M_PENDATA )
+ return 0;
+ else
+ 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))
{
void wxPen::Unshare()
{
- // Don't change shared data
- if (!m_refData)
+ // Don't change shared data
+ if (!m_refData)
{
- m_refData = new wxPenRefData();
- }
+ m_refData = new wxPenRefData();
+ }
else
{
- wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
- UnRef();
- m_refData = ref;
- }
+ wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+ UnRef();
+ m_refData = ref;
+ }
}
void wxPen::SetColour(const wxColour& col)
Unshare();
M_PENDATA->m_colour = col;
-
+
RealizeResource();
}
Unshare();
M_PENDATA->m_colour.Set(r, g, b);
-
+
RealizeResource();
}
M_PENDATA->m_stipple = Stipple;
M_PENDATA->m_style = wxSTIPPLE;
-
+
RealizeResource();
}
M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash;
-
+
RealizeResource();
}
{
int cstyle;
switch (wx_style)
- {
+ {
+#if !defined(__WXMICROWIN__)
case wxDOT:
cstyle = PS_DOT;
- break;
+ break;
case wxDOT_DASH:
- cstyle = PS_DASHDOT;
- break;
+ cstyle = PS_DASHDOT;
+ break;
case wxSHORT_DASH:
case wxLONG_DASH:
cstyle = PS_DASH;
- break;
+ break;
case wxTRANSPARENT:
cstyle = PS_NULL;
- break;
+ break;
+#endif
case wxUSER_DASH:
+#if !defined(__WXMICROWIN__)
#ifdef __WIN32__
// Win32s doesn't have PS_USERSTYLE
- if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
- cstyle = PS_USERSTYLE;
- else
+ if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
+ cstyle = PS_USERSTYLE;
+ else
cstyle = PS_DOT; // We must make a choice... This is mine!
#else
cstyle = PS_DASH;
+#endif
#endif
break;
case wxSOLID:
projects / wxWidgets.git / blobdiff