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

Don't enable dialog navigation inside wxFrame by default.

Browse Source 
This was done, apparently accidentally, by r68366 and resulted in cursor arrow
keys not being sent by default to the wxFrame children under MSW any more as
they were used for dialog navigation instead.

So don't derive wxTopLevelWindow from wxNavigationEnabled<> any more and only
derive from it at wxDialog level.

Closes #15445.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-08-27 22:49:53 +00:00
parent ef3ea7e50c
commit 35d6156ba4
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dialog.h
View File

@@ -11,8 +11,8 @@
#ifndef _WX_DIALOG_H_BASE_ #ifndef _WX_DIALOG_H_BASE_
#define _WX_DIALOG_H_BASE_ #define _WX_DIALOG_H_BASE_
#include "wx/defs.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/containr.h"
class WXDLLIMPEXP_FWD_CORE wxSizer; class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer; class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
@@ -64,7 +64,7 @@ enum wxDialogModality
extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow class WXDLLIMPEXP_CORE wxDialogBase : public wxNavigationEnabled<wxTopLevelWindow>
{ {
public: public:
wxDialogBase(); wxDialogBase();

4
include/wx/toplevel.h
View File

@@ -19,7 +19,6 @@
#include "wx/nonownedwnd.h" #include "wx/nonownedwnd.h"
#include "wx/iconbndl.h" #include "wx/iconbndl.h"
#include "wx/containr.h"
#include "wx/weakref.h" #include "wx/weakref.h"
// the default names for various classes // the default names for various classes
@@ -156,8 +155,7 @@ enum
// wxTopLevelWindow: a top level (as opposed to child) window // wxTopLevelWindow: a top level (as opposed to child) window
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxTopLevelWindowBase : class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow
public wxNavigationEnabled<wxNonOwnedWindow>
{ {
public: public:
// construction // construction