diff --git a/COM380/Project4/Project4/Form1.h b/COM380/Project4/Project4/Form1.h index 3f8636a..c6a9fad 100644 --- a/COM380/Project4/Project4/Form1.h +++ b/COM380/Project4/Project4/Form1.h @@ -425,7 +425,7 @@ namespace Project4 public: List^ balls; public: static array^ numbers; - private: bool isClosing = false; + private: bool isClosing; private: List^ radioButtons; public: System::Void SetNum(int index, int number); diff --git a/COM380/Project4/Project4/Project4.vcxproj b/COM380/Project4/Project4/Project4.vcxproj index a7d379c..d3151e5 100644 --- a/COM380/Project4/Project4/Project4.vcxproj +++ b/COM380/Project4/Project4/Project4.vcxproj @@ -20,7 +20,7 @@ Application true - v120 + v110 Pure Unicode diff --git a/COM380/Project5/GambleKit/CustomGameLogic/MainWindow.cpp b/COM380/Project5/GambleKit/CustomGameLogic/MainWindow.cpp index 5c4c94c..f08e7ca 100644 --- a/COM380/Project5/GambleKit/CustomGameLogic/MainWindow.cpp +++ b/COM380/Project5/GambleKit/CustomGameLogic/MainWindow.cpp @@ -23,7 +23,7 @@ MainWindow::MainWindow(void) this->game = new CustomGame(this->graphicsDevice, this->soundDevice); this->SetPosition(0, 0); - this->SetSize(800, 600); + this->SetSize(815, 638); this->SetActive(); } diff --git a/COM380/Project5/GambleKit/Engine/OSSpecific/GkWindowsForm.cpp b/COM380/Project5/GambleKit/Engine/OSSpecific/GkWindowsForm.cpp index 18717cf..78b7fc5 100644 --- a/COM380/Project5/GambleKit/Engine/OSSpecific/GkWindowsForm.cpp +++ b/COM380/Project5/GambleKit/Engine/OSSpecific/GkWindowsForm.cpp @@ -292,7 +292,7 @@ GkWindowsForm::GkWindowsForm(void) this->top = 0; this->width = 640; this->height = 480; - this->caption = "Window Title"; + this->caption = "Amrit's COM 380 Slot Machine"; //this->windowMode = GkWindowsForm::WindowMode_Windowed; this->windowMode = GkWindowsForm::WindowMode_FullScreen; @@ -337,16 +337,16 @@ bool GkWindowsForm::RegisterWindowClass() bool GkWindowsForm::CreateFormWindow() { - long wndStyle = this->windowMode == GkWindowsForm::WindowMode_FullScreen ? WS_POPUP : WS_OVERLAPPEDWINDOW; + long wndStyle = this->windowMode == GkWindowsForm::WindowMode_FullScreen ? WS_POPUP | WS_CAPTION: WS_OVERLAPPEDWINDOW | WS_CAPTION; wndStyle |= WS_CLIPCHILDREN | WS_CLIPSIBLINGS; // Translate from client rect to window rect - RECT wRect = { this->left, this->top, this->left + this->width, this->top + this->height }; + RECT wRect = { this->left, this->top, this->width, this->height }; AdjustWindowRect(&wRect, wndStyle, false); this->handle = CreateWindow(GkWindowsForm::FormClassName, this->caption, wndStyle, - this->left, this->top, wRect.right - wRect.left, wRect.bottom - wRect.top, + this->left, this->top, 0, 0, NULL, NULL, this->applicationInstance, NULL); @@ -385,8 +385,8 @@ void GkWindowsForm::SetSize(int width, int height) void GkWindowsForm::SetStyle() { - SetWindowLong(this->handle, GWL_STYLE, WS_POPUP | WS_MINIMIZEBOX); - SetWindowLong(this->handle, GWL_EXSTYLE, 0); + SetWindowLong(this->handle, GWL_STYLE, WS_POPUP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); + SetWindowLong(this->handle, GWL_EXSTYLE, WS_EX_APPWINDOW); //SetWindowLong(this->handle, GWL_STYLE, WS_POPUP); //SetWindowLong(this->handle, GWL_EXSTYLE, WS_EX_APPWINDOW); }