/////////////////////////////////////////////////////////////////////////////
-// 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__
#include "wx/msw/private.h"
#include "assert.h"
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-#endif
wxPenRefData::wxPenRefData()
{
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 )
+ if (wxThePenList)
wxThePenList->AddPen(this);
}
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 )
wxPen::wxPen(const wxBitmap& stipple, int Width)
{
- m_refData = new wxPenRefData;
+ m_refData = new wxPenRefData;
// M_PENDATA->m_colour = col;
- M_PENDATA->m_stipple = stipple;
- M_PENDATA->m_width = Width;
- M_PENDATA->m_style = wxSTIPPLE;
- 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_hPen = 0 ;
+ M_PENDATA->m_stipple = stipple;
+ M_PENDATA->m_width = Width;
+ M_PENDATA->m_style = wxSTIPPLE;
+ M_PENDATA->m_join = wxJOIN_ROUND ;
+ M_PENDATA->m_cap = wxCAP_ROUND ;
+ M_PENDATA->m_nbDash = 0 ;
+ M_PENDATA->m_dash = (wxDash*)NULL;
+ M_PENDATA->m_hPen = 0 ;
- RealizeResource();
+ RealizeResource();
- if ( wxThePenList )
- wxThePenList->AddPen(this);
+ if (wxThePenList)
+ wxThePenList->AddPen(this);
}
bool wxPen::RealizeResource()
{
- if (M_PENDATA && (M_PENDATA->m_hPen == 0))
- {
- if (M_PENDATA->m_style==wxTRANSPARENT)
- {
- M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN);
- return TRUE;
- }
-
- COLORREF ms_colour = 0 ;
- 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 (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_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) ;
-
- LOGBRUSH logb ;
-
- switch(M_PENDATA->m_join)
- {
- case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL ; break ;
- case wxJOIN_MITER: ms_style |= PS_JOIN_MITER ; break ;
- default:
- case wxJOIN_ROUND: ms_style |= PS_JOIN_ROUND ; break ;
- }
-
- switch(M_PENDATA->m_cap)
- {
- case wxCAP_PROJECTING: ms_style |= PS_ENDCAP_SQUARE ; break ;
- case wxCAP_BUTT: ms_style |= PS_ENDCAP_FLAT ; break ;
- default:
- case wxCAP_ROUND: ms_style |= PS_ENDCAP_ROUND ; break ;
- }
-
- switch(M_PENDATA->m_style)
- {
- case wxSTIPPLE:
- logb.lbStyle = BS_PATTERN ;
- if (M_PENDATA->m_stipple.Ok())
- logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP() ;
- else
- 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_SOLID ;
- // this should be unnecessary (it's unused) but suppresses the Purigy
- // messages about uninitialized memory read
+ if (M_PENDATA && (M_PENDATA->m_hPen == 0))
+ {
+ if (M_PENDATA->m_style==wxTRANSPARENT)
+ {
+ M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN);
+ return TRUE;
+ }
+
+ COLORREF ms_colour = 0;
+ 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!!]
+#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_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);
+
+ switch(M_PENDATA->m_join)
+ {
+ case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL; break;
+ case wxJOIN_MITER: ms_style |= PS_JOIN_MITER; break;
+ default:
+ case wxJOIN_ROUND: ms_style |= PS_JOIN_ROUND; break;
+ }
+
+ switch(M_PENDATA->m_cap)
+ {
+ case wxCAP_PROJECTING: ms_style |= PS_ENDCAP_SQUARE; break;
+ case wxCAP_BUTT: ms_style |= PS_ENDCAP_FLAT; break;
+ default:
+ case wxCAP_ROUND: ms_style |= PS_ENDCAP_ROUND; break;
+ }
+
+ LOGBRUSH logb;
+
+ switch(M_PENDATA->m_style)
+ {
+ case wxSTIPPLE:
+ logb.lbStyle = BS_PATTERN ;
+ if (M_PENDATA->m_stipple.Ok())
+ logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP();
+ else
+ 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_SOLID;
#ifdef __WXDEBUG__
- logb.lbHatch = 0;
+ // this should be unnecessary (it's unused) but suppresses the Purigy
+ // messages about uninitialized memory read
+ logb.lbHatch = 0;
#endif
- break ;
- }
- logb.lbColor = ms_colour ;
- wxDash *real_dash ;
- if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
- {
- wxBell();
- 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 ;
- }
- else
- real_dash = 0 ;
-
- // 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
- M_PENDATA->m_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour);
-
- if (real_dash)
- delete [] real_dash ;
- }
+ break;
+ }
+
+ logb.lbColor = ms_colour;
+
+ wxMSWDash *real_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, dsh;
+ for (i=0; i<M_PENDATA->m_nbDash; i++)
+ real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
+ }
+ else
+ {
+ 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,
+ (LPDWORD)real_dash );
+ }
+ else
+ {
+ M_PENDATA->m_hPen =
+ (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+ M_PENDATA->m_width,
+ ms_colour );
+ }
+
+ if (real_dash)
+ delete [] real_dash;
+ }
#else
- 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 );
#endif
#ifdef WXDEBUG_CREATE
- if (M_PENDATA->m_hPen==0)
- wxError("Cannot create pen","Internal error") ;
+ if (M_PENDATA->m_hPen==0)
+ wxError("Cannot create pen","Internal error") ;
#endif
- return TRUE;
- }
- return FALSE;
+ return TRUE;
+ }
+ return FALSE;
}
WXHANDLE wxPen::GetResourceHandle()
{
- 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 wx2msPenStyle(int wx_style)
{
- int cstyle;
-/***
-#ifdef __WIN32__
- DWORD vers = GetVersion() ;
- WORD high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s
+ int cstyle;
+ switch (wx_style)
+ {
+#if !defined(__WXMICROWIN__)
+ case wxDOT:
+ cstyle = PS_DOT;
+ break;
+
+ case wxDOT_DASH:
+ cstyle = PS_DASHDOT;
+ break;
+
+ case wxSHORT_DASH:
+ case wxLONG_DASH:
+ cstyle = PS_DASH;
+ break;
+
+ case wxTRANSPARENT:
+ cstyle = PS_NULL;
+ break;
#endif
-***/
- switch (wx_style)
- {
- case wxDOT:
- cstyle = PS_DOT;
- break;
- case wxSHORT_DASH:
- case wxLONG_DASH:
- cstyle = PS_DASH;
- break;
- case wxTRANSPARENT:
- cstyle = PS_NULL;
- break;
- case wxUSER_DASH:
- // User dash style not supported on Win3.1, sorry...
+
+ case wxUSER_DASH:
+#if !defined(__WXMICROWIN__)
#ifdef __WIN32__
- // Win32s doesn't have PS_USERSTYLE
-/***
- if ((high&0x8000)==0)
-***/
- if (wxGetOsVersion()==wxWINDOWS_NT)
- cstyle = PS_USERSTYLE ;
- else
- cstyle = PS_DOT ; // We must make a choice... This is mine!
+ // Win32s doesn't have PS_USERSTYLE
+ 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 ;
+ cstyle = PS_DASH;
#endif
- break ;
- case wxSOLID:
- default:
- cstyle = PS_SOLID;
- break;
- }
- return cstyle;
+#endif
+ break;
+ case wxSOLID:
+ default:
+ cstyle = PS_SOLID;
+ break;
+ }
+ return cstyle;
}
projects / wxWidgets.git / blobdiff