summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Clist_modern/src')
-rw-r--r--plugins/Clist_modern/src/hdr/modern_commonheaders.h2
-rw-r--r--plugins/Clist_modern/src/modern_cachefuncs.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_skineditor.cpp70
-rw-r--r--plugins/Clist_modern/src/modern_skinopt.cpp59
-rw-r--r--plugins/Clist_modern/src/modern_viewmodebar.cpp2
5 files changed, 57 insertions, 78 deletions
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index e1e9461b3e..cc0b819c9e 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -181,8 +181,6 @@ int CLUI_ShowWindowMod(HWND hwnd, int cmd);
void MakeButtonSkinned(HWND hWnd);
-#define GSMDF_TCHAR_MY GSMDF_TCHAR|CNF_UNICODE
-
#ifndef LWA_COLORKEY
#define LWA_COLORKEY 0x00000001
#endif
diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index adbbc114c5..48f44932c6 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -311,7 +311,7 @@ int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus
// Get Status name
{
- TCHAR *tmp = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)nStatus, GSMDF_TCHAR_MY);
+ TCHAR *tmp = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)nStatus, GSMDF_TCHAR);
lstrcpyn(text, tmp, text_size);
//CopySkipUnprintableChars(text, dbv.pszVal, text_size-1);
if (text[0] != '\0')
diff --git a/plugins/Clist_modern/src/modern_skineditor.cpp b/plugins/Clist_modern/src/modern_skineditor.cpp
index 81cb437111..673e049918 100644
--- a/plugins/Clist_modern/src/modern_skineditor.cpp
+++ b/plugins/Clist_modern/src/modern_skineditor.cpp
@@ -162,8 +162,8 @@ int FillObjectTree(HWND hwndDlg, int ObjectTreeID, char * wildmask)
CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
return 0;
}
-TCHAR *TYPES[] = {_T("- Empty - (do not draw this object)"),_T("Solid fill object"),_T("Image (draw image)"),_T("Fragment (draw portion of image)")};
-TCHAR *FITMODES[] = {_T("Stretch Both directions"),_T("Stretch Vertical, Tile Horizontal"),_T("Tile Vertical, Stretch Horizontal"),_T("Tile Both directions")};
+TCHAR *TYPES[] = {LPGENT("- Empty - (do not draw this object)"),LPGENT("Solid fill object"),LPGENT("Image (draw image)"),LPGENT("Fragment (draw portion of image)")};
+TCHAR *FITMODES[] = {LPGENT("Stretch Both directions"),LPGENT("Stretch Vertical, Tile Horizontal"),LPGENT("Tile Vertical, Stretch Horizontal"),LPGENT("Tile Both directions")};
void SetAppropriateGroups(HWND hwndDlg, int Type)
//str contains default values
@@ -228,14 +228,16 @@ void SetAppropriateGroups(HWND hwndDlg, int Type)
void SetControls(HWND hwndDlg, TCHAR *str)
{
- TCHAR buf[250];
- int Type=0;
if ( !str)
{
SetAppropriateGroups(hwndDlg,-1);
return;
}
+
+ TCHAR buf[250];
GetParamN(str,buf,SIZEOF(buf),1,',',TRUE);
+
+ int Type=0;
if (!lstrcmpi(buf,_T("Solid"))) Type=1;
else if (!lstrcmpi(buf, _T("Image"))) Type=2;
else if (!lstrcmpi(buf, _T("Fragment"))) Type=3;
@@ -278,7 +280,7 @@ void SetControls(HWND hwndDlg, TCHAR *str)
SendDlgItemMessage(hwndDlg,IDC_SPIN_BOTTOM,UDM_SETPOS, 0, MAKELONG(b,0));
GetParamN(str,buf,SIZEOF(buf),2,',',TRUE);
- SendDlgItemMessageA(hwndDlg,IDC_FILE,WM_SETTEXT, 0, (LPARAM)buf);
+ SetDlgItemText(hwndDlg,IDC_FILE,buf);
GetParamN(str,buf,SIZEOF(buf),3,',',TRUE);
if (!lstrcmpi(buf,_T("TileBoth"))) fitmode = FM_TILE_BOTH;
@@ -322,7 +324,7 @@ void SetControls(HWND hwndDlg, TCHAR *str)
SendDlgItemMessage(hwndDlg,IDC_SPIN_HEIGHT,UDM_SETPOS, 0, MAKELONG(h,0));
GetParamN(str,buf,SIZEOF(buf),2,',',TRUE);
- SendDlgItemMessageA(hwndDlg,IDC_FILE,WM_SETTEXT, 0, (LPARAM)buf);
+ SetDlgItemText(hwndDlg,IDC_FILE,buf);
GetParamN(str,buf,SIZEOF(buf),7,',',TRUE);
if (!lstrcmpi(buf,_T("TileBoth"))) fitmode = FM_TILE_BOTH;
@@ -390,7 +392,7 @@ TCHAR* MadeString(HWND hwndDlg)
t = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_TOP,UDM_GETPOS, 0, 0);
r = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_RIGHT,UDM_GETPOS, 0, 0);
b = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_BOTTOM,UDM_GETPOS, 0, 0);
- SendDlgItemMessageA(hwndDlg,IDC_FILE,WM_GETTEXT,(WPARAM)MAX_PATH,(LPARAM)buf_name);
+ GetDlgItemTextA(hwndDlg, IDC_FILE, buf_name, MAX_PATH);
i = SendDlgItemMessage(hwndDlg,IDC_FIT,CB_GETCURSEL, 0, 0);
mir_snprintf(buf,SIZEOF(buf),"Glyph,Image,%s,%s,%d,%d,%d,%d,%d",buf_name,
//fitmode
@@ -402,25 +404,21 @@ TCHAR* MadeString(HWND hwndDlg)
break;
case 3:
{
- BYTE a;
- WORD l,t,b,r;
- WORD x,y,w,h;
- char buf_name[MAX_PATH] = {0};
- int i=0;
- a = (BYTE)SendDlgItemMessage(hwndDlg,IDC_SPIN_ALPHA,UDM_GETPOS, 0, 0);
- l = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_LEFT,UDM_GETPOS, 0, 0);
- t = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_TOP,UDM_GETPOS, 0, 0);
- r = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_RIGHT,UDM_GETPOS, 0, 0);
- b = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_BOTTOM,UDM_GETPOS, 0, 0);
+ BYTE a = (BYTE)SendDlgItemMessage(hwndDlg,IDC_SPIN_ALPHA,UDM_GETPOS, 0, 0);
+ WORD l = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_LEFT,UDM_GETPOS, 0, 0);
+ WORD t = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_TOP,UDM_GETPOS, 0, 0);
+ WORD r = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_RIGHT,UDM_GETPOS, 0, 0);
+ WORD b = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_BOTTOM,UDM_GETPOS, 0, 0);
- x = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_POSLEFT,UDM_GETPOS, 0, 0);
- y = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_POSTOP,UDM_GETPOS, 0, 0);
+ WORD x = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_POSLEFT,UDM_GETPOS, 0, 0);
+ WORD y = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_POSTOP,UDM_GETPOS, 0, 0);
- w = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_WIDTH,UDM_GETPOS, 0, 0);
- h = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_HEIGHT,UDM_GETPOS, 0, 0);
+ WORD w = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_WIDTH,UDM_GETPOS, 0, 0);
+ WORD h = (WORD)SendDlgItemMessage(hwndDlg,IDC_SPIN_HEIGHT,UDM_GETPOS, 0, 0);
- SendDlgItemMessageA(hwndDlg,IDC_FILE,WM_GETTEXT,(WPARAM)MAX_PATH,(LPARAM)buf_name);
- i = SendDlgItemMessage(hwndDlg,IDC_FIT,CB_GETCURSEL, 0, 0);
+ char buf_name[MAX_PATH] = {0};
+ GetDlgItemTextA(hwndDlg, IDC_FILE, buf_name, MAX_PATH);
+ int i = SendDlgItemMessage(hwndDlg,IDC_FIT,CB_GETCURSEL, 0, 0);
mir_snprintf(buf,SIZEOF(buf),"Glyph,Fragment,%s,%d,%d,%d,%d,%s,%d,%d,%d,%d,%d",buf_name,x,y,w,h,
//fitmode
(i == FM_TILE_BOTH)?"TileBoth":
@@ -437,22 +435,21 @@ TCHAR* MadeString(HWND hwndDlg)
void UpdateInfo(HWND hwndDlg)
{
TCHAR *b = MadeString(hwndDlg);
- if ( !b)
+ if (!b)
{
- SendDlgItemMessageA(hwndDlg,IDC_EDIT1,WM_SETTEXT, 0, (LPARAM)"");
+ SetDlgItemText(hwndDlg,IDC_EDIT1,_T(""));
return;
}
- SendDlgItemMessageA(hwndDlg,IDC_EDIT1,WM_SETTEXT, 0, (LPARAM)b);
+ SetDlgItemText(hwndDlg,IDC_EDIT1,b);
{
- OPT_OBJECT_DATA *sd = NULL;
- HTREEITEM hti = TreeView_GetSelection(GetDlgItem(hwndDlg,IDC_OBJECT_TREE));
+ HTREEITEM hti = TreeView_GetSelection(GetDlgItem(hwndDlg,IDC_OBJECT_TREE));
if (hti)
{
TVITEM tvi = {0};
tvi.hItem = hti;
tvi.mask = TVIF_HANDLE | TVIF_PARAM;
TreeView_GetItem(GetDlgItem(hwndDlg,IDC_OBJECT_TREE),&tvi);
- sd = (OPT_OBJECT_DATA*)(tvi.lParam);
+ OPT_OBJECT_DATA *sd = (OPT_OBJECT_DATA*)(tvi.lParam);
if (sd)
{
mir_free(sd->szValue);
@@ -466,8 +463,7 @@ void UpdateInfo(HWND hwndDlg)
void StoreTreeNode(HWND hTree, HTREEITEM node, char * section)
{
- HTREEITEM tmp;
- tmp = node;
+ HTREEITEM tmp = node;
while (tmp)
{
HTREEITEM tmp2 = NULL;
@@ -505,7 +501,7 @@ int GetFileSizes(HWND hwndDlg)
{
TCHAR buf[MAX_PATH];
SIZE sz = {0};
- SendDlgItemMessageA(hwndDlg,IDC_FILE,WM_GETTEXT,(WPARAM)MAX_PATH,(LPARAM)buf);
+ GetDlgItemText(hwndDlg, IDC_FILE, buf, MAX_PATH);
ske_GetFullFilename(buf, buf, 0, TRUE);
HBITMAP hbmp = ske_LoadGlyphImage(buf);
@@ -602,7 +598,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
mir_free_and_nil(object_clipboard);
OPT_OBJECT_DATA *sd = NULL;
- HTREEITEM hti = TreeView_GetSelection(GetDlgItem(hwndDlg,IDC_OBJECT_TREE));
+ HTREEITEM hti = TreeView_GetSelection(GetDlgItem(hwndDlg,IDC_OBJECT_TREE));
if (hti != 0)
{
TVITEM tvi = {0};
@@ -662,7 +658,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
GetShortFileName(ofn.lpstrFile);
SetDlgItemText(hwndDlg, IDC_FILE, ofn.lpstrFile);
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- UpdateInfo(hwndDlg);
+ UpdateInfo(hwndDlg);
}
}
}
@@ -729,15 +725,15 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
OPT_OBJECT_DATA * data = (OPT_OBJECT_DATA*)nmtv->itemNew.lParam;
char buf[255];
- mir_snprintf(buf,SIZEOF(buf),"%s = %s",data->szName, data->szValue);
- SendDlgItemMessageA(hwndDlg,IDC_EDIT1,WM_SETTEXT, 0, (LPARAM)buf);
+ mir_snprintf(buf,SIZEOF(buf),"%s = %s",data->szName, data->szValue);
+ SetDlgItemTextA(hwndDlg,IDC_EDIT1,buf);
SetControls(hwndDlg,data->szValue);
EnableWindow(GetDlgItem(hwndDlg,IDC_COPY),TRUE);
EnableWindow(GetDlgItem(hwndDlg,IDC_PASTE),object_clipboard != NULL);
}
else
{
- SendDlgItemMessageA(hwndDlg,IDC_EDIT1,WM_SETTEXT, 0, (LPARAM)"");
+ SetDlgItemText(hwndDlg,IDC_EDIT1,_T(""));
SetControls(hwndDlg,NULL);
EnableWindow(GetDlgItem(hwndDlg,IDC_COPY),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_PASTE),FALSE);
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 53f1c31ff9..f85f412671 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -61,16 +61,16 @@ int SkinOptInit(WPARAM wParam, LPARAM lParam)
odp.hInstance = g_hInst;
odp.pfnDlgProc = DlgSkinOpts;
odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_SKIN );
- odp.pszGroup = LPGEN("Skins");
- odp.pszTitle = LPGEN("Contact List");
- odp.flags = ODPF_BOLDGROUPS;
- odp.pszTab = LPGEN("Load/Save");
+ odp.ptszGroup = LPGENT("Skins");
+ odp.ptszTitle = LPGENT("Contact List");
+ odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+ odp.ptszTab = LPGENT("Load/Save");
Options_AddPage(wParam, &odp);
if ( db_get_b( NULL, "ModernData", "EnableSkinEditor", SETTING_ENABLESKINEDITOR_DEFAULT )) {
odp.pfnDlgProc = DlgSkinEditorOpts;
odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_SKINEDITOR );
- odp.pszTab = LPGEN("Object Editor");
+ odp.ptszTab = LPGENT("Object Editor");
Options_AddPage(wParam, &odp);
}
}
@@ -104,9 +104,8 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
case WM_INITDIALOG:
{
- HTREEITEM it;
TranslateDialogDefault( hwndDlg );
- it = FillAvailableSkinList( hwndDlg );
+ HTREEITEM it = FillAvailableSkinList( hwndDlg );
HWND wnd = GetDlgItem( hwndDlg, IDC_TREE1 );
TreeView_SelectItem( wnd, it );
}
@@ -124,11 +123,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
case IDC_BUTTON_INFO:
{
- TCHAR Author[255];
- TCHAR URL[MAX_PATH];
- TCHAR Contact[255];
- TCHAR Description[400];
- TCHAR text[2000];
+ TCHAR Author[255], URL[MAX_PATH], Contact[255], Description[400], text[2000];
SkinListData *sd = NULL;
HTREEITEM hti = TreeView_GetSelection( GetDlgItem( hwndDlg, IDC_TREE1 ));
if ( hti == 0 ) return 0;
@@ -221,17 +216,15 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
if ( wParam == IDC_PREVIEW )
{
//TODO:Draw hPreviewBitmap here
- HDC memDC, imgDC;
- HBITMAP hbmp, holdbmp, imgOldbmp;
int mWidth, mHeight;
RECT workRect = {0};
HBRUSH hbr = CreateSolidBrush( GetSysColor( COLOR_3DFACE ));
DRAWITEMSTRUCT *dis = ( DRAWITEMSTRUCT * )lParam;
mWidth = dis->rcItem.right-dis->rcItem.left;
mHeight = dis->rcItem.bottom-dis->rcItem.top;
- memDC = CreateCompatibleDC( dis->hDC );
- hbmp = ske_CreateDIB32( mWidth, mHeight );
- holdbmp = ( HBITMAP )SelectObject( memDC, hbmp );
+ HDC memDC = CreateCompatibleDC( dis->hDC );
+ HBITMAP hbmp = ske_CreateDIB32( mWidth, mHeight );
+ HBITMAP holdbmp = ( HBITMAP )SelectObject( memDC, hbmp );
workRect = dis->rcItem;
OffsetRect( &workRect, -workRect.left, -workRect.top );
FillRect( memDC, &workRect, hbr );
@@ -241,19 +234,17 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
//variables
BITMAP bmp = {0};
POINT imgPos = {0};
- int wWidth, wHeight;
- int dWidth, dHeight;
float xScale = 1, yScale = 1;
//GetSize
GetObject( hPreviewBitmap, sizeof( BITMAP ), &bmp );
- wWidth = workRect.right-workRect.left;
- wHeight = workRect.bottom-workRect.top;
+ int wWidth = workRect.right-workRect.left;
+ int wHeight = workRect.bottom-workRect.top;
if ( wWidth < bmp.bmWidth ) xScale = ( float )wWidth/bmp.bmWidth;
if ( wHeight < bmp.bmHeight ) yScale = ( float )wHeight/bmp.bmHeight;
xScale = min( xScale, yScale );
yScale = xScale;
- dWidth = ( int )( xScale*bmp.bmWidth );
- dHeight = ( int )( yScale*bmp.bmHeight );
+ int dWidth = ( int )( xScale*bmp.bmWidth );
+ int dHeight = ( int )( yScale*bmp.bmHeight );
//CalcPosition
imgPos.x = workRect.left+(( wWidth-dWidth )>>1 );
imgPos.y = workRect.top+(( wHeight-dHeight )>>1 );
@@ -265,8 +256,8 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
else
{
BLENDFUNCTION bf = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
- imgDC = CreateCompatibleDC( dis->hDC );
- imgOldbmp = ( HBITMAP )SelectObject( imgDC, hPreviewBitmap );
+ HDC imgDC = CreateCompatibleDC( dis->hDC );
+ HBITMAP imgOldbmp = (HBITMAP) SelectObject( imgDC, hPreviewBitmap );
ske_AlphaBlend( memDC, imgPos.x, imgPos.y, dWidth, dHeight, imgDC, 0, 0, bmp.bmWidth, bmp.bmHeight, bf );
SelectObject( imgDC, imgOldbmp );
DeleteDC( imgDC );
@@ -299,11 +290,9 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
TCHAR buf[MAX_PATH];
PathToRelativeT(sd->File, buf);
- SendDlgItemMessage(hwndDlg, IDC_EDIT_SKIN_FILENAME, WM_SETTEXT, 0, (LPARAM)buf );
+ SetDlgItemText(hwndDlg,IDC_EDIT_SKIN_FILENAME,buf);
- TCHAR prfn[MAX_PATH] = {0};
- TCHAR imfn[MAX_PATH] = {0};
- TCHAR skinfolder[MAX_PATH] = {0};
+ TCHAR prfn[MAX_PATH] = {0}, imfn[MAX_PATH] = {0}, skinfolder[MAX_PATH] = {0};
GetPrivateProfileString( _T("Skin_Description_Section"), _T("Preview"), _T(""), imfn, SIZEOF( imfn ), sd->File );
IniParser::GetSkinFolder( sd->File, skinfolder );
_sntprintf( prfn, SIZEOF( prfn ), _T("%s\\%s"), skinfolder, imfn );
@@ -315,11 +304,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
if ( hPreviewBitmap )
InvalidateRect( GetDlgItem( hwndDlg, IDC_PREVIEW ), NULL, TRUE );
else { //prepare text
- TCHAR Author[255];
- TCHAR URL[MAX_PATH];
- TCHAR Contact[255];
- TCHAR Description[400];
- TCHAR text[2000];
+ TCHAR Author[255], URL[MAX_PATH], Contact[255], Description[400], text[2000];
SkinListData* sd = NULL;
HTREEITEM hti = TreeView_GetSelection( GetDlgItem( hwndDlg, IDC_TREE1 ));
if ( hti == 0 ) return 0;
@@ -352,15 +337,15 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
}
ShowWindow( GetDlgItem( hwndDlg, IDC_PREVIEW ), SW_HIDE );
ShowWindow( GetDlgItem( hwndDlg, IDC_STATIC_INFO ), SW_SHOW );
- SendDlgItemMessage( hwndDlg, IDC_STATIC_INFO, WM_SETTEXT, 0, (LPARAM)text );
+ SetDlgItemText(hwndDlg, IDC_STATIC_INFO, text);
}
}
else {
//no selected
- SendDlgItemMessage( hwndDlg, IDC_EDIT_SKIN_FILENAME, WM_SETTEXT, 0, (LPARAM)TranslateT("Select skin from list"));
+ SetDlgItemText(hwndDlg, IDC_EDIT_SKIN_FILENAME, TranslateT("Select skin from list"));
EnableWindow( GetDlgItem( hwndDlg, IDC_BUTTON_APPLY_SKIN ), FALSE );
EnableWindow( GetDlgItem( hwndDlg, IDC_BUTTON_INFO ), FALSE );
- SendDlgItemMessage( hwndDlg, IDC_STATIC_INFO, WM_SETTEXT, 0, (LPARAM)TranslateT("Please select skin to apply"));
+ SetDlgItemText(hwndDlg, IDC_STATIC_INFO, TranslateT("Please select skin to apply"));
ShowWindow( GetDlgItem( hwndDlg, IDC_PREVIEW ), SW_HIDE );
}
ShowWindow( GetDlgItem( hwndDlg, IDC_PREVIEW ), hPreviewBitmap?SW_SHOW:SW_HIDE );
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 1562b88725..3539d7a30e 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -276,7 +276,7 @@ static int FillDialog(HWND hwnd)
{
LVITEM item = {0};
item.mask = LVIF_TEXT;
- item.pszText = TranslateTS((TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)i, GSMDF_TCHAR_MY));
+ item.pszText = (TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)i, GSMDF_TCHAR);
item.iItem = i - ID_STATUS_OFFLINE;
newItem = SendMessage(hwndList, LVM_INSERTITEM, 0, (LPARAM)&item);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 04:20:31 +0000