always use hw-accel, fixes #15536, applied with thanks

[wxWidgets.git] / src / cocoa / window.mm

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 33eb677dfb72e4e2e25e76998193e8cca4a0a908..9463e33ee63ca0931c5391f55891f51a0ace4640 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -4,9 +4,8 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -357,9 +356,9 @@ bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
 
 
 /*! @class WXManualScrollView
-    @abstract   An NSScrollView subclass which implements wx scroll behavior
+    @abstract   An NSScrollView subclass which implements wx scroll behaviour
     @discussion
-    Overrides default behavior of NSScrollView such that this class receives
+    Overrides default behaviour of NSScrollView such that this class receives
     the scroller action messages and allows the wxCocoaScrollView to act
     on them accordingly.  In particular, because the NSScrollView will not
     receive action messages from the scroller, it will not adjust the
@@ -557,7 +556,7 @@ void wxWindowCocoaScrollView::Encapsulate()
     // Set the scroll view autoresizingMask to match the current NSView
     [m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]];
     [m_owner->GetNSView() setAutoresizingMask: NSViewNotSizable];
-    // NOTE: replaceSubView will cause m_cocaNSView to be released
+    // NOTE: replaceSubView will cause m_cocoaNSView to be released
     // except when it hasn't been added into an NSView hierarchy in which
     // case it doesn't need to be and this should work out to a no-op
     m_owner->CocoaReplaceView(m_owner->GetNSView(), m_cocoaNSScrollView);
@@ -735,7 +734,7 @@ int wxWindowCocoaScrollView::GetScrollPos(wxOrientation orient)
         position is at range-thumbsize.
 
         The range of an NSScroller is 0.0 to 1.0.  Much easier! NOTE: Apple doesn't really specify
-        but GNUStep docs do say that 0.0 is top/left and 1.0 is bottom/right.  This is actualy
+        but GNUStep docs do say that 0.0 is top/left and 1.0 is bottom/right.  This is actually
         in contrast to NSSlider which generally has 1.0 at the TOP when it's done vertically.
      */
     CGFloat cocoaScrollPos = [cocoaScroller floatValue];
@@ -928,8 +927,6 @@ void wxWindowCocoaScrollView::Cocoa_FrameChanged(void)
 // normally the base classes aren't included, but wxWindow is special
 #ifdef __WXUNIVERSAL__
 IMPLEMENT_ABSTRACT_CLASS(wxWindowCocoa, wxWindowBase)
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxWindowCocoa, wxWindowBase)
@@ -1454,10 +1451,10 @@ bool wxWindow::Show(bool show)
         // Create a new view to stand in for the real one (via wxWindowCocoaHider) and replace
         // the real one with the stand in.
         m_cocoaHider = new wxWindowCocoaHider(this);
-        // NOTE: replaceSubview:with will cause m_cocaNSView to be
+        // NOTE: replaceSubview:with will cause m_cocoaNSView to be
         // (auto)released which balances out addSubview
         CocoaReplaceView(cocoaView, m_cocoaHider->GetNSView());
-        // m_coocaNSView is now only retained by us
+        // m_cocoaNSView is now only retained by us
         wxASSERT([m_cocoaHider->GetNSView() superview]);
         wxASSERT(![cocoaView superview]);
     }