some includes restored, mir_full.sln updated, some renaming of folders and projects

git-svn-id: http://svn.miranda-ng.org/main/trunk@140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/CommonLibs/ThemedImageCheckbox.cpp b/plugins/CommonLibs/ThemedImageCheckbox.cpp
index ea0fbcea0a..ae239369b7 100644
--- a/plugins/CommonLibs/ThemedImageCheckbox.cpp
+++ b/plugins/CommonLibs/ThemedImageCheckbox.cpp
@@ -59,7 +59,7 @@ public:
 

 static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)

 {

-	CCheckboxData *dat = (CCheckboxData*)GetWindowLong(hWnd, GWL_USERDATA);

+	CCheckboxData *dat = (CCheckboxData*)GetWindowLong(hWnd, GWLP_USERDATA);

 	if (!dat)

 	{

 		return 0;

@@ -355,7 +355,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
 		} break;

 		case WM_DESTROY:

 		{

-			SetWindowLong(hWnd, GWL_USERDATA, NULL);

+			SetWindowLong(hWnd, GWLP_USERDATA, NULL);

 			CallWindowProc(dat->OldWndProc, hWnd, Msg, wParam, lParam);

 			delete dat;

 			return 0;

@@ -367,7 +367,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
 int MakeThemedImageCheckbox(HWND hWndCheckbox)

 { // workaround to make checkbox with BS_ICON or BS_BITMAP work with windows themes enabled

 	CCheckboxData *dat = new CCheckboxData();

-	dat->OldWndProc = (WNDPROC)GetWindowLong(hWndCheckbox, GWL_WNDPROC);

+	dat->OldWndProc = (WNDPROC)GetWindowLong(hWndCheckbox, GWLP_WNDPROC);

 	dat->State = SendMessage(hWndCheckbox, BM_GETSTATE, 0, 0);

 	long Style = GetWindowLong(hWndCheckbox, GWL_STYLE);

 	_ASSERT(Style & BS_ICON || Style & BS_BITMAP);

@@ -376,7 +376,7 @@ int MakeThemedImageCheckbox(HWND hWndCheckbox)
   Style &= ~(BS_CHECKBOX | BS_AUTOCHECKBOX | BS_3STATE | BS_AUTO3STATE);

   Style |= BS_OWNERDRAW;

 	SetWindowLong(hWndCheckbox, GWL_STYLE, Style);

-	SetWindowLong(hWndCheckbox, GWL_USERDATA, (LONG)dat);

-	SetWindowLong(hWndCheckbox, GWL_WNDPROC, (LONG)CheckboxWndProc);

+	SetWindowLong(hWndCheckbox, GWLP_USERDATA, (LONG)dat);

+	SetWindowLong(hWndCheckbox, GWLP_WNDPROC, (LONG)CheckboxWndProc);

 	return 0;

 }