X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb04da13bddf9c70028b7adb55ac4efbb92ce4d4..ded960e328786ae4434e81091ef2e86abf0cd6cb:/src/osx/window_osx.cpp diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 6e941b3166..7fd9f067d9 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -387,7 +387,7 @@ bool wxWindowMac::MacIsUserPane() const /* * Right now we have the following setup : * a border that is not part of the native control is always outside the - * control's border (otherwise we loose all native intelligence, future ways + * control's border (otherwise we lose all native intelligence, future ways * may be to have a second embedding control responsible for drawing borders * and backgrounds eventually) * so all this border calculations have to be taken into account when calling @@ -2621,7 +2621,7 @@ wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler), UInt32 modifiers ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; - GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); + GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode ); GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); @@ -2876,4 +2876,4 @@ bool wxWidgetImpl::NeedsFrame() const void wxWidgetImpl::SetDrawingEnabled(bool WXUNUSED(enabled)) { -} \ No newline at end of file +}