fixed an over-optimisation

[wxWidgets.git] / src / msw / tabctrl.cpp

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 27decfb2f1f402c519340074c6cee7cd3e579e8e..e41562b853b99d31fe6db5350014fc0c8769327c 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -21,24 +21,26 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
 #endif
 
 #if defined(__WIN95__)
 
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
 #include "malloc.h"
 #endif
 
 #include <windows.h>
 
-#ifndef __GNUWIN32__
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
 #endif
 
+#ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/msw/tabctrl.h"
@@ -146,7 +148,7 @@ bool wxTabCtrl::MSWCommand(WXUINT cmd, WXWORD id)
   return FALSE;
 }
 
-bool wxTabCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result)
+bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
        wxTabEvent event(wxEVT_NULL, m_windowId);
        wxEventType eventType = wxEVT_NULL;
@@ -169,12 +171,12 @@ bool wxTabCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result)
         }
 
                default :
-                       return wxControl::MSWNotify(wParam, lParam, result);
+                       return wxControl::MSWOnNotify(idCtrl, lParam, result);
        }
 
        event.SetEventObject( this );
        event.SetEventType(eventType);
-       event.SetInt( (int) LOWORD(wParam) ) ;
+       event.SetInt(idCtrl) ;
 
        return ProcessEvent(event);
 }