0026669: Eliminate compile warnings obtained by building occt with vc14: 'type cast...

Signature of the command window callback has been fixed to avoid unnecessary type casting. It is used when Draw_IsConsoleSubsystem = Standard_False
 i.e. in non-console mode (see _main_() in Draw_Main.cxx).

diff --git a/src/Draw/MAINWINDOW.h b/src/Draw/MAINWINDOW.h
index c894bd48f015b5034cd01dfd27f9ca51edd520f9..db092a750c8e0cabe998e7e126224f7ee22c2b62 100644 (file)
--- a/src/Draw/MAINWINDOW.h
+++ b/src/Draw/MAINWINDOW.h
@@ -31,7 +31,7 @@
 LRESULT APIENTRY WndProc(HWND, UINT, WPARAM, LPARAM);
 BOOL CreateProc(HWND);
 VOID DestroyProc(HWND);
-BOOL CommandProc(HWND, WPARAM, LPARAM);
+LRESULT APIENTRY CmdProc(HWND, UINT, WPARAM, LPARAM);
 
 
 #endif

diff --git a/src/Draw/MainWindow.cxx b/src/Draw/MainWindow.cxx
index b188bbbfa47f2ce9b3b7128fbcc85bb93a00aefd..ccbc4611acaecd40beb535086077cff7f927f88c 100644 (file)
--- a/src/Draw/MainWindow.cxx
+++ b/src/Draw/MainWindow.cxx
@@ -49,7 +49,7 @@ LRESULT APIENTRY WndProc(HWND hWndFrame, UINT wMsg, WPARAM wParam, LPARAM lParam
       break;
 
     case WM_COMMAND :
-      CommandProc(hWndFrame, wParam, lParam);
+      CmdProc(hWndFrame, LOWORD(wParam), wParam, lParam);
       break;
       
     case WM_DESTROY :
@@ -85,13 +85,14 @@ BOOL CreateProc(HWND hWndFrame)
 /*--------------------------------------------------------------------------*\
 |  COMMAND PROCEDURE
 |              Handler for message WM_COMMAND   
-|
+|     It is used when Draw_IsConsoleSubsystem = Standard_False
+|     i.e. in non-console mode (see _main_() in Draw_Main.cxx).
 \*--------------------------------------------------------------------------*/
-BOOL CommandProc(HWND hWndFrame, WPARAM wParam, LPARAM /*lParam*/)
+LRESULT APIENTRY CmdProc(HWND hWndFrame, UINT wMsg, WPARAM /*wParam*/, LPARAM /*lParam*/)
 {
   // Handle on window MDI
   HWND hWndClient = (HWND)GetWindowLongPtr (hWndFrame, CLIENTWND);
-  switch (LOWORD(wParam))
+  switch (wMsg)
        {
          case IDM_WINDOW_NEXT :
                                        if(hWndClient)
@@ -122,8 +123,8 @@ BOOL CommandProc(HWND hWndFrame, WPARAM wParam, LPARAM /*lParam*/)
 
                                        DestroyProc(hWndFrame);
                                        break;
-       }
-  return(TRUE);
+  }
+  return(0l);
 }
 
 

diff --git a/src/Draw/init.cxx b/src/Draw/init.cxx
index aea8e87d9d1dc648e5e9f9f2e07baa3657a2ccc1..b61919814b8010c26d1c58ce842e0cc490a7cb91 100644 (file)
--- a/src/Draw/init.cxx
+++ b/src/Draw/init.cxx
@@ -76,8 +76,7 @@ BOOL RegisterAppClass(HINSTANCE hInstance)
 
   // Enregistrement de la fenetre CommandWindow
   //------
-  wndClass.lpfnWndProc   = (WNDPROC)CommandProc((HWND)WndProc,(WPARAM)342,(LPARAM)443);
-  //wndClass.lpfnWndProc   = (WNDPROC)CommandProc;
+  wndClass.lpfnWndProc   = (WNDPROC)CmdProc;
   wndClass.hIcon         = 0;
   wndClass.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
   wndClass.lpszMenuName  = NULL;