Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

separate non-native key handling from IsUserPane

Browse Source 
NSOpenGLView is needed under 10.14 as a native view, but it doesn’t have its own native key handling, therefore use the same code we have for non-native custom views.
This commit is contained in:
Stefan Csomor
2019-01-03 13:26:50 +01:00
parent 155a19a1a2
commit a29ea16ccd
5 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/osx/cocoa/private.h
View File

@@ -50,6 +50,7 @@ class WXDLLIMPEXP_FWD_CORE wxDialog;
class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
{
public :
wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane, bool wantsUserKey ) ;
wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
wxWidgetCocoaImpl() ;
~wxWidgetCocoaImpl();

6
include/wx/osx/core/private.h
View File

@@ -216,6 +216,7 @@ protected :
class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
{
public :
wxWidgetImpl( wxWindowMac* peer , bool isRootControl, bool isUserPane, bool wantsUserKey );
wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
wxWidgetImpl();
virtual ~wxWidgetImpl();
@@ -224,8 +225,12 @@ public :
bool IsRootControl() const { return m_isRootControl; }
// is a completely control that has all events handled in wx code, no built-ins
bool IsUserPane() const { return m_isUserPane; }
// we are doing keyboard handling in wx code, other events might be handled natively
virtual bool HasUserKeyHandling() const { return m_wantsUserKey; }
wxWindowMac* GetWXPeer() const { return m_wxPeer; }
bool IsOk() const { return GetWXWidget() != NULL; }
@@ -572,6 +577,7 @@ public :
protected :
bool m_isRootControl;
bool m_isUserPane;
bool m_wantsUserKey;
wxWindowMac* m_wxPeer;
bool m_needsFocusRect;
bool m_needsFrame;