diff --git a/bepascal/Jamrules b/bepascal/Jamrules
index e4b7ec7..a34518f 100644
--- a/bepascal/Jamrules
+++ b/bepascal/Jamrules
@@ -37,7 +37,7 @@ rule fpcMkObjectDirs
 	{
 		dir = [ FDirName $(LOCATE_TARGET) $(i:D) ] ;
 		Depends $(i:S=$(SUFOBJ)) : $(dir) ;
-		MkDir $(dir) ;
+		MkDir -p $(dir) ;
 	}
 }
 
@@ -59,6 +59,13 @@ actions fpc
 	fpc -g -S2 $(2) -FE$(dir) ;
 }
 
+# call the Lex interpreter
+
+actions Lex
+{
+	flex $(2) ;
+}
+
 # Make a zip file named $(1) that include (recursively) all files in the directory list $(2), except the ones 
 # in the CVS subdirectories
 rule MakeZip 
@@ -145,7 +152,7 @@ rule MkObjectDirs
 	{
 		dir = [ FDirName $(LOCATE_TARGET) $(i:D) ] ;
 		Depends $(i:S=$(SUFOBJ)) : $(dir) ;
-		MkDir $(dir) ;
+		MkDir -p $(dir) ;
 	}
 }
 
diff --git a/bepascal/source/bepascal/cpp/include/be/app/application.h b/bepascal/source/bepascal/cpp/include/be/app/application.h
index 9446f8c..802e4a9 100644
--- a/bepascal/source/bepascal/cpp/include/be/app/application.h
+++ b/bepascal/source/bepascal/cpp/include/be/app/application.h
@@ -37,7 +37,7 @@
 #include <message.h>
 #include <beobj.h>
 
-class BPApplication : public BApplication, public virtual BPLooper
+class BPApplication : public BApplication, public BPLooper
 {
 	public:
 		BPApplication(TPasObject PasObject, const char *signature);
@@ -53,4 +53,4 @@ class BPApplication : public BApplication, public virtual BPLooper
 	private:
 };
 
-#endif /* _APPLICATION_H_ */
\ No newline at end of file
+#endif /* _APPLICATION_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/app/handler.h b/bepascal/source/bepascal/cpp/include/be/app/handler.h
index eba51dd..d150787 100644
--- a/bepascal/source/bepascal/cpp/include/be/app/handler.h
+++ b/bepascal/source/bepascal/cpp/include/be/app/handler.h
@@ -27,7 +27,7 @@
 
 typedef void (*BHandler_MessageReceived_hook) (TPasObject PasObject, TCPlusObject message);
 
-class BPHandler : public BHandler, public virtual BPasObject
+class BPHandler : public BHandler, public BPasObject
 {
 	public:
 		BPHandler(TPasObject PasObject, const char *name = NULL);
@@ -38,4 +38,4 @@ class BPHandler : public BHandler, public virtual BPasObject
 	private:
 };
 
-#endif /* _HANDLER_H_ */
\ No newline at end of file
+#endif /* _HANDLER_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/app/looper.h b/bepascal/source/bepascal/cpp/include/be/app/looper.h
index 4722c59..42b7900 100644
--- a/bepascal/source/bepascal/cpp/include/be/app/looper.h
+++ b/bepascal/source/bepascal/cpp/include/be/app/looper.h
@@ -28,7 +28,7 @@
 
 #include <handler.h>
 
-class BPLooper : public BLooper, public virtual BPHandler
+class BPLooper : public BLooper, public BPHandler
 {
 	public:
 		BPLooper(TPasObject PasObject, const char *name = NULL,
@@ -43,4 +43,4 @@ class BPLooper : public BLooper, public virtual BPHandler
 	private:	
 };
 
-#endif /* _LOOPER_H_ */
\ No newline at end of file
+#endif /* _LOOPER_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/app/message.h b/bepascal/source/bepascal/cpp/include/be/app/message.h
index 3acc37c..2ec9821 100644
--- a/bepascal/source/bepascal/cpp/include/be/app/message.h
+++ b/bepascal/source/bepascal/cpp/include/be/app/message.h
@@ -35,4 +35,4 @@ class BPMessage : public BMessage, private BPasObject
 	private:
 };
 
-#endif /* _MESSAGE_H_ */
\ No newline at end of file
+#endif /* _MESSAGE_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/app/roster.h b/bepascal/source/bepascal/cpp/include/be/app/roster.h
index db1a1f3..af4022e 100644
--- a/bepascal/source/bepascal/cpp/include/be/app/roster.h
+++ b/bepascal/source/bepascal/cpp/include/be/app/roster.h
@@ -21,4 +21,4 @@
 
 #include <Roster.h>
 
-#endif /* _ROSTER_H_ */
\ No newline at end of file
+#endif /* _ROSTER_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/bepas_kernel/beobj.h b/bepascal/source/bepascal/cpp/include/be/bepas_kernel/beobj.h
index cad0ad4..848191a 100644
--- a/bepascal/source/bepascal/cpp/include/be/bepas_kernel/beobj.h
+++ b/bepascal/source/bepascal/cpp/include/be/bepas_kernel/beobj.h
@@ -35,4 +35,4 @@ class BPasObject
 		TPasObject FPasObject;
 };
 
-#endif /* _BEOBJ_H_ */
\ No newline at end of file
+#endif /* _BEOBJ_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/control.h b/bepascal/source/bepascal/cpp/include/be/interface/control.h
index 55a8f9c..c6e73d9 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/control.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/control.h
@@ -26,7 +26,7 @@
 typedef void (*BControl_SetEnabled_hook) (TPasObject PasObject, bool enabled);
 typedef void (*BControl_SetValue_hook) (TPasObject PasObject, int32 value);
 
-class BPControl : public BControl, virtual public BPView
+class BPControl : public BControl, public BPView
 {
 	public:
 		// <BView_Constructor>
@@ -48,4 +48,4 @@ class BPControl : public BControl, virtual public BPView
 	private:
 };
 
-#endif /* _CONTROL_H_ */
\ No newline at end of file
+#endif /* _CONTROL_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/listview.h b/bepascal/source/bepascal/cpp/include/be/interface/listview.h
index c56b20f..db73e4d 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/listview.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/listview.h
@@ -28,7 +28,7 @@
 #include <handler.h>
 #include <beobj.h>
 
-class BPListView : public BListView, virtual public BPView
+class BPListView : public BListView, public BPView
 {
 
 public:
@@ -76,4 +76,4 @@ virtual void		AllDetached();
 protected:
 };
 
-#endif /* _LISTVIEW_H_ */
\ No newline at end of file
+#endif /* _LISTVIEW_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/menu.h b/bepascal/source/bepascal/cpp/include/be/interface/menu.h
index dfa75f9..91742b1 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/menu.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/menu.h
@@ -7,7 +7,7 @@
 #include "view.h"
 #include <beobj.h>
 
-class BPMenu : public BMenu, virtual public BPView
+class BPMenu : public BMenu, public BPView
 {
 	public:
 		BPMenu(TPasObject PasObject, const char *name, menu_layout layout = B_ITEMS_IN_COLUMN); 
@@ -40,4 +40,4 @@ class BPMenu : public BMenu, virtual public BPView
 	private:
 };
 
-#endif /* _MENU_H_ */
\ No newline at end of file
+#endif /* _MENU_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/menubar.h b/bepascal/source/bepascal/cpp/include/be/interface/menubar.h
index cd7e414..399d603 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/menubar.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/menubar.h
@@ -5,7 +5,7 @@
 #include "menu.h"
 #include <beobj.h>
 
-class BPMenuBar : public BMenuBar, virtual public BPMenu
+class BPMenuBar : public BMenuBar, public BPMenu
 {
 	public:
 		BPMenuBar(TPasObject PasObject, BRect frame, const char *name, 
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/menuitem.h b/bepascal/source/bepascal/cpp/include/be/interface/menuitem.h
index b36e7e3..ee71f6e 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/menuitem.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/menuitem.h
@@ -48,4 +48,4 @@ class BPSeparatorItem : public BSeparatorItem, virtual public BPMenuItem
 		virtual void DrawContent(void);		
 };
 
-#endif /* _MENUITEM_H_ */
\ No newline at end of file
+#endif /* _MENUITEM_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/point.h b/bepascal/source/bepascal/cpp/include/be/interface/point.h
index 481ada5..63db915 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/point.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/point.h
@@ -31,4 +31,4 @@ class BPPoint : public BPoint, public BPasObject
 		BPPoint(TPasObject PasObject);
 };
 
-#endif _POINT_H_ /* _POINT_H_ */
\ No newline at end of file
+#endif _POINT_H_ /* _POINT_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/rect.h b/bepascal/source/bepascal/cpp/include/be/interface/rect.h
index 03b0fad..5b28bd6 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/rect.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/rect.h
@@ -34,4 +34,4 @@ class BPRect : public BRect, public BPasObject
 		BPRect(TPasObject PasObject, BPoint leftTop, BPoint rightBottom);
 };
 
-#endif _RECT_H_ /* _RECT_H_ */
\ No newline at end of file
+#endif _RECT_H_ /* _RECT_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/view.h b/bepascal/source/bepascal/cpp/include/be/interface/view.h
index 7ab677f..0cfa833 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/view.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/view.h
@@ -75,4 +75,4 @@ class BPView : public BView, public virtual BPHandler
 	private:	
 };
 
-#endif /* _VIEW_H_ */
\ No newline at end of file
+#endif /* _VIEW_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/interface/window.h b/bepascal/source/bepascal/cpp/include/be/interface/window.h
index 72ef636..787b334 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/window.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/window.h
@@ -43,4 +43,4 @@ class BPWindow : public BWindow, public BPLooper
 	private:	
 };
 
-#endif /* _WINDOW_H_ */
\ No newline at end of file
+#endif /* _WINDOW_H_ */
diff --git a/bepascal/source/bepascal/cpp/include/be/support/archivable.h b/bepascal/source/bepascal/cpp/include/be/support/archivable.h
index 0af6221..5cd2e95 100644
--- a/bepascal/source/bepascal/cpp/include/be/support/archivable.h
+++ b/bepascal/source/bepascal/cpp/include/be/support/archivable.h
@@ -39,4 +39,4 @@ static	BArchivable	*Instantiate(BMessage *from);
 	private:
 };
 
-#endif /* _ARCHIVABLE_H_ */
\ No newline at end of file
+#endif /* _ARCHIVABLE_H_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Application.cpp b/bepascal/source/bepascal/cpp/src/be/app/Application.cpp
index 80bb816..3f90d55 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Application.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Application.cpp
@@ -60,17 +60,19 @@ BMessenger *be_app_messengerCPlus;
 #endif
 
 BPApplication::BPApplication(TPasObject PasObject, const char *signature) 
-	: BApplication(signature), BPHandler(PasObject), BPLooper(PasObject), 
-	BPasObject(PasObject)
+	: BApplication(signature), 
+//	BPHandler(PasObject), 
+	BPLooper(PasObject) 
+//	BPasObject(PasObject)
 {
 	be_app_messengerCPlus = &be_app_messenger;
 }
 
 BPApplication::BPApplication(TPasObject PasObject, const char *signature,
 	 status_t *error) : BApplication(signature, error), 
-	 BPHandler(PasObject),
-	 BPLooper(PasObject),
-	 BPasObject(PasObject)
+//	 BPHandler(PasObject),
+	 BPLooper(PasObject)
+//	 BPasObject(PasObject)
 {
 	be_app_messengerCPlus = &be_app_messenger;
 }
@@ -171,4 +173,4 @@ status_t BApplication_GetAppInfo(TCPlusObject Application,app_info *info)
 }
 #endif
 
-#endif /* _APPLICATION_CPP_ */
\ No newline at end of file
+#endif /* _APPLICATION_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Clipboard.cpp b/bepascal/source/bepascal/cpp/src/be/app/Clipboard.cpp
index 548832a..e66c20d 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Clipboard.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Clipboard.cpp
@@ -270,4 +270,4 @@ BClipboard_UploadToSystem(BClipboard *Clipboard)
 }
 #endif
 
-#endif /* _CLIPBOARD_CPP_ */
\ No newline at end of file
+#endif /* _CLIPBOARD_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Handler.cpp b/bepascal/source/bepascal/cpp/src/be/app/Handler.cpp
index 1ab1574..890bc7b 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Handler.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Handler.cpp
@@ -75,4 +75,4 @@ TCPlusObject BHandler_Create(TPasObject PasObject, const char *name)
 }
 #endif
 
-#endif /* _HANDLER_CPP_ */
\ No newline at end of file
+#endif /* _HANDLER_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Looper.cpp b/bepascal/source/bepascal/cpp/src/be/app/Looper.cpp
index 2c9d04e..5dd9817 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Looper.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Looper.cpp
@@ -51,8 +51,8 @@ BPLooper::BPLooper(TPasObject PasObject, const char *name = NULL,
                    int32 priority = B_NORMAL_PRIORITY,
                    int32 portCapacity = B_LOOPER_PORT_DEFAULT_CAPACITY)
                    : BLooper(name, priority, portCapacity),
-                   BPHandler(PasObject, name),
-                   BPasObject(PasObject)
+                   BPHandler(PasObject, name)
+//                BPasObject(PasObject)
 {
 }
 
@@ -128,4 +128,4 @@ status_t BLooper_PostMessage_2(TCPlusObject Looper, uint32 command)
 }
 #endif
 
-#endif /* _LOOPER_CPP_ */
\ No newline at end of file
+#endif /* _LOOPER_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Message.cpp b/bepascal/source/bepascal/cpp/src/be/app/Message.cpp
index 3a24faf..0a53f94 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Message.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Message.cpp
@@ -244,4 +244,4 @@ BMessage_operator_equal(BMessage *Message, const BMessage &msg)
 #endif
 
 
-#endif /* _MESSAGE_CPP_ */
\ No newline at end of file
+#endif /* _MESSAGE_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Messenger.cpp b/bepascal/source/bepascal/cpp/src/be/app/Messenger.cpp
index 3bf91de..abc040a 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Messenger.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Messenger.cpp
@@ -275,4 +275,4 @@ BMessenger_Team(BMessenger *Messenger)
 }
 #endif
 
-#endif /* _MESSENGER_CPP_ */
\ No newline at end of file
+#endif /* _MESSENGER_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/app/Roster.cpp b/bepascal/source/bepascal/cpp/src/be/app/Roster.cpp
index 8aaffde..32c036f 100644
--- a/bepascal/source/bepascal/cpp/src/be/app/Roster.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/app/Roster.cpp
@@ -741,4 +741,4 @@ BRoster_InitMessengers(BRoster *Roster)
 }
 #endif
 
-#endif /* _ROSTER_CPP_ */
\ No newline at end of file
+#endif /* _ROSTER_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/bepas_kernel/beobj.cpp b/bepascal/source/bepascal/cpp/src/be/bepas_kernel/beobj.cpp
index 76fbe59..1fbbd75 100644
--- a/bepascal/source/bepascal/cpp/src/be/bepas_kernel/beobj.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/bepas_kernel/beobj.cpp
@@ -48,4 +48,4 @@ char *BPasObject::GetPasClassName(void)
 	return PasObject_GetPasClassName_hook(FPasObject);
 }
 
-#endif /* _BEOBJ_CPP_ */
\ No newline at end of file
+#endif /* _BEOBJ_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Alert.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Alert.cpp
index 27bb834..4fe353f 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Alert.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Alert.cpp
@@ -28,7 +28,7 @@
 /*----------------------------------------------------------------*/
 /*----- BAlert class ---------------------------------------------*/
 
-class BPAlert : public BAlert, public virtual BPWindow // Is this OK? or should be public virtual?
+class BPAlert : public BAlert, public BPWindow // Is this OK? or should be public virtual?
 {
 public:
 					BPAlert(TPasObject PasObject,
@@ -124,16 +124,16 @@ BPAlert::BPAlert(TPasObject PasObject,
 				button_width width = B_WIDTH_AS_USUAL,
 				alert_type type = B_INFO_ALERT)
 		: BAlert(title, text, button1, button2, button3, width, type),
-		BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0),
+		BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0)
 
 // oco or Baldur :
 // why this doesn't work? compiler says:
 // BPWindow doesn't have a BPLooper member. The same with BPArchivable.
 
 //		BPLooper(PasObject),
-		BPHandler(PasObject, title),
+//		BPHandler(PasObject, title),
 //		BPArchivable(PasObject),
-		BPasObject(PasObject)
+//		BPasObject(PasObject)
 {
 
 }
@@ -148,11 +148,11 @@ BPAlert::BPAlert(TPasObject PasObject,
 				button_spacing spacing,
 				alert_type type = B_INFO_ALERT)
 		: BAlert(title, text, button1, button2, button3, width, spacing, type),
-		BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0),
+		BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0)
 //		BPLooper(PasObject),
-		BPHandler(PasObject, title),
+//		BPHandler(PasObject, title),
 //		BPArchivable(PasObject),
-		BPasObject(PasObject)
+//		BPasObject(PasObject)
 {
 
 }
@@ -160,11 +160,11 @@ BPAlert::BPAlert(TPasObject PasObject,
 BPAlert::BPAlert(TPasObject PasObject, BMessage *data)
 		: BAlert(data),
 // UGLY HACK!!! FIX ME!!! (should be "BPWindow(PasObject, data)" )
-		BPWindow(PasObject, BRect(), "Ugly_Hack!", B_UNTYPED_WINDOW, 0, 0),
+		BPWindow(PasObject, BRect(), "Ugly_Hack!", B_UNTYPED_WINDOW, 0, 0)
 //		BPLooper(PasObject),
-		BPHandler(PasObject),
+//		BPHandler(PasObject),
 //		BPArchivable(PasObject),
-		BPasObject(PasObject)
+//		BPasObject(PasObject)
 {
 
 }
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Box.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Box.cpp
index e0fa48e..a628907 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Box.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Box.cpp
@@ -27,7 +27,7 @@
 #include <beobj.h>
 
 
-class BPBox : public BBox, virtual public BPView
+class BPBox : public BBox, public BPView
 {
 public:
 	BPBox(TPasObject PasObject,
@@ -112,8 +112,8 @@ BPBox::BPBox(TPasObject PasObject,
 		:
 		BBox(bounds, name, resizeFlags, flags, border),
 		BPView(PasObject, bounds, name, resizeFlags, flags),
-		BPHandler(PasObject, name),
-		BPasObject(PasObject)
+		BPHandler(PasObject, name)
+//		BPasObject(PasObject)
 {
 
 }
@@ -122,8 +122,8 @@ BPBox::BPBox(TPasObject PasObject, BMessage *archive)
 		:
 		BBox(archive),
 		BPView(PasObject, archive),
-		BPHandler(PasObject, archive),
-		BPasObject(PasObject)
+		BPHandler(PasObject, archive)
+//		BPasObject(PasObject)
 {
 
 }
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Button.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Button.cpp
index 8e6f23f..38d261e 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Button.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Button.cpp
@@ -42,7 +42,7 @@ BButton_MakeDefault_hook Button_MakeDefault_hook;
 }
 #endif
 
-class BPButton : public BButton, virtual public BPControl												 
+class BPButton : public BButton, public BPControl												 
 {
 	public:
 		// <BView_Constructor>
@@ -91,9 +91,9 @@ BPButton::BPButton(TPasObject PasObject, BRect frame,
           resizeMask, flags), 
           BPControl(PasObject, frame, name, label, message,
           resizeMask, flags), 
-          BPView(PasObject, frame, name, resizeMask, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+//        BPView(PasObject, frame, name, resizeMask, flags),
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -101,9 +101,9 @@ BPButton::BPButton(TPasObject PasObject, BRect frame,
 BPButton::BPButton(TPasObject PasObject, BMessage *archive)
           :BButton(archive),
           BPControl(PasObject, archive),
-          BPView(PasObject, archive),
-          BPHandler(PasObject, archive),
-          BPasObject(PasObject)
+//        BPView(PasObject, archive),
+          BPHandler(PasObject, archive)
+//       BPasObject(PasObject)
 {
 
 }
@@ -683,4 +683,4 @@ BButton_Execute(BButton *Button)
 }
 #endif
 
-#endif /* _BUTTON_CPP_ */
\ No newline at end of file
+#endif /* _BUTTON_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/CheckBox.cpp b/bepascal/source/bepascal/cpp/src/be/interface/CheckBox.cpp
index 3c7b132..79f9b9b 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/CheckBox.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/CheckBox.cpp
@@ -41,7 +41,7 @@ extern "C" {
 }
 #endif
 
-class BPCheckBox : public BCheckBox, virtual public BPControl {
+class BPCheckBox : public BCheckBox, public BPControl {
 
 public:
 					BPCheckBox(TPasObject PasObject, BRect frame,
@@ -105,9 +105,9 @@ BPCheckBox::BPCheckBox(TPasObject PasObject,
 					  message,rmask,flags),
           BPControl(PasObject, frame, name, label, message,
           rmask, flags), 
-          BPView(PasObject, frame, name, rmask, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+//       BPView(PasObject, frame, name, rmask, flags),
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -115,9 +115,9 @@ BPCheckBox::BPCheckBox(TPasObject PasObject,
 BPCheckBox::BPCheckBox(TPasObject PasObject, BMessage *archive)
           :BCheckBox(archive),
           BPControl(PasObject, archive),
-          BPView(PasObject, archive),
-          BPHandler(PasObject, archive),
-          BPasObject(PasObject)
+//       BPView(PasObject, archive),
+          BPHandler(PasObject, archive)
+//       BPasObject(PasObject)
 {
 
 }
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Control.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Control.cpp
index f20c710..f1f44e5 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Control.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Control.cpp
@@ -51,8 +51,8 @@ BPControl::BPControl(TPasObject PasObject, BRect frame,
           BControl(frame, name, label, message,
           resizeMask, flags), 
           BPView(PasObject, frame, name, resizeMask, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -60,8 +60,8 @@ BPControl::BPControl(TPasObject PasObject, BRect frame,
 BPControl::BPControl(TPasObject PasObject, BMessage *message):
           BControl(message),           
           BPView(PasObject, message), 
-          BPHandler(PasObject, message),          
-          BPasObject(PasObject)
+          BPHandler(PasObject, message)          
+//       BPasObject(PasObject)
 {
 }
 
@@ -557,4 +557,4 @@ BControl_InitData(BControl *Control, BMessage *data)
 }
 #endif
 
-#endif /* _CONTROL_CPP_ */
\ No newline at end of file
+#endif /* _CONTROL_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/ListView.cpp b/bepascal/source/bepascal/cpp/src/be/interface/ListView.cpp
index 3fe59df..0e0cca3 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/ListView.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/ListView.cpp
@@ -44,8 +44,8 @@ BListString_InitiateDrag_hook ListString_InitiateDrag_hook;
 BPListView::BPListView(TPasObject PasObject,BMessage *data)
 					:BListView(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
@@ -58,8 +58,8 @@ BPListView::BPListView(TPasObject PasObject,BRect frame,
 													B_NAVIGABLE)
 					:BListView(frame,name,type,resizeMask,flags),
           BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Menu.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Menu.cpp
index 449aa52..346af76 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Menu.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Menu.cpp
@@ -20,32 +20,32 @@
 BPMenu::BPMenu(TPasObject PasObject, const char *name, menu_layout layout = B_ITEMS_IN_COLUMN)
 		:BMenu(name, layout),
           BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
-          BPHandler(PasObject),
-          BPasObject(PasObject)
+          BPHandler(PasObject)
+//       BPasObject(PasObject)
 {
 }
 
 BPMenu::BPMenu(TPasObject PasObject, const char *name, float width, float height)
 		:BMenu(name, width, height),
           BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
-          BPHandler(PasObject),
-          BPasObject(PasObject)
+          BPHandler(PasObject)
+//       BPasObject(PasObject)
 {
 }
 
 BPMenu::BPMenu(TPasObject PasObject, BMessage *archive)
 		:BMenu(archive),
           BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
-          BPHandler(PasObject),
-          BPasObject(PasObject)
+          BPHandler(PasObject)
+//       BPasObject(PasObject)
 {
 }
 
 BPMenu::BPMenu(TPasObject PasObject, BRect frame, const char *name, uint32 resizingMode, uint32 flags, menu_layout layout, bool resizeToFit)
 		:BMenu(frame, name, resizingMode, flags, layout, resizeToFit),
           BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
-          BPHandler(PasObject),
-          BPasObject(PasObject)
+          BPHandler(PasObject)
+//       BPasObject(PasObject)
 {
 }
 
@@ -922,4 +922,4 @@ TCPlusObject BMenu_Create_3(TPasObject PasObject, BRect frame, const char *viewN
 }
 #endif
 
-#endif /* _MENU_CPP_ */
\ No newline at end of file
+#endif /* _MENU_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/MenuBar.cpp b/bepascal/source/bepascal/cpp/src/be/interface/MenuBar.cpp
index de1f41f..1f65300 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/MenuBar.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/MenuBar.cpp
@@ -10,18 +10,18 @@ BPMenuBar::BPMenuBar(TPasObject PasObject, BRect frame, const char *name,
 		menu_layout layout = B_ITEMS_IN_COLUMN, bool resizeToFit = true)
 		:BMenuBar(frame, name, resizingMode, layout, resizeToFit),
 		  BPMenu(PasObject, name, layout),
-          BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
-          BPHandler(PasObject),
-          BPasObject(PasObject)
+//       BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
+          BPHandler(PasObject)
+//       BPasObject(PasObject)
 {
 }
 
 BPMenuBar::BPMenuBar(TPasObject PasObject, BMessage *archive)
 		:BMenuBar(archive),
 		  BPMenu(PasObject, archive),
-          BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
-          BPHandler(PasObject),
-          BPasObject(PasObject)
+//       BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
+          BPHandler(PasObject)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/MenuItem.cpp b/bepascal/source/bepascal/cpp/src/be/interface/MenuItem.cpp
index 351007f..5b56672 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/MenuItem.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/MenuItem.cpp
@@ -430,4 +430,4 @@ BSeparatorItem_SetEnabled(BSeparatorItem *SeparatorItem, bool state)
 }
 #endif
 
-#endif /* _MENUITEM_CPP_ */
\ No newline at end of file
+#endif /* _MENUITEM_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/OutlineListView.cpp b/bepascal/source/bepascal/cpp/src/be/interface/OutlineListView.cpp
index fb2e931..8e75edc 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/OutlineListView.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/OutlineListView.cpp
@@ -36,7 +36,7 @@ extern "C" {
 }
 #endif
 
-class BPOutlineListView : public BOutlineListView, virtual public BPListView 
+class BPOutlineListView : public BOutlineListView, public BPListView 
 {
 public:
 					BPOutlineListView(TPasObject PasObject,BRect frame,
@@ -74,9 +74,9 @@ virtual void		MessageReceived(BMessage *);
 BPOutlineListView::BPOutlineListView(TPasObject PasObject,BMessage *data)
 					:BOutlineListView(data),
           BPListView(PasObject, data),
-          BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+//       BPView(PasObject, data),
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
@@ -88,9 +88,9 @@ BPOutlineListView::BPOutlineListView(TPasObject PasObject,BRect frame,
 								| B_NAVIGABLE)
 					:BOutlineListView(frame,name,type,resizeMask,flags),
           BPListView(PasObject, frame,name,type,resizeMask,flags),
-          BPView(PasObject, frame,name,resizeMask,flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+//       BPView(PasObject, frame,name,resizeMask,flags),
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
index a1fd6a8..b29469a 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
@@ -81,4 +81,4 @@ void BPoint_Set(TCPlusObject Point, float x, float y)
 #endif
 
 
-#endif _POINT_CPP_ /* _POINT_CPP_ */
\ No newline at end of file
+#endif _POINT_CPP_ /* _POINT_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/RadioButton.cpp b/bepascal/source/bepascal/cpp/src/be/interface/RadioButton.cpp
index a411770..6707a83 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/RadioButton.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/RadioButton.cpp
@@ -42,7 +42,7 @@ extern "C" {
 }
 #endif
 
-class BPRadioButton : public BRadioButton, virtual public BPControl {
+class BPRadioButton : public BRadioButton, public BPControl {
 
 public:
 	BPRadioButton(TPasObject PasObject,
@@ -116,9 +116,9 @@ BPRadioButton::BPRadioButton(TPasObject PasObject,
 					  message,rmask,flags),
           BPControl(PasObject, frame, name, label, message,
           rmask, flags), 
-          BPView(PasObject, frame, name, rmask, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+//       BPView(PasObject, frame, name, rmask, flags),
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -127,9 +127,9 @@ BPRadioButton::BPRadioButton(TPasObject PasObject,
 BPRadioButton::BPRadioButton(TPasObject PasObject, BMessage *archive)
           :BRadioButton(archive),
           BPControl(PasObject, archive),
-          BPView(PasObject, archive),
-          BPHandler(PasObject, archive),
-          BPasObject(PasObject)
+//       BPView(PasObject, archive),
+          BPHandler(PasObject, archive)
+//       BPasObject(PasObject)
 {
 
 }
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
index b8ecb01..cbe8ded 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
@@ -81,4 +81,4 @@ void BRect_PrintToStream(TCPlusObject rect)
 #endif
 
 
-#endif _RECT_CPP_ /* _RECT_CPP_ */
\ No newline at end of file
+#endif _RECT_CPP_ /* _RECT_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/ScrollBar.cpp b/bepascal/source/bepascal/cpp/src/be/interface/ScrollBar.cpp
index 3b8238f..496ba83 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/ScrollBar.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/ScrollBar.cpp
@@ -38,7 +38,7 @@ extern "C" {
 }
 #endif
 
-class BPScrollBar : public BScrollBar,virtual public BPView {
+class BPScrollBar : public BScrollBar, public BPView {
 
 public:
 					BPScrollBar(TPasObject PasObject,
@@ -85,8 +85,8 @@ BPScrollBar::BPScrollBar(TPasObject PasObject,
 								max,
 								direction), 
           BPView(PasObject, BRect(0,0,0,0), name, 0, 0),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -94,8 +94,8 @@ BPScrollBar::BPScrollBar(TPasObject PasObject,
 BPScrollBar::BPScrollBar(TPasObject PasObject, BMessage *data)
           :BScrollBar(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/ScrollView.cpp b/bepascal/source/bepascal/cpp/src/be/interface/ScrollView.cpp
index 53dfcd6..99004cd 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/ScrollView.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/ScrollView.cpp
@@ -38,7 +38,7 @@ extern "C" {
 }
 #endif
 
-class BPScrollView : public BScrollView, virtual public BPView {
+class BPScrollView : public BScrollView, public BPView {
 
 public:
 						BPScrollView(
@@ -99,8 +99,8 @@ BPScrollView::BPScrollView(TPasObject PasObject,
 					 vertical,
 					 border), 
           BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -110,8 +110,8 @@ BPScrollView::BPScrollView(TPasObject PasObject,
 BPScrollView::BPScrollView(TPasObject PasObject, BMessage *data)
           :BScrollView(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/StatusBar.cpp b/bepascal/source/bepascal/cpp/src/be/interface/StatusBar.cpp
index eb12faa..4c6f831 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/StatusBar.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/StatusBar.cpp
@@ -38,7 +38,7 @@ extern "C" {
 }
 #endif
 
-class BPStatusBar : public BStatusBar, virtual BPView 
+class BPStatusBar : public BStatusBar, public BPView 
 {
 
 public:
@@ -80,16 +80,16 @@ BPStatusBar::BPStatusBar(TPasObject PasObject,
 								label ,
 								trailing_label ),
 		  BPView(PasObject, BRect(0,0,0,0), name, 0, 0),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)		
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)		
 {
 }
           							
 BPStatusBar::BPStatusBar(TPasObject PasObject,BMessage *data)
           :BStatusBar(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/StringView.cpp b/bepascal/source/bepascal/cpp/src/be/interface/StringView.cpp
index 4d80e87..bd7b7ce 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/StringView.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/StringView.cpp
@@ -37,7 +37,7 @@ extern "C" {
 }
 #endif
 
-class BPStringView : public BStringView, virtual public BPView
+class BPStringView : public BStringView, public BPView
 {
 
 public:
@@ -75,8 +75,8 @@ BPStringView::BPStringView(TPasObject PasObject,
 					 resizeFlags, 
 					 flags), 
           BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -84,8 +84,8 @@ BPStringView::BPStringView(TPasObject PasObject,
 BPStringView::BPStringView(TPasObject PasObject, BMessage *data)
           :BStringView(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/TabView.cpp b/bepascal/source/bepascal/cpp/src/be/interface/TabView.cpp
index 3e9fc5c..6c83b76 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/TabView.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/TabView.cpp
@@ -67,7 +67,7 @@ BTabView_TabFrame_hook TabView_TabFrame_hook;
 }
 #endif
 
-class BPTab :public BTab , virtual public BPasObject {
+class BPTab :public BTab, public BPasObject {
 public:
 						BPTab(TPasObject PasObject,BView* contents=NULL);
 						BPTab(TPasObject PasObject,BMessage* data);
@@ -76,14 +76,14 @@ virtual void 			DrawTab(BView* owner, BRect tabFrame, tab_position,bool full=tru
 };
 
 BPTab::BPTab(TPasObject PasObject,BView* contents=NULL)
-	:BTab(contents),
+	: BTab(contents),
 	BPasObject(PasObject)
 {
 }
 
 
 BPTab::BPTab(TPasObject PasObject,BMessage* data)
-	:BTab(data),
+	: BTab(data),
 	BPasObject(PasObject)
 {
 }
@@ -100,7 +100,7 @@ void BPTab::DrawTab(BView* owner, BRect tabFrame, tab_position value, bool full)
 
 
 
-class BPTabView : public BTabView, virtual public BPView {
+class BPTabView : public BTabView, public BPView {
 public:
 						BPTabView(TPasObject PasObject,BRect frame, const char *name,
 							button_width width=B_WIDTH_AS_USUAL,
@@ -159,8 +159,8 @@ BPTabView::BPTabView(TPasObject PasObject,BRect frame, const char *name,
 							resizingMode,
 							flags),
           BPView(PasObject, frame, name, resizingMode, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 }							
 								
@@ -168,8 +168,8 @@ BPTabView::BPTabView(TPasObject PasObject,BRect frame, const char *name,
 BPTabView::BPTabView(TPasObject PasObject, BMessage *data)
           :BTabView(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 /*
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/TextControl.cpp b/bepascal/source/bepascal/cpp/src/be/interface/TextControl.cpp
index c1cb8f9..f540b4a 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/TextControl.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/TextControl.cpp
@@ -41,7 +41,7 @@ extern "C" {
 }
 #endif
 
-class BPTextControl : public BTextControl, virtual public BPControl {
+class BPTextControl : public BTextControl, public BPControl {
 
 public:
 		BPTextControl(TPasObject PasObject, 
@@ -125,9 +125,9 @@ BPTextControl::BPTextControl(TPasObject PasObject,
 					  message,rmask,flags),
           BPControl(PasObject, frame, name, label, message,
           rmask, flags), 
-          BPView(PasObject, frame, name, rmask, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+//       BPView(PasObject, frame, name, rmask, flags),
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -135,9 +135,9 @@ BPTextControl::BPTextControl(TPasObject PasObject,
 BPTextControl::BPTextControl(TPasObject PasObject, BMessage *archive)
           :BTextControl(archive),
           BPControl(PasObject, archive),
-          BPView(PasObject, archive),
-          BPHandler(PasObject, archive),
-          BPasObject(PasObject)
+//       BPView(PasObject, archive),
+          BPHandler(PasObject, archive)
+//       BPasObject(PasObject)
 {
 
 }
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/TextView.cpp b/bepascal/source/bepascal/cpp/src/be/interface/TextView.cpp
index 83329e6..136440f 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/TextView.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/TextView.cpp
@@ -40,7 +40,7 @@ extern "C" {
 }
 #endif
 
-class BPTextView : public BTextView, virtual public BPView {
+class BPTextView : public BTextView, public BPView {
 public:
 						BPTextView(TPasObject PasObject,
 								   BRect			frame,
@@ -232,8 +232,8 @@ BPTextView::BPTextView(TPasObject PasObject,
 					 resizeMask, 
 					 flags), 
           BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -255,8 +255,8 @@ BPTextView::BPTextView(TPasObject PasObject,
 					 resizeFlags, 
 					 flags), 
           BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
-          BPHandler(PasObject, name),
-          BPasObject(PasObject)
+          BPHandler(PasObject, name)
+//       BPasObject(PasObject)
 {
 
 }
@@ -265,8 +265,8 @@ BPTextView::BPTextView(TPasObject PasObject,
 BPTextView::BPTextView(TPasObject PasObject, BMessage *data)
           :BTextView(data),
           BPView(PasObject, data),
-          BPHandler(PasObject, data),
-          BPasObject(PasObject)
+          BPHandler(PasObject, data)
+//       BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/View.cpp b/bepascal/source/bepascal/cpp/src/be/interface/View.cpp
index 0364df1..ad6688f 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/View.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/View.cpp
@@ -94,15 +94,15 @@ BPView::BPView(TPasObject PasObject,
 			   uint32 resizingMode,
 			   uint32 flags)
 			   : BView(frame, name, resizingMode, flags),
-               BPHandler(PasObject),
-               BPasObject(PasObject)
+               BPHandler(PasObject)
+//            BPasObject(PasObject)
 {
 }
 
 BPView::BPView(TPasObject PasObject, BMessage *archive)
 				: BView(archive),
-                  BPHandler(PasObject),				
-	              BPasObject(PasObject)
+                  BPHandler(PasObject)				
+//	              BPasObject(PasObject)
 {
 }
 
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Window.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Window.cpp
index c76be05..0b938e0 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Window.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Window.cpp
@@ -45,9 +45,9 @@ BPWindow::BPWindow(TPasObject PasObject,
 				 uint32 flags,
 				 uint32 workspaces = B_CURRENT_WORKSPACE)
 				 : BWindow(frame, title, type, flags, workspaces),
-                 BPLooper(PasObject),
-                 BPHandler(PasObject, title),
-                 BPasObject(PasObject)
+                 BPLooper(PasObject)
+//              BPHandler(PasObject, title),
+//              BPasObject(PasObject)
 {
 }
 
@@ -2100,4 +2100,4 @@ BWindow_WindowType(BWindow *Window) const
 }
 #endif
 
-#endif /* _WINDOW_CPP_ */
\ No newline at end of file
+#endif /* _WINDOW_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/support/Archivable.cpp b/bepascal/source/bepascal/cpp/src/be/support/Archivable.cpp
index e7e3c0f..8fe1ea4 100644
--- a/bepascal/source/bepascal/cpp/src/be/support/Archivable.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/support/Archivable.cpp
@@ -112,4 +112,4 @@ status_t BArchivable_Archive(TCPlusObject archivable, TCPlusObject into, bool de
 }
 #endif
 
-#endif /* _ARCHIVABLE_CPP_ */
\ No newline at end of file
+#endif /* _ARCHIVABLE_CPP_ */
diff --git a/bepascal/source/tools/headertoxml/source/Jamfile b/bepascal/source/tools/headertoxml/source/Jamfile
index 1970dd1..73d2b55 100644
--- a/bepascal/source/tools/headertoxml/source/Jamfile
+++ b/bepascal/source/tools/headertoxml/source/Jamfile
@@ -20,4 +20,9 @@
 
 SubDir BEPASCAL_TOP source tools headertoxml source ;
 
+actions fpc
+{
+	fpc -g -S2 $(2) -FE$(dir) -Fusource/tools/stubgen.so/pas/ -Fllib ;
+}
+
 Objects headertoxml.pp ;
diff --git a/bepascal/source/tools/stubgen.so/cpp/Jamfile b/bepascal/source/tools/stubgen.so/cpp/Jamfile
index a0bf456..c8b491e 100644
--- a/bepascal/source/tools/stubgen.so/cpp/Jamfile
+++ b/bepascal/source/tools/stubgen.so/cpp/Jamfile
@@ -112,8 +112,9 @@ DRIVER_PATH on $(NAME) =  ;
 
 # Specify the name of the binary
 #	If the name has spaces, you must quote it: "My App"
-BeMain libstubgen.so : lexer.l
-        parser.y
+
+BeMain libstubgen.so : parser.y
+        lexer.l
         getopt.c 
         main.c 
         pathname.c
diff --git a/bepascal/source/tools/stubgen.so/cpp/lexer.c b/bepascal/source/tools/stubgen.so/cpp/lexer.c
index 8ba4d3c..aad962f 100644
--- a/bepascal/source/tools/stubgen.so/cpp/lexer.c
+++ b/bepascal/source/tools/stubgen.so/cpp/lexer.c
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/haiku/befpc/bepascal/source/tools/stubgen.so/cpp/lexer.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $
+ * $Header: /home/haiku/befpc/bepascal/source/tools/stubgen.so/cpp/lexer.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $
  */
 
 #define FLEX_SCANNER
@@ -596,7 +596,7 @@ char *yytext;
  *  (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z)
  *
  *  DATE: Thu Aug 15 13:10:06 EDT 1996
- *   $Id: lexer.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $
+ *   $Id: lexer.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $
  *
  *  Copyright (c) 1996-1998  Michael John Radwin
  *
@@ -755,7 +755,7 @@ char *yytext;
 #if 0 /* #ifdef WIN32 */
 #include "y_tab.h"
 #else
-#include "y.tab.h"
+#include "parser.h"
 #endif
 
 #ifdef __cplusplus
@@ -772,7 +772,7 @@ char *yytext;
    the value as a pointer */
 #define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x)
 
-static const char rcsid[] = "$Id: lexer.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $";
+static const char rcsid[] = "$Id: lexer.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $";
 
 static void count();
 static void comment();
diff --git a/bepascal/source/tools/stubgen.so/cpp/lexer.l b/bepascal/source/tools/stubgen.so/cpp/lexer.l
index 23d29dc..bce054a 100644
--- a/bepascal/source/tools/stubgen.so/cpp/lexer.l
+++ b/bepascal/source/tools/stubgen.so/cpp/lexer.l
@@ -9,7 +9,7 @@
  *  (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z)
  *
  *  DATE: Thu Aug 15 13:10:06 EDT 1996
- *   $Id: lexer.l,v 1.1 2003-09-21 22:46:55 ocoursiere Exp $
+ *   $Id: lexer.l,v 1.2 2003-10-20 22:46:40 jetsoni Exp $
  *
  *  Copyright (c) 1996-1998  Michael John Radwin
  *
@@ -29,6 +29,9 @@
  *
  *  Modification history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.1  2003/09/21 22:46:55  ocoursiere
+ *  stubgen.so is now include in the build process
+ *
  *  Revision 1.1  2001/11/07 10:06:07  ithamar
  *  Added stubgen to CVS
  *
@@ -174,7 +177,7 @@ IS			(u|U|l|L)*
 #if 0 /* #ifdef WIN32 */
 #include "y_tab.h"
 #else
-#include "y.tab.h"
+#include "parser.h"
 #endif
 
 #ifdef __cplusplus
@@ -191,7 +194,7 @@ IS			(u|U|l|L)*
    the value as a pointer */
 #define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x)
 
-static const char rcsid[] = "$Id: lexer.l,v 1.1 2003-09-21 22:46:55 ocoursiere Exp $";
+static const char rcsid[] = "$Id: lexer.l,v 1.2 2003-10-20 22:46:40 jetsoni Exp $";
 
 static void count();
 static void comment();
diff --git a/bepascal/source/tools/stubgen.so/cpp/parser.c b/bepascal/source/tools/stubgen.so/cpp/parser.c
index 81980af..e43d0a4 100644
--- a/bepascal/source/tools/stubgen.so/cpp/parser.c
+++ b/bepascal/source/tools/stubgen.so/cpp/parser.c
@@ -69,7 +69,7 @@
  *  This grammar is only a subset of the real C++ language.
  *
  *  DATE: Thu Aug 15 13:10:06 EDT 1996
- *   $Id: parser.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $
+ *   $Id: parser.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $
  *
  *  Copyright (c) 1996-1998  Michael John Radwin
  *
@@ -195,7 +195,7 @@
  *  };
  *
  *  Error:
- *  stubgen version 2.0-beta $Revision: 1.4 $.
+ *  stubgen version 2.0-beta $Revision: 1.5 $.
  *  parse error at line 4, file test.H:
  *   public:
  *        ^
@@ -415,7 +415,7 @@ extern int collectMemberInitList();
 /* defined here in parser.y */
 static int error_recovery();
 static int yyerror(char *);
-static const char rcsid[] = "$Id: parser.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $";
+static const char rcsid[] = "$Id: parser.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $";
 
 /* defined in main.c */
 extern FILE *outfile;