Fix history in wxWebViewIE when using a custom file scheme.

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 3adbc2c67e1a918c9feccc6f9b9b1ae1bd9967e9..00115ba251b4ba42d4f7d94cf8927127d08cb350 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -444,7 +444,8 @@ void wxWindowMac::MacChildAdded()
 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
+void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos),
+                                       const wxSize& WXUNUSED(size))

 {
     // todo remove if refactoring works correctly
 #if 0
 {
     // todo remove if refactoring works correctly
 #if 0


@@ -475,7 +476,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created
 {
     // Don't assert, in case we set the window variant before
     // the window is created

-    // wxASSERT( GetPeer()->Ok() ) ;
+    // wxASSERT( GetPeer()->IsOk() ) ;

 
     m_windowVariant = variant ;
 
 
     m_windowVariant = variant ;
 


@@ -588,7 +589,7 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 {
     if (m_growBox)
     {
 {
     if (m_growBox)
     {

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

             m_growBox->SetBackgroundColour(m_backgroundColour);
         else
             m_growBox->SetBackgroundColour(*wxWHITE);
             m_growBox->SetBackgroundColour(m_backgroundColour);
         else
             m_growBox->SetBackgroundColour(*wxWHITE);


@@ -897,7 +898,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
             return false ;
     }
 
             return false ;
     }
 

-    wxASSERT_MSG( m_cursor.Ok(),
+    wxASSERT_MSG( m_cursor.IsOk(),

         wxT("cursor must be valid after call to the base version"));
 
     if ( GetPeer() != NULL )
         wxT("cursor must be valid after call to the base version"));
 
     if ( GetPeer() != NULL )


@@ -1560,7 +1561,7 @@ void  wxWindowMac::MacPaintGrowBox()
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
         CGContextSaveGState( cgContext );
 
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
         CGContextSaveGState( cgContext );
 

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

         {
             CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
         }
         {
             CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
         }


@@ -1573,7 +1574,7 @@ void  wxWindowMac::MacPaintGrowBox()
 #else
         if (m_growBox)
         {
 #else
         if (m_growBox)
         {

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

                  m_growBox->SetBackgroundColour(m_backgroundColour);
              else
                  m_growBox->SetBackgroundColour(*wxWHITE);
                  m_growBox->SetBackgroundColour(m_backgroundColour);
              else
                  m_growBox->SetBackgroundColour(*wxWHITE);


@@ -1831,18 +1832,18 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point

-            if ( !processedEvtSetCursor && m_cursor.Ok() )
+            if ( !processedEvtSetCursor && m_cursor.IsOk() )

                 cursor = m_cursor ;
 
             if ( !wxIsBusy() && !GetParent() )
                 cursor = *wxSTANDARD_CURSOR ;
         }
 
                 cursor = m_cursor ;
 
             if ( !wxIsBusy() && !GetParent() )
                 cursor = *wxSTANDARD_CURSOR ;
         }
 

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

             cursor.MacInstall() ;
     }
 
             cursor.MacInstall() ;
     }
 

-    return cursor.Ok() ;
+    return cursor.IsOk() ;

 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )
 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )