From 6ec5f4800de80cdc9f21a2764c44260bc690e96a Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Fri, 22 Apr 2016 20:14:12 -0400
Subject: [PATCH] Migrated simple controls to C++.

---
 windows/{button.c => button.cpp}                 | 2 +-
 windows/{checkbox.c => checkbox.cpp}             | 2 +-
 windows/{combobox.c => combobox.cpp}             | 6 +++---
 windows/{entry.c => entry.cpp}                   | 4 ++--
 windows/{multilineentry.c => multilineentry.cpp} | 4 ++--
 windows/{progressbar.c => progressbar.cpp}       | 2 +-
 windows/{slider.c => slider.cpp}                 | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename windows/{button.c => button.cpp} (98%)
 rename windows/{checkbox.c => checkbox.cpp} (98%)
 rename windows/{combobox.c => combobox.cpp} (94%)
 rename windows/{entry.c => entry.cpp} (95%)
 rename windows/{multilineentry.c => multilineentry.cpp} (96%)
 rename windows/{progressbar.c => progressbar.cpp} (98%)
 rename windows/{slider.c => slider.cpp} (98%)

diff --git a/windows/button.c b/windows/button.cpp
similarity index 98%
rename from windows/button.c
rename to windows/button.cpp
index 5dc3eacf..283ac73c 100644
--- a/windows/button.c
+++ b/windows/button.cpp
@@ -1,5 +1,5 @@
 // 7 april 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 struct uiButton {
 	uiWindowsControl c;
diff --git a/windows/checkbox.c b/windows/checkbox.cpp
similarity index 98%
rename from windows/checkbox.c
rename to windows/checkbox.cpp
index ce7e6c0c..7b3ef2b1 100644
--- a/windows/checkbox.c
+++ b/windows/checkbox.cpp
@@ -1,5 +1,5 @@
 // 7 april 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 struct uiCheckbox {
 	uiWindowsControl c;
diff --git a/windows/combobox.c b/windows/combobox.cpp
similarity index 94%
rename from windows/combobox.c
rename to windows/combobox.cpp
index 1ef38920..f4cf539c 100644
--- a/windows/combobox.c
+++ b/windows/combobox.cpp
@@ -1,5 +1,5 @@
 // 20 may 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 // TODO
 // - is there extra space on the bottom?
@@ -54,9 +54,9 @@ void uiComboboxAppend(uiCombobox *c, const char *text)
 	wtext = toUTF16(text);
 	res = SendMessageW(c->hwnd, CB_ADDSTRING, 0, (LPARAM) wtext);
 	if (res == (LRESULT) CB_ERR)
-		logLastError("error appending item to uiCombobox");
+		logLastError(L"error appending item to uiCombobox");
 	else if (res == (LRESULT) CB_ERRSPACE)
-		logLastError("memory exhausted appending item to uiCombobox");
+		logLastError(L"memory exhausted appending item to uiCombobox");
 	uiFree(wtext);
 }
 
diff --git a/windows/entry.c b/windows/entry.cpp
similarity index 95%
rename from windows/entry.c
rename to windows/entry.cpp
index f0f2c5af..2434bd0f 100644
--- a/windows/entry.c
+++ b/windows/entry.cpp
@@ -1,5 +1,5 @@
 // 8 april 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 struct uiEntry {
 	uiWindowsControl c;
@@ -76,7 +76,7 @@ void uiEntrySetReadOnly(uiEntry *e, int readonly)
 	if (readonly)
 		ro = (WPARAM) TRUE;
 	if (SendMessage(e->hwnd, EM_SETREADONLY, ro, 0) == 0)
-		logLastError("error making uiEntry read-only in uiEntrySetReadOnly()");
+		logLastError(L"error making uiEntry read-only");
 }
 
 uiEntry *uiNewEntry(void)
diff --git a/windows/multilineentry.c b/windows/multilineentry.cpp
similarity index 96%
rename from windows/multilineentry.c
rename to windows/multilineentry.cpp
index 10a41559..768cb2ca 100644
--- a/windows/multilineentry.c
+++ b/windows/multilineentry.cpp
@@ -1,5 +1,5 @@
 // 8 april 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 // TODO there's alpha darkening of text going on; something is up in our parent logic
 // TODO resizing collapses newlines
@@ -95,7 +95,7 @@ void uiMultilineEntrySetReadOnly(uiMultilineEntry *e, int readonly)
 	if (readonly)
 		ro = (WPARAM) TRUE;
 	if (SendMessage(e->hwnd, EM_SETREADONLY, ro, 0) == 0)
-		logLastError("error making uiMultilineEntry read-only in uiMultilineEntrySetReadOnly()");
+		logLastError(L"error making uiMultilineEntry read-only");
 }
 
 uiMultilineEntry *uiNewMultilineEntry(void)
diff --git a/windows/progressbar.c b/windows/progressbar.cpp
similarity index 98%
rename from windows/progressbar.c
rename to windows/progressbar.cpp
index 749a327f..86f85031 100644
--- a/windows/progressbar.c
+++ b/windows/progressbar.cpp
@@ -1,5 +1,5 @@
 // 19 may 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 struct uiProgressBar {
 	uiWindowsControl c;
diff --git a/windows/slider.c b/windows/slider.cpp
similarity index 98%
rename from windows/slider.c
rename to windows/slider.cpp
index c6564671..87fb5bd4 100644
--- a/windows/slider.c
+++ b/windows/slider.cpp
@@ -1,5 +1,5 @@
 // 20 may 2015
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 struct uiSlider {
 	uiWindowsControl c;