Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

[wxWidgets.git] / src / univ / stdrend.cpp

diff --git a/src/univ/stdrend.cpp b/src/univ/stdrend.cpp
index 0159f76d777e155a4aaf312cf01542c3c342af8c..7f5451855dc55501168da3fb6e739f7120834aff 100644 (file)
--- a/src/univ/stdrend.cpp
+++ b/src/univ/stdrend.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxStdRenderer
 // Author:      Vadim Zeitlin
 // Created:     2006-09-16
 // Purpose:     implementation of wxStdRenderer
 // Author:      Vadim Zeitlin
 // Created:     2006-09-16

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -151,7 +150,7 @@ wxStdRenderer::ArrowDirection wxStdRenderer::GetArrowDirection(wxDirection dir)
             return Arrow_Down;
 
         default:
             return Arrow_Down;
 
         default:

-            wxFAIL_MSG(_T("unknown arrow direction"));
+            wxFAIL_MSG(wxT("unknown arrow direction"));

     }
 
     return Arrow_Max;
     }
 
     return Arrow_Max;


@@ -169,7 +168,7 @@ void wxStdRenderer::DrawBackground(wxDC& dc,
 {
     wxColour colBg;
 
 {
     wxColour colBg;
 

-    if (col.Ok())
+    if (col.IsOk())

     {
         colBg = col;
     }
     {
         colBg = col;
     }


@@ -438,7 +437,7 @@ void wxStdRenderer::DrawBorder(wxDC& dc,
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(_T("unknown border type"));
+            wxFAIL_MSG(wxT("unknown border type"));

             // fall through
 
         case wxBORDER_DEFAULT:
             // fall through
 
         case wxBORDER_DEFAULT:


@@ -471,7 +470,7 @@ wxRect wxStdRenderer::GetBorderDimensions(wxBorder border) const
             break;
 #endif
         default:
             break;
 #endif
         default:

-            wxFAIL_MSG(_T("unknown border type"));
+            wxFAIL_MSG(wxT("unknown border type"));

             // fall through
 
         case wxBORDER_DEFAULT:
             // fall through
 
         case wxBORDER_DEFAULT:


@@ -678,7 +677,7 @@ void wxStdRenderer::DrawCheckButton(wxDC& dc,
                                     wxAlignment align,
                                     int indexAccel)
 {
                                     wxAlignment align,
                                     int indexAccel)
 {

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

         DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel);
     else
         DrawCheckOrRadioButton(dc, label, GetCheckBitmap(flags), rect, flags, align, indexAccel);
         DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel);
     else
         DrawCheckOrRadioButton(dc, label, GetCheckBitmap(flags), rect, flags, align, indexAccel);


@@ -692,7 +691,7 @@ void wxStdRenderer::DrawRadioButton(wxDC& dc,
                                     wxAlignment align,
                                     int indexAccel)
 {
                                     wxAlignment align,
                                     int indexAccel)
 {

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

         DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel);
     else
         DrawCheckOrRadioButton(dc, label, GetRadioBitmap(flags), rect, flags, align, indexAccel);
         DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel);
     else
         DrawCheckOrRadioButton(dc, label, GetRadioBitmap(flags), rect, flags, align, indexAccel);


@@ -862,7 +861,7 @@ wxSize wxStdRenderer::GetStatusBarBorders() const
     wxRect flat = GetBorderDimensions(wxBORDER_STATIC);
     wxASSERT_MSG( raised.x == raised.width && raised.y == raised.height &&
                   flat.x == flat.width && flat.y == flat.height,
     wxRect flat = GetBorderDimensions(wxBORDER_STATIC);
     wxASSERT_MSG( raised.x == raised.width && raised.y == raised.height &&
                   flat.x == flat.width && flat.y == flat.height,

-                  _T("this code expects uniform borders, you must override GetStatusBarBorders") );
+                  wxT("this code expects uniform borders, you must override GetStatusBarBorders") );

 
     // take the larger of flat/raised values:
     wxSize border(wxMax(raised.x, flat.x), wxMax(raised.y, flat.y));
 
     // take the larger of flat/raised values:
     wxSize border(wxMax(raised.x, flat.x), wxMax(raised.y, flat.y));


@@ -892,6 +891,8 @@ void wxStdRenderer::DrawStatusField(wxDC& dc,
         DrawBorder(dc, wxBORDER_RAISED, rect, flags, &rectIn);
     else if ( style != wxSB_FLAT )
         DrawBorder(dc, wxBORDER_STATIC, rect, flags, &rectIn);
         DrawBorder(dc, wxBORDER_RAISED, rect, flags, &rectIn);
     else if ( style != wxSB_FLAT )
         DrawBorder(dc, wxBORDER_STATIC, rect, flags, &rectIn);

+    else
+        rectIn = rect;

 
     rectIn.Deflate(GetStatusBarFieldMargins());
 
 
     rectIn.Deflate(GetStatusBarFieldMargins());
 


@@ -1146,7 +1147,7 @@ void wxStdRenderer::DrawFrameIcon(wxDC& dc,
                                   const wxIcon& icon,
                                   int flags)
 {
                                   const wxIcon& icon,
                                   int flags)
 {

-    if ( icon.Ok() )
+    if ( icon.IsOk() )

     {
         wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR);
         dc.DrawIcon(icon, r.x, r.y);
     {
         wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR);
         dc.DrawIcon(icon, r.x, r.y);


@@ -1172,7 +1173,7 @@ void wxStdRenderer::DrawFrameButton(wxDC& dc,
     }
 
     wxBitmap bmp = GetFrameButtonBitmap(idx);
     }
 
     wxBitmap bmp = GetFrameButtonBitmap(idx);

-    if ( !bmp.Ok() )
+    if ( !bmp.IsOk() )

         return;
 
     wxRect rectBtn(x, y, FRAME_BUTTON_WIDTH, FRAME_BUTTON_HEIGHT);
         return;
 
     wxRect rectBtn(x, y, FRAME_BUTTON_WIDTH, FRAME_BUTTON_HEIGHT);