mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 23:23:39 +00:00
- remove unused IDS_FILE_MOVE_ERROR
- use SetWindowFont() instead of SendMessage(WM_SETFONT) - remove unused comment - use GET_X_LPARAM() instead of GET_X_LPARAM() - remove old _ROS_ preprocessor statements
This commit is contained in:
parent
ecd78d780e
commit
9bfcbefd13
|
@ -182,5 +182,4 @@ STRINGTABLE
|
|||
{
|
||||
IDS_FONT_SEL_DLG_NAME "Applying font settings"
|
||||
IDS_FONT_SEL_ERROR "Error while selecting new font."
|
||||
IDS_FILE_MOVE_ERROR "Error while moving file or directory."
|
||||
}
|
||||
|
|
|
@ -183,5 +183,4 @@ STRINGTABLE
|
|||
{
|
||||
IDS_FONT_SEL_DLG_NAME "Applica le impostazioni dei font"
|
||||
IDS_FONT_SEL_ERROR "Si è verificato un errore durante la selezione del nuovo font."
|
||||
IDS_FILE_MOVE_ERROR "Si è verificato un errore durante lo spostamento del file o della directory."
|
||||
}
|
||||
|
|
|
@ -183,5 +183,4 @@ STRINGTABLE
|
|||
{
|
||||
IDS_FONT_SEL_DLG_NAME "Wprowadzanie ustawień czcionki"
|
||||
IDS_FONT_SEL_ERROR "Błšd przy wybieraniu czcionki"
|
||||
IDS_FILE_MOVE_ERROR "Błšd przy przenoszeniu pliku."
|
||||
}
|
||||
|
|
|
@ -73,7 +73,6 @@
|
|||
/* string table */
|
||||
#define IDS_FONT_SEL_DLG_NAME 1101
|
||||
#define IDS_FONT_SEL_ERROR 1103
|
||||
#define IDS_FILE_MOVE_ERROR 1104
|
||||
|
||||
/* range for drive bar command ids: 0x9000..0x90FF */
|
||||
#ifdef __WINE__
|
||||
|
|
|
@ -2083,7 +2083,7 @@ static HWND create_header(HWND parent, Pane* pane, int id)
|
|||
if (!hwnd)
|
||||
return 0;
|
||||
|
||||
SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), FALSE);
|
||||
SetWindowFont(hwnd, GetStockObject(DEFAULT_GUI_FONT), FALSE);
|
||||
|
||||
hdi.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT;
|
||||
|
||||
|
@ -2321,7 +2321,7 @@ static void create_tree_window(HWND parent, Pane* pane, int id, int id_header)
|
|||
SetWindowLong(pane->hwnd, GWL_USERDATA, (LPARAM)pane);
|
||||
g_orgTreeWndProc = SubclassWindow(pane->hwnd, TreeWndProc);
|
||||
|
||||
SendMessage(pane->hwnd, WM_SETFONT, (WPARAM)Globals.hfont, FALSE);
|
||||
SetWindowFont(pane->hwnd, Globals.hfont, FALSE);
|
||||
|
||||
/* insert entries into listbox */
|
||||
if (entry)
|
||||
|
@ -3363,8 +3363,6 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
|
|||
LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lparam;
|
||||
Entry* entry = (Entry*) dis->itemData;
|
||||
|
||||
/*dis->rcItem.top*=2;
|
||||
dis->rcItem.bottom*=2;*/
|
||||
if (dis->CtlID == IDW_TREE_LEFT)
|
||||
draw_item(&child->left, dis, entry, -1);
|
||||
else
|
||||
|
@ -3414,7 +3412,7 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
|
|||
|
||||
case WM_LBUTTONDOWN: {
|
||||
RECT rt;
|
||||
int x = LOWORD(lparam);
|
||||
int x = GET_X_LPARAM(lparam);
|
||||
|
||||
GetClientRect(hwnd, &rt);
|
||||
|
||||
|
@ -3964,11 +3962,9 @@ int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow)
|
|||
|
||||
InitInstance(hinstance);
|
||||
|
||||
#ifndef _ROS_ /* don't maximize if being called from the ROS desktop */
|
||||
if (cmdshow == SW_SHOWNORMAL)
|
||||
/*TODO: read window placement from registry */
|
||||
cmdshow = SW_MAXIMIZE;
|
||||
#endif
|
||||
|
||||
show_frame(hwndParent, cmdshow);
|
||||
|
||||
|
@ -3989,8 +3985,6 @@ int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow)
|
|||
}
|
||||
|
||||
|
||||
#ifndef _ROS_
|
||||
|
||||
int APIENTRY WinMain(HINSTANCE hinstance,
|
||||
HINSTANCE previnstance,
|
||||
LPSTR cmdline,
|
||||
|
@ -4005,5 +3999,3 @@ int APIENTRY WinMain(HINSTANCE hinstance,
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue