Skip to content

Commit

Permalink
Merge pull request #869 from jcfr/improve-ctkMenuComboBox
Browse files Browse the repository at this point in the history
ENH: ctkMenuComboBox: Ensure menu and completerMenu can be get and set from python
  • Loading branch information
jcfr authored May 7, 2019
2 parents 64f9702 + 90678c2 commit a8a4f97
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Libs/Widgets/ctkMenuComboBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ class CTK_WIDGETS_EXPORT ctkMenuComboBox : public QWidget

/// Set menu to both the QComboBox and the associated ctkCompleter.
/// \sa setCompleterMenu(), searchCompleter()
void setMenu(QMenu* menu);
QMenu* menu()const;
Q_INVOKABLE void setMenu(QMenu* menu);
Q_INVOKABLE QMenu* menu()const;

/// Set a specific menu to the ctkCompleter.
///
/// This is useful when the menu displayed with the combobox is only a subset
/// of the action that can be searched for.
/// \sa setMenu(), searchCompleter()
void setCompleterMenu(QMenu* menu);
QMenu* completerMenu()const;
Q_INVOKABLE void setCompleterMenu(QMenu* menu);
Q_INVOKABLE QMenu* completerMenu()const;

void setDefaultText(const QString&);
QString defaultText()const;
Expand Down

0 comments on commit a8a4f97

Please sign in to comment.