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

Derive wxGenericFileCtrl from wxControl.

Browse Source 
wxFileCtrl -- which can be #define'd as wxGenericFileCtrl -- is documented to
inherit from wxControl and does derive from it in the native GTK version, so
do it for the generic version too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-04 22:20:55 +00:00
parent 43868fdedc
commit 5804d539be
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/filectrlg.h
View File

@@ -14,7 +14,7 @@
#if wxUSE_FILECTRL #if wxUSE_FILECTRL
#include "wx/panel.h" #include "wx/containr.h"
#include "wx/listctrl.h" #include "wx/listctrl.h"
#include "wx/filectrl.h" #include "wx/filectrl.h"
#include "wx/filename.h" #include "wx/filename.h"
@@ -182,7 +182,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxPanel, class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled<wxControl>,
public wxFileCtrlBase public wxFileCtrlBase
{ {
public: public:

10
src/generic/filectrlg.cpp
View File

@@ -883,9 +883,9 @@ wxFileListCtrl::~wxFileListCtrl()
// wxGenericFileCtrl implementation // wxGenericFileCtrl implementation
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxPanel ) IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxPanel ) BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected ) EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected )
EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated ) EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated )
EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter ) EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter )
@@ -916,7 +916,11 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ), wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ),
wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) ); wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) );
wxPanel::Create( parent, id, pos, size, wxTAB_TRAVERSAL, name ); wxNavigationEnabled<wxControl>::Create( parent, id,
pos, size,
wxTAB_TRAVERSAL,
wxDefaultValidator,
name );
m_dir = defaultDirectory; m_dir = defaultDirectory;