diff options
| author | nijtmans <nijtmans> | 2010-04-29 15:28:04 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-04-29 15:28:04 (GMT) |
| commit | b36ef0e6d25a1a247dab7d8d39cc8f4242df1450 (patch) | |
| tree | 82bad50df8f16a12bb06512831f4ee71e21981ce /win/tkWinButton.c | |
| parent | bcca65eae4c1a94002d5f9aa9bd7fb75dc48b0fa (diff) | |
| download | tk-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/tkWinButton.c')
| -rw-r--r-- | win/tkWinButton.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c index 1a89abf..3c89ebc 100644 --- a/win/tkWinButton.c +++ b/win/tkWinButton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinButton.c,v 1.40 2010/02/18 22:31:31 nijtmans Exp $ + * RCS: @(#) $Id: tkWinButton.c,v 1.41 2010/04/29 15:28:04 nijtmans Exp $ */ #define OEMRESOURCE @@ -133,7 +133,7 @@ InitBoxes(void) ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - hrsrc = FindResource(module, "buttons", RT_BITMAP); + hrsrc = FindResource(module, TEXT("buttons"), RT_BITMAP); if (hrsrc == NULL) { Tcl_Panic("FindResource() failed for buttons bitmap resource, " "resources in tk_base.rc must be linked into Tk dll or static executable"); @@ -243,15 +243,15 @@ CreateProc( { Window window; HWND parent; - const char *class; + const TCHAR *class; WinButton *butPtr = (WinButton *)instanceData; parent = Tk_GetHWND(parentWin); if (butPtr->info.type == TYPE_LABEL) { - class = "STATIC"; + class = TEXT("STATIC"); butPtr->style = SS_OWNERDRAW | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; } else { - class = "BUTTON"; + class = TEXT("BUTTON"); butPtr->style = BS_OWNERDRAW | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; } butPtr->hwnd = CreateWindow(class, NULL, butPtr->style, |