6 files changed, 3 insertions, 27 deletions
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index f4198e50cd..19fe2f79fb 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -27,7 +27,7 @@ def get_flags():
 	]
 
 def configure(env):
-	is64=sys.maxsize > 2**32
+	is64 = sys.maxsize > 2**32
 
 	if (env["bits"]=="default"):
 		if (is64):
diff --git a/platform/haiku/haiku_application.cpp b/platform/haiku/haiku_application.cpp
index 56024f605d..ea20d73729 100644
--- a/platform/haiku/haiku_application.cpp
+++ b/platform/haiku/haiku_application.cpp
@@ -1,7 +1,7 @@
 #include "haiku_application.h"
 
 HaikuApplication::HaikuApplication()
-   : BApplication("application/x-vnd.Haiku-GLDirectMode")
+   : BApplication("application/x-vnd.Godot")
 {
 
 }
diff --git a/platform/haiku/haiku_application.h b/platform/haiku/haiku_application.h
index 995a917d62..a64b01c94d 100644
--- a/platform/haiku/haiku_application.h
+++ b/platform/haiku/haiku_application.h
@@ -8,8 +8,6 @@ class HaikuApplication : public BApplication
 {
 public:
    HaikuApplication();
-//private:
-//   HaikuDirectWindow* window;
 };
 
 #endif
diff --git a/platform/haiku/haiku_direct_window.cpp b/platform/haiku/haiku_direct_window.cpp
index 2097ace497..3914ee272a 100644
--- a/platform/haiku/haiku_direct_window.cpp
+++ b/platform/haiku/haiku_direct_window.cpp
@@ -55,8 +55,6 @@ void HaikuDirectWindow::DirectConnected(direct_buffer_info* info) {
 void HaikuDirectWindow::MessageReceived(BMessage* message) {
 	switch (message->what) {
 		case REDRAW_MSG:
-			Sync();
-
 			if (Main::iteration() == true) {
 				view->EnableDirectMode(false);
 				Quit();
@@ -110,8 +108,6 @@ void HaikuDirectWindow::DispatchMessage(BMessage* message, BHandler* handler) {
 }
 
 void HaikuDirectWindow::HandleMouseButton(BMessage* message) {
-	message->PrintToStream();
-
 	BPoint where;
 	if (message->FindPoint("where", &where) != B_OK) {
 		return;
@@ -236,7 +232,6 @@ void HaikuDirectWindow::HandleMouseWheelChanged(BMessage* message) {
 }
 
 void HaikuDirectWindow::HandleKeyboardEvent(BMessage* message) {
-	message->PrintToStream();
 	int32 raw_char = 0;
 	int32 key = 0;
 	int32 modifiers = 0;
@@ -278,8 +273,6 @@ void HaikuDirectWindow::HandleKeyboardEvent(BMessage* message) {
 }
 
 void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage* message) {
-	message->PrintToStream();
-
 	int32 old_modifiers = 0;
 	int32 modifiers = 0;
 
diff --git a/platform/haiku/haiku_gl_view.cpp b/platform/haiku/haiku_gl_view.cpp
index 8adab96a87..481d6098a7 100644
--- a/platform/haiku/haiku_gl_view.cpp
+++ b/platform/haiku/haiku_gl_view.cpp
@@ -2,7 +2,7 @@
 #include "haiku_gl_view.h"
 
 HaikuGLView::HaikuGLView(BRect frame, uint32 type)
-   : BGLView(frame, "SampleGLView", B_FOLLOW_ALL_SIDES, 0, type)
+   : BGLView(frame, "GodotGLView", B_FOLLOW_ALL_SIDES, 0, type)
 {
 }
 
@@ -16,16 +16,3 @@ void HaikuGLView::AttachedToWindow(void) {
 void HaikuGLView::Draw(BRect updateRect) {
 	Main::force_redraw();
 }
-
-void HaikuGLView::MessageReceived(BMessage* msg)
-{
-	// TODO: remove if not needed
-	switch (msg->what) {
-		default:	
-			BGLView::MessageReceived(msg);
-	}
-}
-
-void HaikuGLView::MouseMoved (BPoint where, uint32 code, const BMessage *dragMessage) {
-	ERR_PRINT("MouseMoved()");
-}
diff --git a/platform/haiku/haiku_gl_view.h b/platform/haiku/haiku_gl_view.h
index 78ebb513a8..f44b6d4325 100644
--- a/platform/haiku/haiku_gl_view.h
+++ b/platform/haiku/haiku_gl_view.h
@@ -9,8 +9,6 @@ class HaikuGLView : public BGLView
 public:
 	HaikuGLView(BRect frame, uint32 type);
 	virtual void AttachedToWindow(void);
-	virtual void MessageReceived(BMessage* msg);
-	virtual void MouseMoved (BPoint where, uint32 code, const BMessage *dragMessage);
 	virtual void Draw(BRect updateRect);
 };