Fixed some warnings

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 034a3476e44fb6186522ec9362b17e6c21fd68c4..518e4d91e0d60dd4692995c1ed59a29708ead66f 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -218,7 +218,7 @@ static int ConvertPenStyle(wxPenStyle style)
             return PS_NULL;
 
         default:
             return PS_NULL;
 
         default:

-            wxFAIL_MSG( _T("unknown pen style") );
+            wxFAIL_MSG( wxT("unknown pen style") );

             // fall through
 
 #ifdef wxHAVE_EXT_CREATE_PEN
             // fall through
 
 #ifdef wxHAVE_EXT_CREATE_PEN


@@ -258,7 +258,7 @@ static int ConvertJoinStyle(wxPenJoin join)
             return PS_JOIN_MITER;
 
         default:
             return PS_JOIN_MITER;
 
         default:

-            wxFAIL_MSG( _T("unknown pen join style") );
+            wxFAIL_MSG( wxT("unknown pen join style") );

             // fall through
 
         case wxJOIN_ROUND:
             // fall through
 
         case wxJOIN_ROUND:


@@ -277,7 +277,7 @@ static int ConvertCapStyle(wxPenCap cap)
             return PS_ENDCAP_FLAT;
 
         default:
             return PS_ENDCAP_FLAT;
 
         default:

-            wxFAIL_MSG( _T("unknown pen cap style") );
+            wxFAIL_MSG( wxT("unknown pen cap style") );

             // fall through
 
         case wxCAP_ROUND:
             // fall through
 
         case wxCAP_ROUND:


@@ -373,11 +373,9 @@ bool wxPenRefData::Alloc()
 
            default:
                lb.lbStyle = BS_SOLID;
 
            default:
                lb.lbStyle = BS_SOLID;

-#ifdef __WXDEBUG__

                // this should be unnecessary (it's unused) but suppresses the
                // Purify messages about uninitialized memory read
                lb.lbHatch = 0;
                // this should be unnecessary (it's unused) but suppresses the
                // Purify messages about uninitialized memory read
                lb.lbHatch = 0;

-#endif

                break;
        }
 
                break;
        }
 


@@ -542,42 +540,42 @@ void wxPen::SetCap(wxPenCap cap)
 
 wxColour wxPen::GetColour() const
 {
 
 wxColour wxPen::GetColour() const
 {

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

 
     return M_PENDATA->GetColour();
 }
 
 int wxPen::GetWidth() const
 {
 
     return M_PENDATA->GetColour();
 }
 
 int wxPen::GetWidth() const
 {

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

 
     return M_PENDATA->GetWidth();
 }
 
 wxPenStyle wxPen::GetStyle() const
 {
 
     return M_PENDATA->GetWidth();
 }
 
 wxPenStyle wxPen::GetStyle() const
 {

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

 
     return M_PENDATA->GetStyle();
 }
 
 wxPenJoin wxPen::GetJoin() const
 {
 
     return M_PENDATA->GetStyle();
 }
 
 wxPenJoin wxPen::GetJoin() const
 {

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

 
     return M_PENDATA->GetJoin();
 }
 
 wxPenCap wxPen::GetCap() const
 {
 
     return M_PENDATA->GetJoin();
 }
 
 wxPenCap wxPen::GetCap() const
 {

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

 
     return M_PENDATA->GetCap();
 }
 
 int wxPen::GetDashes(wxDash** ptr) const
 {
 
     return M_PENDATA->GetCap();
 }
 
 int wxPen::GetDashes(wxDash** ptr) const
 {

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

 
     *ptr = M_PENDATA->GetDash();
     return M_PENDATA->GetDashCount();
 
     *ptr = M_PENDATA->GetDash();
     return M_PENDATA->GetDashCount();


@@ -585,21 +583,21 @@ int wxPen::GetDashes(wxDash** ptr) const
 
 wxDash* wxPen::GetDash() const
 {
 
 wxDash* wxPen::GetDash() const
 {

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

 
     return m_refData ? M_PENDATA->GetDash() : NULL;
 }
 
 int wxPen::GetDashCount() const
 {
 
     return m_refData ? M_PENDATA->GetDash() : NULL;
 }
 
 int wxPen::GetDashCount() const
 {

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

 
     return m_refData ? M_PENDATA->GetDashCount() : 0;
 }
 
 wxBitmap* wxPen::GetStipple() const
 {
 
     return m_refData ? M_PENDATA->GetDashCount() : 0;
 }
 
 wxBitmap* wxPen::GetStipple() const
 {

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

 
     return m_refData ? M_PENDATA->GetStipple() : NULL;
 }
 
     return m_refData ? M_PENDATA->GetStipple() : NULL;
 }