wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 9b8315efcf454d6f62e3f4b3fe8ecadc26e31844..3eff4b729cab46aaa777597b905ce046cc15c6d5 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -43,8 +43,8 @@ public:
                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));
     }
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
     }


@@ -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;


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

-wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style)
+#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;
 }
 {
     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);
 }


@@ -184,9 +186,9 @@ void wxPen::SetStyle(wxPenStyle 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;


@@ -201,17 +203,23 @@ 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;
 }
 


@@ -243,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") );