Avoid outputting the assert message twice in non-GUI code.

[wxWidgets.git] / src / mgl / pen.cpp

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 62db79bdf8d2cf16265d798977f2f673c3ae64cf..3eff4b729cab46aaa777597b905ce046cc15c6d5 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -38,26 +38,26 @@ public:
         // we intentionally don't compare m_hPen fields here
         return m_style == data.m_style &&
                m_width == data.m_width &&
         // we intentionally don't compare m_hPen fields here
         return m_style == data.m_style &&
                m_width == data.m_width &&

-               memcmp(m_pixPattern,
-                      data.m_pixPattern, sizeof(m_pixPattern)) == 0 &&
+               memcmp(&m_pixPattern,
+                      &data.m_pixPattern, sizeof(m_pixPattern)) == 0 &&

                m_capStyle == data.m_capStyle &&
                m_joinStyle == data.m_joinStyle &&
                m_colour == data.m_colour &&
                m_capStyle == data.m_capStyle &&
                m_joinStyle == data.m_joinStyle &&
                m_colour == data.m_colour &&

-               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
-               (m_style != wxUSER_DASH ||
+               (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
+               (m_style != wxPENSTYLE_USER_DASH ||

                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
     }
 
     int            m_width;
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
     }
 
     int            m_width;

-    int            m_style;
+    wxPenStyle     m_style;

     wxColour       m_colour;
     wxBitmap       m_stipple;
     pixpattern24_t m_pixPattern;
 
     // not used by wxMGL, but we want to preserve values
     wxColour       m_colour;
     wxBitmap       m_stipple;
     pixpattern24_t m_pixPattern;
 
     // not used by wxMGL, but we want to preserve values

-    int            m_joinStyle;
-    int            m_capStyle;
+    wxPenJoin      m_joinStyle;
+    wxPenCap       m_capStyle;

     int            m_countDashes;
     wxDash        *m_dash;
 };
     int            m_countDashes;
     wxDash        *m_dash;
 };


@@ -65,10 +65,10 @@ public:
 wxPenRefData::wxPenRefData()
 {
     m_width = 1;
 wxPenRefData::wxPenRefData()
 {
     m_width = 1;

-    m_style = wxSOLID;
+    m_style = wxPENSTYLE_SOLID;

     m_joinStyle = wxJOIN_ROUND;
     m_capStyle = wxCAP_ROUND;
     m_joinStyle = wxJOIN_ROUND;
     m_capStyle = wxCAP_ROUND;

-    m_dash = (wxDash*) NULL;
+    m_dash = NULL;

     m_countDashes = 0;
 
     int x, y, c;
     m_countDashes = 0;
 
     int x, y, c;


@@ -102,7 +102,7 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

-wxPen::wxPen(const wxColour &colour, int width, int style)
+wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)

 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;


@@ -110,15 +110,25 @@ wxPen::wxPen(const wxColour &colour, int width, int style)
     M_PENDATA->m_colour = colour;
 }
 
     M_PENDATA->m_colour = colour;
 }
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)
+{
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = (wxPenStyle)style;
+    M_PENDATA->m_colour = colour;
+}
+#endif
+

 wxPen::wxPen(const wxBitmap& stipple, int width)
 {
 wxPen::wxPen(const wxBitmap& stipple, int width)
 {

-    wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") );

     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,

-                  _T("stipple bitmap must be 8x8") );
+                  wxT("stipple bitmap must be 8x8") );

 
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
 
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;

-    M_PENDATA->m_style = wxSTIPPLE;
+    M_PENDATA->m_style = wxPENSTYLE_STIPPLE;

     M_PENDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
 }
     M_PENDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
 }


@@ -156,19 +166,19 @@ void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue
     M_PENDATA->m_colour.Set(red, green, blue);
 }
 
     M_PENDATA->m_colour.Set(red, green, blue);
 }
 

-void wxPen::SetCap(int capStyle)
+void wxPen::SetCap(wxPenCap capStyle)

 {
     AllocExclusive();
     M_PENDATA->m_capStyle = capStyle;
 }
 
 {
     AllocExclusive();
     M_PENDATA->m_capStyle = capStyle;
 }
 

-void wxPen::SetJoin(int joinStyle)
+void wxPen::SetJoin(wxPenJoin joinStyle)

 {
     AllocExclusive();
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 {
     AllocExclusive();
     M_PENDATA->m_joinStyle = joinStyle;
 }
 

-void wxPen::SetStyle(int style)
+void wxPen::SetStyle(wxPenStyle style)

 {
     AllocExclusive();
     M_PENDATA->m_style = style;
 {
     AllocExclusive();
     M_PENDATA->m_style = style;


@@ -176,9 +186,9 @@ void wxPen::SetStyle(int style)
 
 void wxPen::SetStipple(const wxBitmap& stipple)
 {
 
 void wxPen::SetStipple(const wxBitmap& stipple)
 {

-    wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") );

     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,

-                  _T("stipple bitmap must be 8x8") );
+                  wxT("stipple bitmap must be 8x8") );

 
     AllocExclusive();
     M_PENDATA->m_stipple = stipple;
 
     AllocExclusive();
     M_PENDATA->m_stipple = stipple;


@@ -193,35 +203,41 @@ void wxPen::SetWidth(int width)
 
 int wxPen::GetDashes(wxDash **ptr) const
 {
 
 int wxPen::GetDashes(wxDash **ptr) const
 {

-     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
-     return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    *ptr = (wxDash*)M_PENDATA->m_dash;
+    return M_PENDATA->m_countDashes;

 }
 
 int wxPen::GetDashCount() const
 {
 }
 
 int wxPen::GetDashCount() const
 {

+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+

     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {
     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {

+    wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+

     return (wxDash*)M_PENDATA->m_dash;
 }
 
     return (wxDash*)M_PENDATA->m_dash;
 }
 

-int wxPen::GetCap() const
+wxPenCap wxPen::GetCap() const

 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_capStyle;
 }
 
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_capStyle;
 }
 

-int wxPen::GetJoin() const
+wxPenJoin wxPen::GetJoin() const

 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_joinStyle;
 }
 
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_joinStyle;
 }
 

-int wxPen::GetStyle() const
+wxPenStyle wxPen::GetStyle() const

 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 


@@ -235,7 +251,7 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
     return M_PENDATA->m_width;
 }
 

-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const

 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 


@@ -257,17 +273,12 @@ void* wxPen::GetPixPattern() const
 }
 
 
 }
 
 

-bool wxPen::IsOk() const
-{
-    return (m_refData != NULL);
-}
-
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const

 {
     return new wxPenRefData;
 }
 
 {
     return new wxPenRefData;
 }
 

-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }