X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3ebca94dddd57008b48c466d3e4919ba4e6a6f4..233387bdcbb1c4f31c54b0fe6b3f03e8d261cab1:/src/msw/pen.cpp diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index d072864e47..1ddd61e07f 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,10 +9,6 @@ // 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" @@ -22,7 +18,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -263,41 +258,41 @@ bool wxPen::RealizeResource() 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) @@ -401,4 +396,3 @@ int wx2msPenStyle(int wx_style) #endif return PS_SOLID; } -