Added $(NEW_WXLIBNAME) to allow changing the library or DLL name

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

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index d6f6a5415b71d4a91befe09cfeae8f32159e8169..9537e0fbc9ccf5c41bd1be2738bc3d48861502b5 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)
+bool wxTabCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result)
 {
        wxTabEvent event(wxEVT_NULL, m_windowId);
        wxEventType eventType = wxEVT_NULL;
@@ -154,37 +156,29 @@ bool wxTabCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
        switch ( hdr1->code )
        {
                case TCN_SELCHANGE:
-               {
                        eventType = wxEVT_COMMAND_TAB_SEL_CHANGED;
-                       event.SetInt( (int) LOWORD(wParam) ) ;
                        break;
-               }
+
                case TCN_SELCHANGING:
-               {
                        eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
-                       event.SetInt( (int) LOWORD(wParam) ) ;
                        break;
-               }
+
         case TTN_NEEDTEXT:
         {
             // TODO
 //            if (tool->m_shortHelpString != "")
 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
-                       return wxControl::MSWNotify(wParam, lParam);
-            break;
         }
 
                default :
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
+                       return wxControl::MSWNotify(wParam, lParam, result);
        }
 
        event.SetEventObject( this );
        event.SetEventType(eventType);
+       event.SetInt( (int) LOWORD(wParam) ) ;
 
-       if ( !ProcessEvent(event) )
-               return FALSE;
-       return TRUE;
+       return ProcessEvent(event);
 }
 
 // Responds to colour changes, and passes event on to children.