From eb5d562ee615d29b42d51abd0a2e1900d3c30ec0 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Sun, 8 Sep 2013 11:54:49 -0400
Subject: [PATCH] How can I please you, O GCC?

---
 src/MainWindow.cpp   | 12 ++++++------
 src/PianoControl.cpp |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 4ae0dec..8677b27 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -59,7 +59,7 @@ BOOL MainWindow::WinRegisterClass(WNDCLASS *pwc)
 {
     pwc->style = CS_HREDRAW | CS_VREDRAW;
     pwc->hbrBackground = (HBRUSH) (COLOR_3DFACE + 1);
-    return __super::WinRegisterClass(pwc);
+    return Window::WinRegisterClass(pwc);
 }
 
 LRESULT MainWindow::OnCreate()
@@ -258,7 +258,7 @@ int GetMIDINote(WPARAM wCode)
 
 bool MainWindow::Play(WPARAM wParam, LPARAM lParam, bool down)
 {
-    int note, id;
+    int note;
     WORD wCode = GetQWERTYKeyCode((WORD) wParam);
     if (wCode > 255 || !keymap[wCode] || (down && (lParam & 0x40000000)))
         return false;
@@ -362,13 +362,13 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
             delete [] m_keychars;
         m_keychars = new WCHAR[size];
         for (i = 0; i < size; ++i) {
-            WORD scan = VkKeyScanEx(keychars[i], hklQWERTY);
+            WORD scan = VkKeyScanEx(keychars[i], hklQWERTY), vk, ch;
             if (LOBYTE(scan) == -1)
                 goto giveup;
-            WORD vk = GetRealKeyCode(LOBYTE(scan));
+            vk = GetRealKeyCode(LOBYTE(scan));
             if (!vk || vk == LOBYTE(scan))
                 goto giveup;
-            WCHAR ch = (WCHAR) MapVirtualKey(vk, MAPVK_VK_TO_CHAR);
+            ch = (WCHAR) MapVirtualKey(vk, MAPVK_VK_TO_CHAR);
             if (!ch)
                 goto giveup;
             m_keychars[i] = ch;
@@ -393,7 +393,7 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
         SetWindowLongPtr(m_hwnd, GWL_EXSTYLE, GetWindowLongPtr(m_hwnd, GWL_EXSTYLE) & ~WS_EX_COMPOSITED);
         return 0;
     }
-    return __super::HandleMessage(uMsg, wParam, lParam);
+    return Window::HandleMessage(uMsg, wParam, lParam);
 }
 
 MainWindow *MainWindow::Create(LPCTSTR szTitle)
diff --git a/src/PianoControl.cpp b/src/PianoControl.cpp
index d1c1c9c..01e2c64 100644
--- a/src/PianoControl.cpp
+++ b/src/PianoControl.cpp
@@ -3,9 +3,14 @@
 #include <windowsx.h>
 #include <stdio.h>
 
+#ifndef max
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
 BOOL PianoControl::WinRegisterClass(WNDCLASS *pwc)
 {
-    return __super::WinRegisterClass(pwc);
+    return Window::WinRegisterClass(pwc);
 }
 
 LRESULT PianoControl::OnCreate()
@@ -493,7 +498,7 @@ LRESULT PianoControl::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
         SetBackground((HBRUSH) wParam);
         return 0;
     }
-    return __super::HandleMessage(uMsg, wParam, lParam);
+    return Window::HandleMessage(uMsg, wParam, lParam);
 }
 
 PianoControl *PianoControl::Create(LPCTSTR szTitle, HWND hwParent,