winefile

[Martin Fuchs]

Changelog
- 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


Index: En.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/En.rc,v
retrieving revision 1.6
diff -u -p -d -r1.6 En.rc
--- En.rc	7 Oct 2004 04:20:04 -0000	1.6
+++ En.rc	7 Oct 2004 15:11:37 -0000
@@ -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."
 }
Index: It.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/It.rc,v
retrieving revision 1.4
diff -u -p -d -r1.4 It.rc
--- It.rc	7 Oct 2004 04:20:04 -0000	1.4
+++ It.rc	7 Oct 2004 15:11:37 -0000
@@ -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."
 }
Index: Pl.rc
===================================================================
RCS file: /home/wine/wine/programs/winefile/Pl.rc,v
retrieving revision 1.3
diff -u -p -d -r1.3 Pl.rc
--- Pl.rc	7 Oct 2004 04:20:04 -0000	1.3
+++ Pl.rc	7 Oct 2004 15:11:37 -0000
@@ -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."
 }
Index: resource.h
===================================================================
RCS file: /home/wine/wine/programs/winefile/resource.h,v
retrieving revision 1.4
diff -u -p -d -r1.4 resource.h
--- resource.h	7 Oct 2004 04:20:04 -0000	1.4
+++ resource.h	7 Oct 2004 15:11:37 -0000
@@ -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__

Index: winefile.c
===================================================================
RCS file: /home/wine/wine/programs/winefile/winefile.c,v
retrieving revision 1.24
diff -u -p -d -r1.24 winefile.c
--- winefile.c	7 Oct 2004 04:25:29 -0000	1.24
+++ winefile.c	7 Oct 2004 15:11:39 -0000
@@ -2083,7 +2083,7 @@ static HWND create_header(HWND parent, P
 	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 pare
 	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,
 			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,
 
 		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, H
 
 	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, H
 }
 
 
-#ifndef _ROS_
-
 int APIENTRY WinMain(HINSTANCE hinstance,
 					 HINSTANCE previnstance,
 					 LPSTR	   cmdline,
@@ -4005,5 +3999,3 @@ int APIENTRY WinMain(HINSTANCE hinstance
 
 	return 0;
 }
-
-#endif