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

Rename internal tree widget to something more appropriate for

Browse Source 
a wxListCtrl.
This commit is contained in:
Graham Dawes
2019-02-05 08:06:26 +00:00
parent 5ec25fe755
commit eb00d7623a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/qt/listctrl.h
View File

@@ -10,7 +10,7 @@
#include "wx/textctrl.h" #include "wx/textctrl.h"
class wxQtTreeWidget; class wxQtListTreeWidget;
class QTreeWidgetItem; class QTreeWidgetItem;
class WXDLLIMPEXP_FWD_CORE wxImageList; class WXDLLIMPEXP_FWD_CORE wxImageList;
@@ -303,7 +303,7 @@ protected:
m_ownsImageListSmall, m_ownsImageListSmall,
m_ownsImageListState; m_ownsImageListState;
private: private:
wxQtTreeWidget *m_qtTreeWidget; wxQtListTreeWidget *m_qtTreeWidget;
wxDECLARE_DYNAMIC_CLASS( wxListCtrl ); wxDECLARE_DYNAMIC_CLASS( wxListCtrl );
}; };

22
src/qt/listctrl.cpp
View File

@@ -123,10 +123,10 @@ private:
wxDECLARE_NO_COPY_CLASS(wxQtItemEditorFactory); wxDECLARE_NO_COPY_CLASS(wxQtItemEditorFactory);
}; };
class wxQtTreeWidget : public wxQtEventSignalHandler< QTreeWidget, wxListCtrl > class wxQtListTreeWidget : public wxQtEventSignalHandler< QTreeWidget, wxListCtrl >
{ {
public: public:
wxQtTreeWidget( wxWindow *parent, wxListCtrl *handler ); wxQtListTreeWidget( wxWindow *parent, wxListCtrl *handler );
void EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int column) const; void EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int column) const;
@@ -156,18 +156,18 @@ private:
wxQtItemEditorFactory m_editorFactory; wxQtItemEditorFactory m_editorFactory;
}; };
wxQtTreeWidget::wxQtTreeWidget( wxWindow *parent, wxListCtrl *handler ) wxQtListTreeWidget::wxQtListTreeWidget( wxWindow *parent, wxListCtrl *handler )
: wxQtEventSignalHandler< QTreeWidget, wxListCtrl >( parent, handler ), : wxQtEventSignalHandler< QTreeWidget, wxListCtrl >( parent, handler ),
m_editorFactory(handler) m_editorFactory(handler)
{ {
connect(this, &QTreeWidget::itemClicked, this, &wxQtTreeWidget::itemClicked); connect(this, &QTreeWidget::itemClicked, this, &wxQtListTreeWidget::itemClicked);
connect(this, &QTreeWidget::itemPressed, this, &wxQtTreeWidget::itemPressed); connect(this, &QTreeWidget::itemPressed, this, &wxQtListTreeWidget::itemPressed);
connect(this, &QTreeWidget::itemActivated, this, &wxQtTreeWidget::itemActivated); connect(this, &QTreeWidget::itemActivated, this, &wxQtListTreeWidget::itemActivated);
ChangeEditorFactory(); ChangeEditorFactory();
} }
void wxQtTreeWidget::EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int column) const void wxQtListTreeWidget::EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int column) const
{ {
wxListCtrl *handler = GetHandler(); wxListCtrl *handler = GetHandler();
if ( handler ) if ( handler )
@@ -187,17 +187,17 @@ void wxQtTreeWidget::EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int
} }
} }
void wxQtTreeWidget::itemClicked(QTreeWidgetItem *qitem, int column) void wxQtListTreeWidget::itemClicked(QTreeWidgetItem *qitem, int column)
{ {
EmitListEvent(wxEVT_LIST_ITEM_SELECTED, qitem, column); EmitListEvent(wxEVT_LIST_ITEM_SELECTED, qitem, column);
} }
void wxQtTreeWidget::itemPressed(QTreeWidgetItem *qitem, int column) void wxQtListTreeWidget::itemPressed(QTreeWidgetItem *qitem, int column)
{ {
EmitListEvent(wxEVT_LIST_ITEM_SELECTED, qitem, column); EmitListEvent(wxEVT_LIST_ITEM_SELECTED, qitem, column);
} }
void wxQtTreeWidget::itemActivated(QTreeWidgetItem *qitem, int column) void wxQtListTreeWidget::itemActivated(QTreeWidgetItem *qitem, int column)
{ {
EmitListEvent(wxEVT_LIST_ITEM_ACTIVATED, qitem, column); EmitListEvent(wxEVT_LIST_ITEM_ACTIVATED, qitem, column);
} }
@@ -258,7 +258,7 @@ bool wxListCtrl::Create(wxWindow *parent,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
m_qtTreeWidget = new wxQtTreeWidget( parent, this ); m_qtTreeWidget = new wxQtListTreeWidget( parent, this );
if (style & wxLC_NO_HEADER) if (style & wxLC_NO_HEADER)
m_qtTreeWidget->setHeaderHidden(true); m_qtTreeWidget->setHeaderHidden(true);