From 5c902585467a42518249da6e0c37eeca277fdd66 Mon Sep 17 00:00:00 2001
From: MusicalProgrammer <38636805+MusicalProgrammer@users.noreply.github.com>
Date: Tue, 12 Jun 2018 14:24:14 -0400
Subject: [PATCH] Quick initialization fix. Small mouse bug fixed too.

---
 Demo.h   |  2 +-
 main.cpp | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Demo.h b/Demo.h
index a1b67bc..1227a4e 100644
--- a/Demo.h
+++ b/Demo.h
@@ -22,7 +22,7 @@ class Demo { // : public GApp {
 		void		onCreate(HWND parentWindow);
 		void		onKeyPressed(int key);
 		void		onKeyUp(int key);
-		void		onMouseLeftPressed(int x, int y);
+		void		onMouseLeftPressed(HWND hwnd,int x, int y);
 		void		onMouseLeftUp(int x, int y);
 		void		onMouseRightPressed(int x, int y);
 		void		onMouseRightUp(int x, int y);
diff --git a/main.cpp b/main.cpp
index dabb245..cf6d0cc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -118,9 +118,6 @@ Demo::Demo(const GAppSettings& settings,HWND parentWindow) { //: GApp(settings,w
 
 	Win32Window* window = Win32Window::create(settings.window,_hwndRenderer);
 	ShowWindow(_hwndRenderer, SW_SHOW);
-	SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
-	SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
-	SetWindowLongPtr(_hwndToolbox,GWL_USERDATA,(LONG)this);
 	ShowWindow(_hWndMain, SW_SHOW);
 	quit=false;
 	rightButtonHolding=false;
@@ -138,6 +135,9 @@ Demo::Demo(const GAppSettings& settings,HWND parentWindow) { //: GApp(settings,w
     _window = renderDevice->window();
     _window->makeCurrent();
 
+	SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
+	SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
+	SetWindowLongPtr(_hwndToolbox,GWL_USERDATA,(LONG)this);
 }
 
 void clearInstances()
@@ -1200,8 +1200,10 @@ void Demo::onKeyUp(int key)
 
 }
 
-void Demo::onMouseLeftPressed(int x,int y)
+void Demo::onMouseLeftPressed(HWND hwnd,int x,int y)
 {
+	SetFocus(hwnd);
+
 	std::cout << "Click: " << x << "," << y << std::endl;
 
 	bool onGUI = false;
@@ -1379,7 +1381,7 @@ LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             app->QuitApp();
         break;
 		case WM_LBUTTONDOWN:
-			app->onMouseLeftPressed(LOWORD(lParam),HIWORD(lParam));
+			app->onMouseLeftPressed(hwnd,LOWORD(lParam),HIWORD(lParam));
 		break;
 		case WM_LBUTTONUP:
 			app->onMouseLeftUp(LOWORD(lParam),HIWORD(lParam));