Removing manual focus handling

see https://github.com/wxWidgets/wxWidgets/pull/672 , commit 61b1a9a3533d4e16b2b7a9441e42766d8d9655c7 , revert this change if problems arise to see whether this is a recursion
This commit is contained in:
Stefan Csomor
2018-01-18 19:42:08 +01:00
parent 0a966eb145
commit a1cf0e1cd4
3 changed files with 1 additions and 69 deletions

View File

@@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
{
public:
// construction
wxFrame() { Init(); }
wxFrame() { }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
@@ -30,8 +30,6 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Init();
Create(parent, id, title, pos, size, style, name);
}
@@ -75,19 +73,12 @@ public:
const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
#endif // wxUSE_STATUSBAR
// called by wxWindow whenever it gets focus
void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
wxWindow *GetLastFocus() const { return m_winLastFocused; }
void PositionBars();
// internal response to size events
virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); }
protected:
// common part of all ctors
void Init();
#if wxUSE_TOOLBAR
virtual void PositionToolBar() wxOVERRIDE;
#endif
@@ -104,9 +95,6 @@ protected:
virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
#endif
// the last focused child: we restore focus to it on activation
wxWindow *m_winLastFocused;
virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE;
wxDECLARE_EVENT_TABLE();