From 4d98fefce72245fbbe2de6434445e05b5c74786e Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 23 Mar 2008 14:54:09 +0000 Subject: [PATCH] Fixed compilation after wxBrushStyle/wxPenStyle changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/brush.h | 4 ++-- include/wx/os2/pen.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index ec7706c241..d5a5f46df4 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -65,8 +65,8 @@ public: virtual void SetStipple(const wxBitmap& rStipple); inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); }; - virtual wxBrushStyle GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); }; - inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); }; + virtual wxBrushStyle GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : wxBRUSHSTYLE_INVALID); }; + inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : NULL); }; inline int GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); }; // diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index 2a745cb584..370de02317 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -35,8 +35,8 @@ public: m_nJoin == data.m_nJoin && m_nCap == data.m_nCap && m_vColour == data.m_vColour && - (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) && - (m_nStyle != wxUSER_DASH || + (m_nStyle != wxPENSTYLE_STIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) && + (m_nStyle != wxPENSTYLE_USER_DASH || (m_dash == data.m_dash && memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); } @@ -101,15 +101,15 @@ public: void SetPS(HPS hPS); inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_vColour : wxNullColour); }; - inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_nWidth : 0); }; - inline wxPenStyle GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_nStyle : 0); }; - inline wxPenJoin GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : 0); }; - inline wxPenCap GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : 0); }; + inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_nWidth : -1); }; + inline wxPenStyle GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_nStyle : wxPENSTYLE_INVALID); }; + inline wxPenJoin GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : wxJOIN_INVALID); }; + inline wxPenCap GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : wxCAP_INVALID); }; inline int GetPS(void) const { return (M_PENDATA ? M_PENDATA->m_hPen : 0); }; inline int GetDashes(wxDash **ptr) const { *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_nbDash : 0); + return (M_PENDATA ? M_PENDATA->m_nbDash : -1); } inline wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); }; inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }; -- 2.45.2