diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h
index 3345b3a37..98b8dd92e 100644
--- a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h
@@ -4,7 +4,7 @@
 
 #include <QPointer>
 
-#include "QtWidgets/QWidget/qwidget_macro.h"
+#include "QtCore/QObject/qobject_macro.h"
 #include "naction.hpp"
 class QActionWrap : public Napi::ObjectWrap<QActionWrap> {
  private:
@@ -32,5 +32,5 @@ class QActionWrap : public Napi::ObjectWrap<QActionWrap> {
   Napi::Value isSeparator(const Napi::CallbackInfo& info);
   Napi::Value setSeparator(const Napi::CallbackInfo& info);
 
-  EVENTWIDGET_WRAPPED_METHODS_DECLARATION
+  QOBJECT_WRAPPED_METHODS_DECLARATION
 };
diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h
index 16d39ec2d..c0d8140ab 100644
--- a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h
@@ -4,7 +4,7 @@
 
 #include <QPointer>
 
-#include "QtWidgets/QWidget/qwidget_macro.h"
+#include "QtCore/QObject/qobject_macro.h"
 #include "nshortcut.hpp"
 
 class QShortcutWrap : public Napi::ObjectWrap<QShortcutWrap> {
@@ -24,5 +24,5 @@ class QShortcutWrap : public Napi::ObjectWrap<QShortcutWrap> {
   Napi::Value setKey(const Napi::CallbackInfo& info);
   Napi::Value setContext(const Napi::CallbackInfo& info);
 
-  EVENTWIDGET_WRAPPED_METHODS_DECLARATION
+  QOBJECT_WRAPPED_METHODS_DECLARATION
 };
diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h
index 4d2a4c970..05ada8475 100644
--- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h
@@ -4,7 +4,7 @@
 
 #include <QPointer>
 
-#include "QtWidgets/QWidget/qwidget_macro.h"
+#include "QtCore/QObject/qobject_macro.h"
 #include "nsystemtrayicon.hpp"
 class QSystemTrayIconWrap : public Napi::ObjectWrap<QSystemTrayIconWrap> {
  private:
@@ -26,5 +26,5 @@ class QSystemTrayIconWrap : public Napi::ObjectWrap<QSystemTrayIconWrap> {
   Napi::Value setContextMenu(const Napi::CallbackInfo& info);
   Napi::Value showMessage(const Napi::CallbackInfo& info);
 
-  EVENTWIDGET_WRAPPED_METHODS_DECLARATION
+  QOBJECT_WRAPPED_METHODS_DECLARATION
 };
diff --git a/src/cpp/lib/QtWidgets/QAction/qaction_wrap.cpp b/src/cpp/lib/QtWidgets/QAction/qaction_wrap.cpp
index e7cf1270f..5986831dc 100644
--- a/src/cpp/lib/QtWidgets/QAction/qaction_wrap.cpp
+++ b/src/cpp/lib/QtWidgets/QAction/qaction_wrap.cpp
@@ -26,7 +26,7 @@ Napi::Object QActionWrap::init(Napi::Env env, Napi::Object exports) {
        InstanceMethod("setChecked", &QActionWrap::setChecked),
        InstanceMethod("isSeparator", &QActionWrap::isSeparator),
        InstanceMethod("setSeparator", &QActionWrap::setSeparator),
-       EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QActionWrap)});
+       QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QActionWrap)});
   constructor = Napi::Persistent(func);
   exports.Set(CLASSNAME, func);
   return exports;
diff --git a/src/cpp/lib/QtWidgets/QShortcut/qshortcut_wrap.cpp b/src/cpp/lib/QtWidgets/QShortcut/qshortcut_wrap.cpp
index 0ace6435e..09fde9637 100644
--- a/src/cpp/lib/QtWidgets/QShortcut/qshortcut_wrap.cpp
+++ b/src/cpp/lib/QtWidgets/QShortcut/qshortcut_wrap.cpp
@@ -18,7 +18,7 @@ Napi::Object QShortcutWrap::init(Napi::Env env, Napi::Object exports) {
        InstanceMethod("setAutoRepeat", &QShortcutWrap::setAutoRepeat),
        InstanceMethod("setKey", &QShortcutWrap::setKey),
        InstanceMethod("setContext", &QShortcutWrap::setContext),
-       EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QShortcutWrap)});
+       QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QShortcutWrap)});
   constructor = Napi::Persistent(func);
   exports.Set(CLASSNAME, func);
   return exports;
diff --git a/src/cpp/lib/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.cpp b/src/cpp/lib/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.cpp
index b3816c91e..832458012 100644
--- a/src/cpp/lib/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.cpp
+++ b/src/cpp/lib/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.cpp
@@ -22,7 +22,7 @@ Napi::Object QSystemTrayIconWrap::init(Napi::Env env, Napi::Object exports) {
        InstanceMethod("setToolTip", &QSystemTrayIconWrap::setToolTip),
        InstanceMethod("setContextMenu", &QSystemTrayIconWrap::setContextMenu),
        InstanceMethod("showMessage", &QSystemTrayIconWrap::showMessage),
-       EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QSystemTrayIconWrap)});
+       QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QSystemTrayIconWrap)});
   constructor = Napi::Persistent(func);
   exports.Set(CLASSNAME, func);
   return exports;
diff --git a/src/lib/QtWidgets/QComboBox.ts b/src/lib/QtWidgets/QComboBox.ts
index dd3711bd4..806437793 100644
--- a/src/lib/QtWidgets/QComboBox.ts
+++ b/src/lib/QtWidgets/QComboBox.ts
@@ -85,6 +85,12 @@ export class QComboBox extends NodeWidget<QComboBoxSignals> {
     clear(): void {
         this.native.clear();
     }
+    setCurrentText(text: string): void {
+        this.setProperty('currentText', text);
+    }
+    setCurrentIndex(index: number): void {
+        this.setProperty('currentIndex', index);
+    }
 }
 
 export enum InsertPolicy {