Oh right, also changed this to me in control implementations. Forgot that. NOW we can fix up the makefiles and test.

windows/box.cpp

@@ -24,7 +24,7 @@ static void onDestroy(uiBox *);
 uiWindowsDefineControlWithOnDestroy(
 	uiBox,								// type name
 	uiBoxType,							// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 static void onDestroy(uiBox *b)

windows/button.cpp

@@ -11,7 +11,7 @@ struct uiButton {
 uiWindowsDefineControlWithOnDestroy(
 	uiButton,								// type name
 	uiButtonType,							// type function
-	uiWindowsUnregisterWM_COMMANDHandler(this->hwnd);	// on destroy
+	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
 static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)

windows/checkbox.cpp

@@ -11,7 +11,7 @@ struct uiCheckbox {
 uiWindowsDefineControlWithOnDestroy(
 	uiCheckbox,							// type name
 	uiCheckboxType,						// type function
-	uiWindowsUnregisterWM_COMMANDHandler(this->hwnd);	// on destroy
+	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
 static BOOL onWM_COMMAND(uiControl *cc, HWND hwnd, WORD code, LRESULT *lResult)

windows/combobox.cpp

@@ -16,7 +16,7 @@ struct uiCombobox {
 uiWindowsDefineControlWithOnDestroy(
 	uiCombobox,							// type name
 	uiComboboxType,						// type function
-	uiWindowsUnregisterWM_COMMANDHandler(this->hwnd);	// on destroy
+	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
 // note: NOT triggered on entering text

windows/datetimepicker.cpp

@@ -9,7 +9,7 @@ struct uiDateTimePicker {
 uiWindowsDefineControlWithOnDestroy(
 	uiDateTimePicker,						// type name
 	uiDateTimePickerType,					// type function
-	uiWindowsUnregisterReceiveWM_WININICHANGE(this->hwnd);		// on destroy
+	uiWindowsUnregisterReceiveWM_WININICHANGE(me->hwnd);		// on destroy
 )
 
 // utility functions

windows/entry.cpp

@@ -12,7 +12,7 @@ struct uiEntry {
 uiWindowsDefineControlWithOnDestroy(
 	uiEntry,								// type name
 	uiEntryType,							// type function
-	uiWindowsUnregisterWM_COMMANDHandler(this->hwnd);	// on destroy
+	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
 static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)

windows/fontbutton.cpp

@@ -15,7 +15,7 @@ static void onDestroy(uiFontButton *);
 uiWindowsDefineControlWithOnDestroy(
 	uiFontButton,							// type name
 	uiFontButtonType,						// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 static void onDestroy(uiFontButton *b)

windows/group.cpp

@@ -13,7 +13,7 @@ static void onDestroy(uiGroup *);
 uiWindowsDefineControlWithOnDestroy(
 	uiGroup,								// type name
 	uiGroupType,							// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 static void onDestroy(uiGroup *g)

windows/multilineentry.cpp

@@ -15,7 +15,7 @@ struct uiMultilineEntry {
 uiWindowsDefineControlWithOnDestroy(
 	uiMultilineEntry,						// type name
 	uiMultilineEntryType,					// type function
-	uiWindowsUnregisterWM_COMMANDHandler(this->hwnd);	// on destroy
+	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
 static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)

windows/radiobuttons.cpp

@@ -19,7 +19,7 @@ static void onDestroy(uiRadioButtons *);
 uiWindowsDefineControlWithOnDestroy(
 	uiRadioButtons,						// type name
 	uiRadioButtonsType,						// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 static BOOL onWM_COMMAND(uiControl *c, HWND clicked, WORD code, LRESULT *lResult)

windows/slider.cpp

@@ -11,7 +11,7 @@ struct uiSlider {
 uiWindowsDefineControlWithOnDestroy(
 	uiSlider,								// type name
 	uiSliderType,							// type function
-	uiWindowsUnregisterWM_HSCROLLHandler(this->hwnd);	// on destroy
+	uiWindowsUnregisterWM_HSCROLLHandler(me->hwnd);	// on destroy
 )
 
 static BOOL onWM_HSCROLL(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)

windows/spinbox.cpp

@@ -16,7 +16,7 @@ static void onDestroy(uiSpinbox *);
 uiWindowsDefineControlWithOnDestroy(
 	uiSpinbox,							// type name
 	uiSpinboxType,						// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 // utility functions

windows/tab.cpp

@@ -18,7 +18,7 @@ static void onDestroy(uiTab *);
 uiWindowsDefineControlWithOnDestroy(
 	uiTab,								// type name
 	uiTabType,							// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 // utility functions

windows/window.cpp

@@ -20,7 +20,7 @@ static void onDestroy(uiWindow *);
 uiWindowsDefineControlWithOnDestroy(
 	uiWindow,							// type name
 	uiWindowType,							// type function
-	onDestroy(this);						// on destroy
+	onDestroy(me);						// on destroy
 )
 
 static LRESULT CALLBACK windowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)