Derive wxWebViewEvent from wxNotifyEvent.

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

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 1a55bb9576f6f60a5e8218d639ef7e08dfa5ca07..27d9b1e80907cfa841b70edc55c4fcd018393efd 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -95,10 +95,10 @@ void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap,
     m_dc.SetTextForeground(m_window->GetForegroundColour());
 
     wxString label = m_window->GetLabel();
     m_dc.SetTextForeground(m_window->GetForegroundColour());
 
     wxString label = m_window->GetLabel();

-    if ( !label.empty() || bitmap.Ok() )
+    if ( !label.empty() || bitmap.IsOk() )

     {
         wxRect rectLabel = m_rect;
     {
         wxRect rectLabel = m_rect;

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

         {
             rectLabel.Inflate(-marginX, -marginY);
         }
         {
             rectLabel.Inflate(-marginX, -marginY);
         }


@@ -158,7 +158,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
 {
     // we may change the bitmap if we stretch it
     wxBitmap bmp = bitmap;
 {
     // we may change the bitmap if we stretch it
     wxBitmap bmp = bitmap;

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

         return;
 
     int width = bmp.GetWidth(),
         return;
 
     int width = bmp.GetWidth(),