summaryrefslogtreecommitdiffstats
path: root/win/tkWinWm.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-04-29 15:28:04 (GMT)
committernijtmans <nijtmans>2010-04-29 15:28:04 (GMT)
commitb36ef0e6d25a1a247dab7d8d39cc8f4242df1450 (patch)
tree82bad50df8f16a12bb06512831f4ee71e21981ce /win/tkWinWm.c
parentbcca65eae4c1a94002d5f9aa9bd7fb75dc48b0fa (diff)
downloadtk-b36ef0e6d25a1a247dab7d8d39cc8f4242df1450.zip
tk-b36ef0e6d25a1a247dab7d8d39cc8f4242df1450.tar.gz
tk-b36ef0e6d25a1a247dab7d8d39cc8f4242df1450.tar.bz2
Unnessarary TCL_STORAGE_CLASS re-definitions
Make various functions MODULE_SCOPE TCHAR-related fixes, making al those files compile fine when TCHAR != char.
Diffstat (limited to 'win/tkWinWm.c')
-rw-r--r--win/tkWinWm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 26d9d55..ce9b618 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinWm.c,v 1.142 2009/11/22 23:49:26 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.143 2010/04/29 15:28:04 nijtmans Exp $
*/
#include "tkWinInt.h"
@@ -908,7 +908,7 @@ InitWindowClass(
initialized = 1;
if (shgetfileinfoProc == NULL) {
- HINSTANCE hInstance = LoadLibraryA("shell32");
+ HINSTANCE hInstance = LoadLibrary(TEXT("shell32"));
if (hInstance != NULL) {
shgetfileinfoProc = (DWORD* (WINAPI *) (LPCTSTR pszPath,
@@ -919,7 +919,7 @@ InitWindowClass(
}
}
if (setLayeredWindowAttributesProc == NULL) {
- HINSTANCE hInstance = LoadLibraryA("user32");
+ HINSTANCE hInstance = LoadLibrary(TEXT("user32"));
if (hInstance != NULL) {
setLayeredWindowAttributesProc = (BOOL (WINAPI*)(HWND hwnd,
@@ -942,7 +942,7 @@ InitWindowClass(
class.lpszClassName = (LPCTSTR) Tcl_DStringValue(&classString);
class.lpfnWndProc = WmProc;
if (titlebaricon == NULL) {
- class.hIcon = LoadIcon(Tk_GetHINSTANCE(), "tk");
+ class.hIcon = LoadIcon(Tk_GetHINSTANCE(), TEXT("tk"));
} else {
class.hIcon = GetIcon(titlebaricon, ICON_BIG);
if (class.hIcon == NULL) {