ISSUE-21: Added a caption argument to the Win32RenderWindow constructor.

Author: JasonZink

win32/N3888_RefImpl/Win32RenderWindow.cpp

@@ -14,7 +14,7 @@ LRESULT CALLBACK InternalWindowProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM
 
 
 
-Win32RenderWindow::Win32RenderWindow( unsigned int width, unsigned int height ) :
+Win32RenderWindow::Win32RenderWindow(unsigned int width, unsigned int height, const std::wstring& caption) :
 	handle( 0 )
 {
 	WNDCLASSEX wc;
@@ -32,14 +32,14 @@ Win32RenderWindow::Win32RenderWindow( unsigned int width, unsigned int height )
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
 	wc.lpszMenuName = NULL;
-	wc.lpszClassName = L"HieroglyphWin32";
-	wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+	wc.lpszClassName = L"N3888_RefImpl";
+	wc.hIconSm = LoadIcon(NULL, IDI_ASTERISK);
 
 
 	// Register the window class
 	RegisterClassEx(&wc);
 
-	// Record the desired device size
+	// Record the desired client window size
 	RECT rc;
 	rc.top = rc.left = 0;
 	rc.right = width;
@@ -59,7 +59,7 @@ Win32RenderWindow::Win32RenderWindow( unsigned int width, unsigned int height )
 	handle = CreateWindowEx(
 		NULL,								// extended style
 		wc.lpszClassName, 					// class name
-		L"N3888_RefImpl",					// instance title
+		caption.c_str(),					// instance title
 		(WS_OVERLAPPEDWINDOW | WS_VISIBLE),	// window style
 		lleft, ltop,						// initial x, y
 		lwidth,								// initial width

win32/N3888_RefImpl/Win32RenderWindow.h

@@ -4,12 +4,13 @@
 
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
 #include <windows.h>
+#include <string>
 
 class Win32RenderWindow
 {
 public:
 
-	Win32RenderWindow( unsigned int width, unsigned int height );
+	Win32RenderWindow( unsigned int width, unsigned int height, const std::wstring& caption );
 	~Win32RenderWindow();
 
 	LRESULT WindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);

win32/N3888_RefImpl/entrypoint-win32.cpp

@@ -188,7 +188,8 @@ int WINAPI wWinMain(
 
 	hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_N3888_REFIMPL));
 
-	Win32RenderWindow window( 320, 240 );
+	Win32RenderWindow window( 320, 240, L"N3888_RefImpl rocks!" );
+	Win32RenderWindow window2(320, 240, L"N3888_RefImpl rocks two times!");
 
 	// Main message loop:
 	while (msg.message != WM_QUIT) {