diff options
| author |  Fabio Bas | 2012-02-26 14:57:49 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-02-26 14:57:49 +0000 |
| commit | b2891fe17c395b885b4fac8634fa8cca1a45fbb6 (patch) | |
| tree | e9fcfdebc14137188b3cf02376fe90145d52943d /src/modules/objects/KvsObject_comboBox.cpp | |
| parent | Some mixed changes, mostly related to osx development: (diff) | |
| download | KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.tar.gz KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.tar.bz2 KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.zip | |
Dropped the KviTalPopupMenu layer, ported the involved code to QAction.
This fixes most of the random crashes on osx, and is the base for a next change in the menubar.
Addiotional fix: "disconnect" menu entry was broken since the 3.x era
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6072 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects/KvsObject_comboBox.cpp')
| -rw-r--r-- | src/modules/objects/KvsObject_comboBox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp index 8951e4200..9cd49b01c 100644 --- a/src/modules/objects/KvsObject_comboBox.cpp +++ b/src/modules/objects/KvsObject_comboBox.cpp @@ -49,7 +49,7 @@ [class]widget[/class] @description: @functions: - !fn: $insertItem(<text:string>, <index:int>) + !fn: $addAction(<text:string>, <index:int>) Inserts a text item at position <index>. If index is negative or not specified the item is appended. !fn: $changeItem(<text:string>, <index:uint>) @@ -99,7 +99,7 @@ */ KVSO_BEGIN_REGISTERCLASS(KvsObject_comboBox,"combobox","widget") - KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,addAction) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,changeItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,removeItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,clear) @@ -139,7 +139,7 @@ bool KvsObject_comboBox::init(KviKvsRunTimeContext *,KviKvsVariantList *) return true; } -KVSO_CLASS_FUNCTION(comboBox,insertItem) +KVSO_CLASS_FUNCTION(comboBox,addAction) { CHECK_INTERNAL_POINTER(widget()) kvs_int_t iIndex; @@ -151,7 +151,7 @@ KVSO_CLASS_FUNCTION(comboBox,insertItem) if(c->paramCount()==1) ((QComboBox *)widget())->addItem(szItem); else - ((QComboBox *)widget())->insertItem( iIndex,szItem); + ((QComboBox *)widget())->insertItem( iIndex,szItem); return true; } KVSO_CLASS_FUNCTION(comboBox,clear) |