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

svn path=/trunk/; revision=3208

diff --git a/rosapps/templates/mdi/childwnd.c b/rosapps/templates/mdi/childwnd.c
index 501393e..4d5c1ac 100644 (file)
--- a/rosapps/templates/mdi/childwnd.c
+++ b/rosapps/templates/mdi/childwnd.c
@@ -100,11 +100,9 @@ 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);
+    static int last_split;
+    ChildWnd* pChildWnd = (ChildWnd*)GetWindowLong(hWnd, GWL_USERDATA);
+    ASSERT(pChildWnd);
 
     if (1) {
         switch(message) {
@@ -141,112 +139,101 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                        //goto def;
             break;
 
-               case WM_LBUTTONDOWN: {
+       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
+                       draw_splitbar(hWnd, last_split);
+#endif
+                       SetCapture(hWnd);
+               }
+               break;}
+
+       case WM_LBUTTONUP:
+               if (GetCapture() == hWnd) {
+#ifdef _NO_EXTENSIONS
                        RECT rt;
                        int x = LOWORD(lParam);
-
+                       draw_splitbar(hWnd, last_split);
+                       last_split = -1;
                        GetClientRect(hWnd, &rt);
+                       pChildWnd->nSplitPos = x;
+                       //resize_tree(pChildWnd, rt.right, rt.bottom);
+#endif
+                       ReleaseCapture();
+               }
+               break;
 
-                       if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) {
-                               last_split = pChildWnd->nSplitPos;
 #ifdef _NO_EXTENSIONS
-                               draw_splitbar(hWnd, last_split);
+       case WM_CAPTURECHANGED:
+               if (GetCapture()==hWnd && last_split>=0)
+                       draw_splitbar(hWnd, last_split);
+               break;
 #endif
-                               SetCapture(hWnd);
-                       }
-
-                       break;}
-
-               case WM_LBUTTONUP:
+       case WM_KEYDOWN:
+               if (wParam == VK_ESCAPE)
                        if (GetCapture() == hWnd) {
-#ifdef _NO_EXTENSIONS
                                RECT rt;
-                               int x = LOWORD(lParam);
+#ifdef _NO_EXTENSIONS
                                draw_splitbar(hWnd, last_split);
-                               last_split = -1;
+#else
+                               pChildWnd->nSplitPos = last_split;
+#endif
                                GetClientRect(hWnd, &rt);
-                               pChildWnd->nSplitPos = x;
                                //resize_tree(pChildWnd, rt.right, rt.bottom);
-#endif
+                               last_split = -1;
                                ReleaseCapture();
+                               SetCursor(LoadCursor(0, IDC_ARROW));
                        }
-                       break;
+               break;
 
+       case WM_MOUSEMOVE:
+               if (GetCapture() == hWnd) {
+                       RECT rt;
+                       int x = LOWORD(lParam);
 #ifdef _NO_EXTENSIONS
-               case WM_CAPTURECHANGED:
-                       if (GetCapture()==hWnd && last_split>=0)
-                               draw_splitbar(hWnd, last_split);
-                       break;
-#endif
-
-               case WM_KEYDOWN:
-                       if (wParam == VK_ESCAPE)
-                               if (GetCapture() == hWnd) {
-                                       RECT rt;
-#ifdef _NO_EXTENSIONS
-                                       draw_splitbar(hWnd, last_split);
+                       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
-                                       pChildWnd->nSplitPos = last_split;
-#endif
-                                       GetClientRect(hWnd, &rt);
-                                       //resize_tree(pChildWnd, rt.right, rt.bottom);
-                                       last_split = -1;
-                                       ReleaseCapture();
-                                       SetCursor(LoadCursor(0, IDC_ARROW));
-                               }
-                       break;
-
-               case WM_MOUSEMOVE:
-                       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;
+                       GetClientRect(hWnd, &rt);
+                       if (x>=0 && x<rt.right) {
+                               pChildWnd->nSplitPos = x;
+                               resize_tree(pChildWnd, rt.right, rt.bottom);
                                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);
-                                       rt.left = x-SPLIT_WIDTH/2;
-                                       rt.right = x+SPLIT_WIDTH/2+1;
-                                       InvalidateRect(hWnd, &rt, FALSE);
-                                       UpdateWindow(pChildWnd->left.hWnd);
-                                       UpdateWindow(hWnd);
-                                       UpdateWindow(pChildWnd->right.hWnd);
-                               }
-#endif
+                               InvalidateRect(hWnd, &rt, FALSE);
+                               UpdateWindow(pChildWnd->left.hWnd);
+                               UpdateWindow(hWnd);
+                               UpdateWindow(pChildWnd->right.hWnd);
                        }
-                       break;
+#endif
+               }
+               break;
 
 #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;}
+       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;}
 #endif
 
-               case WM_SETFOCUS:
-                       SetCurrentDirectory(pChildWnd->szPath);
-                       SetFocus(pChildWnd->nFocusPanel? pChildWnd->hRightWnd: pChildWnd->hLeftWnd);
-                       break;
+       case WM_SETFOCUS:
+               SetCurrentDirectory(pChildWnd->szPath);
+               SetFocus(pChildWnd->nFocusPanel? pChildWnd->hRightWnd: pChildWnd->hLeftWnd);
+               break;
 /*
         case WM_COMMAND:
             pane = GetFocus()==pChildWnd->left.hWnd? &pChildWnd->left: &pChildWnd->right;
@@ -259,14 +246,13 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
             }
             break;
  */
-               case WM_SIZE:
-            if (wParam != SIZE_MINIMIZED) {
-                OnSize(pChildWnd, wParam, lParam);
-            }
-            // fall through
-               default: def:
-                       return DefMDIChildProc(hWnd, message, wParam, lParam);
+       case WM_SIZE:
+        if (wParam != SIZE_MINIMIZED) {
+            OnSize(pChildWnd, wParam, lParam);
         }
-    }
+        // fall through
+       default: def:
+        return DefMDIChildProc(hWnd, message, wParam, lParam);
+   }
     return DefMDIChildProc(hWnd, message, wParam, lParam);
 }

diff --git a/rosapps/templates/mdi/framewnd.c b/rosapps/templates/mdi/framewnd.c
index efecd1b..850a6a2 100644 (file)
--- a/rosapps/templates/mdi/framewnd.c
+++ b/rosapps/templates/mdi/framewnd.c
@@ -37,7 +37,6 @@
 #include "main.h"
 #include "about.h"
 #include "framewnd.h"
-//#include "childwnd.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/rosapps/templates/mdi/main.c b/rosapps/templates/mdi/main.c
index 283fa76..22f09b4 100644 (file)
--- a/rosapps/templates/mdi/main.c
+++ b/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); 
         } 

diff --git a/rosapps/templates/mdi/main.h b/rosapps/templates/mdi/main.h
index b2b5511..c2d6370 100644 (file)
--- a/rosapps/templates/mdi/main.h
+++ b/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__