X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef59847c6ce9d1786d9ca5b734932ccd7201129a..f5766910b6731eb03e82371416e9778203396ce7:/src/msw/pen.cpp?ds=sidebyside diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index a5199247b2..92b08327a6 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/pen.cpp +// Name: src/msw/pen.cpp // Purpose: wxPen // Author: Julian Smart // Modified by: @@ -9,29 +9,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "pen.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" #include "wx/pen.h" + +#ifndef WX_PRECOMP + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" #endif #include "wx/msw/private.h" -int wx2msPenStyle(int wx_style); +static int wx2msPenStyle(int wx_style); IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) @@ -47,6 +43,7 @@ wxPenRefData::wxPenRefData() } wxPenRefData::wxPenRefData(const wxPenRefData& data) + :wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; @@ -60,8 +57,8 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data) wxPenRefData::~wxPenRefData() { - if ( m_hPen ) - ::DeleteObject((HPEN) m_hPen); + if ( m_hPen ) + ::DeleteObject((HPEN) m_hPen); } // Pens @@ -89,31 +86,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style) M_PENDATA->m_dash = (wxDash*)NULL; M_PENDATA->m_hPen = 0 ; -#ifndef __WIN32__ - // In Windows, only a pen of width = 1 can be dotted or dashed! - if ((Style == wxDOT) || (Style == wxLONG_DASH) || - (Style == wxSHORT_DASH) || (Style == wxDOT_DASH) || - (Style == wxUSER_DASH)) - M_PENDATA->m_width = 1; -#else -/*** - DWORD vers = GetVersion() ; - WORD high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s - // Win32s doesn't support wide dashed pens - - if ((high&0x8000)!=0) -***/ - if (wxGetOsVersion()==wxWIN32S) - { - // In Windows, only a pen of width = 1 can be dotted or dashed! - if ((Style == wxDOT) || (Style == wxLONG_DASH) || - (Style == wxSHORT_DASH) || (Style == wxDOT_DASH) || - (Style == wxUSER_DASH)) - M_PENDATA->m_width = 1; - } -#endif RealizeResource(); - } wxPen::wxPen(const wxBitmap& stipple, int Width) @@ -131,191 +104,185 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) M_PENDATA->m_hPen = 0 ; RealizeResource(); - } bool wxPen::RealizeResource() { - if (M_PENDATA && (M_PENDATA->m_hPen == 0)) + if ( !M_PENDATA || M_PENDATA->m_hPen ) + return false; + + if (M_PENDATA->m_style==wxTRANSPARENT) + { + M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN); + return true; + } + + static const int os = wxGetOsVersion(); + COLORREF ms_colour = M_PENDATA->m_colour.GetPixel(); + + // Join style, Cap style, Pen Stippling +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + // Only NT can display dashed or dotted lines with width > 1 + if ( os != wxOS_WINDOWS_NT && + (M_PENDATA->m_style == wxDOT || + M_PENDATA->m_style == wxLONG_DASH || + M_PENDATA->m_style == wxSHORT_DASH || + M_PENDATA->m_style == wxDOT_DASH || + M_PENDATA->m_style == wxUSER_DASH) && + M_PENDATA->m_width > 1 ) { - if (M_PENDATA->m_style==wxTRANSPARENT) + M_PENDATA->m_width = 1; + } + + 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) { - M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN); - return TRUE; + 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; } - 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!!] -#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 && - M_PENDATA->m_style!=wxSTIPPLE && - M_PENDATA->m_width <= 1) + switch(M_PENDATA->m_cap) { - M_PENDATA->m_hPen = - (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style), - M_PENDATA->m_width, - ms_colour ); + 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; } - else + + LOGBRUSH logb; + + switch(M_PENDATA->m_style) { - 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; + 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__ - // this should be unnecessary (it's unused) but suppresses the Purigy - // messages about uninitialized memory read - logb.lbHatch = 0; + // this should be unnecessary (it's unused) but suppresses the Purify + // messages about uninitialized memory read + logb.lbHatch = 0; #endif - 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 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 - { - 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; + break; } -#else + + 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 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 + { + real_dash = (wxMSWDash*)NULL; + } + 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") ; -#endif - return TRUE; - } - return FALSE; + (WXHPEN) ExtCreatePen( ms_style, + M_PENDATA->m_width, + &logb, + M_PENDATA->m_style == wxUSER_DASH + ? M_PENDATA->m_nbDash + : 0, + (LPDWORD)real_dash ); + + delete [] real_dash; + } +#else // WinCE + M_PENDATA->m_hPen = + (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style), + M_PENDATA->m_width, + ms_colour ); +#endif // !WinCE/WinCE + + return true; } 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 WXUNUSED(force)) { - if (M_PENDATA && (M_PENDATA->m_hPen != 0)) - { - DeleteObject((HPEN) M_PENDATA->m_hPen); - M_PENDATA->m_hPen = 0; - return TRUE; - } - else return FALSE; + if (M_PENDATA && (M_PENDATA->m_hPen != 0)) + { + DeleteObject((HPEN) M_PENDATA->m_hPen); + M_PENDATA->m_hPen = 0; + return true; + } + else return false; } bool wxPen::IsFree() const { - return (M_PENDATA && M_PENDATA->m_hPen == 0); + return (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) @@ -394,46 +361,27 @@ void wxPen::SetCap(int Cap) int wx2msPenStyle(int wx_style) { - int cstyle; +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) switch (wx_style) { -#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - 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 + case wxDOT: + return PS_DOT; - case wxUSER_DASH: -#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) -#ifdef __WIN32__ - // 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! + case wxDOT_DASH: + return PS_DASHDOT; + + case wxSHORT_DASH: + case wxLONG_DASH: + return PS_DASH; + + case wxTRANSPARENT: + return PS_NULL; + + case wxUSER_DASH: + return PS_USERSTYLE; + } #else - cstyle = PS_DASH; + wxUnusedVar(wx_style); #endif -#endif - break; - case wxSOLID: - default: - cstyle = PS_SOLID; - break; - } - return cstyle; + return PS_SOLID; } -