Updated with changes due to file manager and registry editor work.

svn path=/trunk/; revision=3208

rosapps/templates/mdi/childwnd.c

@@ -101,9 +101,7 @@ static void OnSize(ChildWnd* pChildWnd, WPARAM wParam, LPARAM lParam)
 LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     static int last_split;
-//  Pane* pane;
     ChildWnd* pChildWnd = (ChildWnd*)GetWindowLong(hWnd, GWL_USERDATA);
-//  ChildWnd* new_child;
     ASSERT(pChildWnd);
 
     if (1) {
@@ -144,9 +142,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 	case WM_LBUTTONDOWN: {
 		RECT rt;
 		int x = LOWORD(lParam);
-
 		GetClientRect(hWnd, &rt);
-
 		if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) {
 			last_split = pChildWnd->nSplitPos;
 #ifdef _NO_EXTENSIONS
@@ -154,7 +150,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 #endif
 			SetCapture(hWnd);
 		}
-
 		break;}
 
 	case WM_LBUTTONUP:
@@ -178,7 +173,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 			draw_splitbar(hWnd, last_split);
 		break;
 #endif
-
 	case WM_KEYDOWN:
 		if (wParam == VK_ESCAPE)
 			if (GetCapture() == hWnd) {
@@ -200,24 +194,19 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 		if (GetCapture() == hWnd) {
 			RECT rt;
 			int x = LOWORD(lParam);
-
 #ifdef _NO_EXTENSIONS
 			HDC hdc = GetDC(hWnd);
 			GetClientRect(hWnd, &rt);
-
 			rt.left = last_split-SPLIT_WIDTH/2;
 			rt.right = last_split+SPLIT_WIDTH/2+1;
 			InvertRect(hdc, &rt);
-
 			last_split = x;
 			rt.left = x-SPLIT_WIDTH/2;
 			rt.right = x+SPLIT_WIDTH/2+1;
 			InvertRect(hdc, &rt);
-
 			ReleaseDC(hWnd, hdc);
 #else
 			GetClientRect(hWnd, &rt);
-
 			if (x>=0 && x<rt.right) {
 				pChildWnd->nSplitPos = x;
 				resize_tree(pChildWnd, rt.right, rt.bottom);
@@ -235,9 +224,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 #ifndef _NO_EXTENSIONS
 	case WM_GETMINMAXINFO:
 		DefMDIChildProc(hWnd, message, wParam, lParam);
-
 		{LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;
-
 		lpmmi->ptMaxTrackSize.x <<= 1;//2*GetSystemMetrics(SM_CXSCREEN) / SM_CXVIRTUALSCREEN
 		lpmmi->ptMaxTrackSize.y <<= 1;//2*GetSystemMetrics(SM_CYSCREEN) / SM_CYVIRTUALSCREEN
 		break;}
@@ -267,6 +254,5 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 	default: def:
         return DefMDIChildProc(hWnd, message, wParam, lParam);
    }
-    }
     return DefMDIChildProc(hWnd, message, wParam, lParam);
 }

rosapps/templates/mdi/framewnd.c

@@ -37,7 +37,6 @@
 #include "main.h"
 #include "about.h"
 #include "framewnd.h"
-//#include "childwnd.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////

rosapps/templates/mdi/main.c

@@ -58,21 +58,9 @@ TCHAR szChildClass[MAX_LOADSTRING];
 
 
 ////////////////////////////////////////////////////////////////////////////////
-//
+
-//
-//   FUNCTION: InitInstance(HANDLE, int)
-//
-//   PURPOSE: Saves instance handle and creates main window
-//
-//   COMMENTS:
-//
-//        In this function, we save the instance handle in a global variable and
-//        create and display the main program window.
-//
 BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
-//    ChildWnd* pChildWnd;
-
     WNDCLASSEX wcFrame = {
         sizeof(WNDCLASSEX),
         CS_HREDRAW | CS_VREDRAW/*style*/,
@@ -190,6 +178,8 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
     return TRUE;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 void UpdateStatusBar(void)
 {
     TCHAR text[260];
@@ -219,6 +209,7 @@ static BOOL CALLBACK EnumWndProc(HWND hWnd, LPARAM lParam)
     return TRUE;
 }
 
+////////////////////////////////////////////////////////////////////////////////
 
 void ExitInstance(void)
 {
@@ -232,7 +223,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                      int       nCmdShow)
 {
     MSG msg;
-    HACCEL hAccel;
+//    HACCEL hAccel;
     HWND hMDIClient;
 
     // Initialize global strings
@@ -252,13 +243,13 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     if (!InitInstance(hInstance, nCmdShow)) {
         return FALSE;
     }
-    hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_MDI_APP);
+//    hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_MDI_APP);
     hMDIClient = GetWindow(hFrameWnd, GW_CHILD);
 
     // Main message loop:
     while (GetMessage(&msg, (HWND)NULL, 0, 0)) { 
         if (!TranslateMDISysAccel(hMDIClient, &msg) && 
-            !TranslateAccelerator(hFrameWnd/*hwndFrame*/, hAccel, &msg)) { 
+            !TranslateAccelerator(hFrameWnd, hAccel, &msg)) { 
             TranslateMessage(&msg); 
             DispatchMessage(&msg); 
         } 

rosapps/templates/mdi/main.h

@@ -19,9 +19,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/*
- * Based on Winefile, Copyright 2000 martin Fuchs <martin-fuchs@gmx.net>
- */
 
 #ifndef __MAIN_H__
 #define __MAIN_H__