Skip to content

Patch to develop 7/23/25 #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brtietz merged 4 commits into from
Jul 23, 2025
Merged

Patch to develop 7/23/25 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f08d476
Update wxMetroDataViewTreeCtrl to handle notes icon for SAM issue 1552
sjanzou Jul 8, 2025
cdead94
Make wxMetroDataViewTreeCtrl not editable - SAM issue #1552
sjanzou Jul 9, 2025
ead8fc8
Update wxMetroDataViewTeeCtrl and address SAM issue 1552
sjanzou Jul 11, 2025
d2f5d6c
Merge pull request #188 from NREL/SAM_1552
sjanzou Jul 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 6 additions & 229 deletions include/wex/metro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,171 +425,7 @@ class wxMetroListBox : public wxScrolledWindow {
DECLARE_EVENT_TABLE();
};

//--------------------------------------------------------------------
class wxMetroDataViewTreeStoreNode
{
public:
wxMetroDataViewTreeStoreNode(wxMetroDataViewTreeStoreNode* parent,
const wxString& text,
wxClientData* data = NULL);
virtual ~wxMetroDataViewTreeStoreNode();

void SetText(const wxString& text)
{
m_text = text;
}
wxString GetText() const
{
return m_text;
}
void SetData(wxClientData* data)
{
delete m_data; m_data = data;
}
wxClientData* GetData() const
{
return m_data;
}

wxDataViewItem GetItem() const
{
return wxDataViewItem(const_cast<void*>(static_cast<const void*>(this)));
}

virtual bool IsContainer()
{
return false;
}

wxMetroDataViewTreeStoreNode* GetParent()
{
return m_parent;
}

private:
wxMetroDataViewTreeStoreNode* m_parent;
wxString m_text;
wxClientData* m_data;
};

typedef wxVector<wxMetroDataViewTreeStoreNode*> wxMetroDataViewTreeStoreNodes;

class wxMetroDataViewTreeStoreContainerNode : public wxMetroDataViewTreeStoreNode
{
public:
wxMetroDataViewTreeStoreContainerNode(wxMetroDataViewTreeStoreNode* parent,
const wxString& text,
wxClientData* data = NULL);
virtual ~wxMetroDataViewTreeStoreContainerNode();

const wxMetroDataViewTreeStoreNodes& GetChildren() const
{
return m_children;
}
wxMetroDataViewTreeStoreNodes& GetChildren()
{
return m_children;
}

wxMetroDataViewTreeStoreNodes::iterator FindChild(wxMetroDataViewTreeStoreNode* node);

void SetExpanded(bool expanded = true)
{
m_isExpanded = expanded;
}
bool IsExpanded() const
{
return m_isExpanded;
}

virtual bool IsContainer() override
{
return true;
}

void DestroyChildren();

private:
wxMetroDataViewTreeStoreNodes m_children;
bool m_isExpanded;
};

//-----------------------------------------------------------------------------

class wxMetroDataViewTreeStore : public wxDataViewModel
{
public:
wxMetroDataViewTreeStore();
~wxMetroDataViewTreeStore();

wxDataViewItem AppendItem(const wxDataViewItem& parent,
const wxString& text,
wxClientData* data = NULL);
wxDataViewItem PrependItem(const wxDataViewItem& parent,
const wxString& text,
wxClientData* data = NULL);
wxDataViewItem InsertItem(const wxDataViewItem& parent, const wxDataViewItem& previous,
const wxString& text,
wxClientData* data = NULL);

wxDataViewItem PrependContainer(const wxDataViewItem& parent,
const wxString& text,
wxClientData* data = NULL);
wxDataViewItem AppendContainer(const wxDataViewItem& parent,
const wxString& text,
wxClientData* data = NULL);
wxDataViewItem InsertContainer(const wxDataViewItem& parent, const wxDataViewItem& previous,
const wxString& text,
wxClientData* data = NULL);

wxDataViewItem GetNthChild(const wxDataViewItem& parent, unsigned int pos) const;
int GetChildCount(const wxDataViewItem& parent) const;

void SetItemText(const wxDataViewItem& item, const wxString& text);
wxString GetItemText(const wxDataViewItem& item) const;
void SetItemData(const wxDataViewItem& item, wxClientData* data);
wxClientData* GetItemData(const wxDataViewItem& item) const;

void DeleteItem(const wxDataViewItem& item);
void DeleteChildren(const wxDataViewItem& item);
void DeleteAllItems();

// implement base methods

virtual void GetValue(wxVariant& variant,
const wxDataViewItem& item, unsigned int col) const override;
virtual bool SetValue(const wxVariant& variant,
const wxDataViewItem& item, unsigned int col) override;
virtual wxDataViewItem GetParent(const wxDataViewItem& item) const override;
virtual bool IsContainer(const wxDataViewItem& item) const override;
virtual unsigned int GetChildren(const wxDataViewItem& item, wxDataViewItemArray& children) const override;

virtual int Compare(const wxDataViewItem& item1, const wxDataViewItem& item2,
unsigned int column, bool ascending) const override;

// virtual bool HasContainerColumns(const wxDataViewItem& item) const override;
// virtual bool IsEnabled(const wxDataViewItem& item, unsigned int col) const override;


virtual bool HasDefaultCompare() const override
{
return true;
}

virtual unsigned int GetColumnCount() const override { return 1; }
virtual wxString GetColumnType(unsigned int) const override { return wxString(); }


wxMetroDataViewTreeStoreNode* FindNode(const wxDataViewItem& item) const;
wxMetroDataViewTreeStoreContainerNode* FindContainerNode(const wxDataViewItem& item) const;
wxMetroDataViewTreeStoreNode* GetRoot() const { return m_root; }

public:
wxMetroDataViewTreeStoreNode* m_root;
};


class wxMetroDataViewTreeCtrl : public wxDataViewCtrl
class wxMetroDataViewTreeCtrl : public wxDataViewTreeCtrl
{
public:
wxMetroDataViewTreeCtrl() { }
Expand All @@ -610,77 +446,18 @@ class wxMetroDataViewTreeCtrl : public wxDataViewCtrl
long style = wxDV_NO_HEADER,
const wxValidator& validator = wxDefaultValidator);

wxMetroDataViewTreeStore* GetStore()
void OnItemStartEditing(wxDataViewEvent& event)
{
return (wxMetroDataViewTreeStore*)GetModel();
}
const wxMetroDataViewTreeStore* GetStore() const
{
return (const wxMetroDataViewTreeStore*)GetModel();
}

bool IsContainer(const wxDataViewItem& item) const
{
return GetStore()->IsContainer(item);
}

wxDataViewItem AppendItem(const wxDataViewItem& parent,
const wxString& text, wxClientData* data = NULL);
wxDataViewItem PrependItem(const wxDataViewItem& parent,
const wxString& text, wxClientData* data = NULL);
wxDataViewItem InsertItem(const wxDataViewItem& parent, const wxDataViewItem& previous,
const wxString& text, wxClientData* data = NULL);

wxDataViewItem PrependContainer(const wxDataViewItem& parent,
const wxString& text, wxClientData* data = NULL);
wxDataViewItem AppendContainer(const wxDataViewItem& parent,
const wxString& text, wxClientData* data = NULL);
wxDataViewItem InsertContainer(const wxDataViewItem& parent, const wxDataViewItem& previous,
const wxString& text, wxClientData* data = NULL);

wxDataViewItem GetNthChild(const wxDataViewItem& parent, unsigned int pos) const
{
return GetStore()->GetNthChild(parent, pos);
}
int GetChildCount(const wxDataViewItem& parent) const
{
return GetStore()->GetChildCount(parent);
}
wxDataViewItem GetItemParent(wxDataViewItem item) const
{
return GetStore()->GetParent(item);
}

void SetItemText(const wxDataViewItem& item, const wxString& text);
wxString GetItemText(const wxDataViewItem& item) const
{
return GetStore()->GetItemText(item);
}
void SetItemData(const wxDataViewItem& item, wxClientData* data)
{
GetStore()->SetItemData(item, data);
}
wxClientData* GetItemData(const wxDataViewItem& item) const
{
return GetStore()->GetItemData(item);
}

void DeleteItem(const wxDataViewItem& item);
void DeleteChildren(const wxDataViewItem& item);
void DeleteAllItems();

void OnExpanded(wxDataViewEvent& event);
void OnCollapsed(wxDataViewEvent& event);
void OnSize(wxSizeEvent& event);

// prevent editing
event.Veto();
}
private:
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMetroDataViewTreeCtrl);

};




class wxMetroPopupMenu {
public:
wxMetroPopupMenu(long theme = 0 /* can be wxMT_LIGHTTHEME */);
Expand Down
Loading
Loading