diff --git a/include/MwOO/Base.h b/include/MwOO/Base.h
index 9ea8f86b..33d21a29 100644
--- a/include/MwOO/Base.h
+++ b/include/MwOO/Base.h
@@ -6,11 +6,10 @@
 
 class MwOOWidget {
       protected:
-	MwClass	 widget_class = NULL;
 	MwWidget widget;
 
       public:
-	MwOOWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h);
+	MwOOWidget(MwClass widget_class, const char* name, MwOOWidget* parent, int x, int y, int w, int h);
 	~MwOOWidget(void);
 };
 
diff --git a/oosrc/base.cc b/oosrc/base.cc
index d7a8e19b..17a46e23 100644
--- a/oosrc/base.cc
+++ b/oosrc/base.cc
@@ -1,8 +1,8 @@
 /* $Id$ */
 #include <MwOO/Base.h>
 
-MwOOWidget::MwOOWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h){
-	this->widget = MwCreateWidget(this->widget_class, name, parent->widget, x, y, w, h);
+MwOOWidget::MwOOWidget(MwClass widget_class, const char* name, MwOOWidget* parent, int x, int y, int w, int h){
+	this->widget = MwCreateWidget(widget_class, name, parent->widget, x, y, w, h);
 }
 
 MwOOWidget::~MwOOWidget(void){
diff --git a/oosrc/widget/button.cc b/oosrc/widget/button.cc
index 522e5687..620bdb6d 100644
--- a/oosrc/widget/button.cc
+++ b/oosrc/widget/button.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/Button.h>
 #include <Mw/Widget/Button.h>
 
-MwOOButtonWidget::MwOOButtonWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwButtonClass;
+MwOOButtonWidget::MwOOButtonWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwButtonClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/frame.cc b/oosrc/widget/frame.cc
index e16d0849..59011f44 100644
--- a/oosrc/widget/frame.cc
+++ b/oosrc/widget/frame.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/Frame.h>
 #include <Mw/Widget/Frame.h>
 
-MwOOFrameWidget::MwOOFrameWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwFrameClass;
+MwOOFrameWidget::MwOOFrameWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwFrameClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/image.cc b/oosrc/widget/image.cc
index f27754c9..d8769dc7 100644
--- a/oosrc/widget/image.cc
+++ b/oosrc/widget/image.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/Image.h>
 #include <Mw/Widget/Image.h>
 
-MwOOImageWidget::MwOOImageWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwImageClass;
+MwOOImageWidget::MwOOImageWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwImageClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/menu.cc b/oosrc/widget/menu.cc
index 6545c100..79383ba3 100644
--- a/oosrc/widget/menu.cc
+++ b/oosrc/widget/menu.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/Menu.h>
 #include <Mw/Widget/Menu.h>
 
-MwOOMenuWidget::MwOOMenuWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwMenuClass;
+MwOOMenuWidget::MwOOMenuWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwMenuClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/opengl.cc b/oosrc/widget/opengl.cc
index 6c9e46c6..cfc72b42 100644
--- a/oosrc/widget/opengl.cc
+++ b/oosrc/widget/opengl.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/OpenGL.h>
 #include <Mw/Widget/OpenGL.h>
 
-MwOOOpenGLWidget::MwOOOpenGLWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwOpenGLClass;
+MwOOOpenGLWidget::MwOOOpenGLWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwOpenGLClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/scrollbar.cc b/oosrc/widget/scrollbar.cc
index 850bf3ab..26ec47c8 100644
--- a/oosrc/widget/scrollbar.cc
+++ b/oosrc/widget/scrollbar.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/ScrollBar.h>
 #include <Mw/Widget/ScrollBar.h>
 
-MwOOScrollBarWidget::MwOOScrollBarWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwScrollBarClass;
+MwOOScrollBarWidget::MwOOScrollBarWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwScrollBarClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/submenu.cc b/oosrc/widget/submenu.cc
index e47875e4..3afa3c7e 100644
--- a/oosrc/widget/submenu.cc
+++ b/oosrc/widget/submenu.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/SubMenu.h>
 #include <Mw/Widget/SubMenu.h>
 
-MwOOSubMenuWidget::MwOOSubMenuWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwSubMenuClass;
+MwOOSubMenuWidget::MwOOSubMenuWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwSubMenuClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/vulkan.cc b/oosrc/widget/vulkan.cc
index 089b57aa..b1801e71 100644
--- a/oosrc/widget/vulkan.cc
+++ b/oosrc/widget/vulkan.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/Vulkan.h>
 #include <Mw/Widget/Vulkan.h>
 
-MwOOVulkanWidget::MwOOVulkanWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwVulkanClass;
+MwOOVulkanWidget::MwOOVulkanWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwVulkanClass, name, parent, x, y, w, h){
 }
diff --git a/oosrc/widget/window.cc b/oosrc/widget/window.cc
index 64d78dbb..08e996bd 100644
--- a/oosrc/widget/window.cc
+++ b/oosrc/widget/window.cc
@@ -2,6 +2,5 @@
 #include <MwOO/Widget/Window.h>
 #include <Mw/Widget/Window.h>
 
-MwOOWindowWidget::MwOOWindowWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){
-	this->widget_class = MwWindowClass;
+MwOOWindowWidget::MwOOWindowWidget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(MwWindowClass, name, parent, x, y, w, h){
 }
diff --git a/tools/genoo.pl b/tools/genoo.pl
index a491cae9..60d610c0 100755
--- a/tools/genoo.pl
+++ b/tools/genoo.pl
@@ -37,9 +37,8 @@ foreach my $f (@files) {
     print(OUT "#include <Mw/Widget/$name.h>\n");
     print(OUT "\n");
     print(OUT
-"MwOO${name}Widget::MwOO${name}Widget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(name, parent, x, y, w, h){\n"
+"MwOO${name}Widget::MwOO${name}Widget(const char* name, MwOOWidget* parent, int x, int y, int w, int h) : MwOOWidget(Mw${name}Class, name, parent, x, y, w, h){\n"
     );
-    print(OUT "	this->widget_class = Mw${name}Class;\n");
     print(OUT "}\n");
     close(OUT);