Applied patch [ 1349607 ] [msw] Multiline notebook tab label change can add extra row

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

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index c8a70ab0da70c69629a5ea7ef0dbc5d8860a323c..b2a69f6e77ad7f8909344153e5b0a7e7737071e8 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tabctrl.cpp
+// Name:        src/msw/tabctrl.cpp
 // Purpose:     wxTabCtrl
 // Author:      Julian Smart
 // Modified by:
@@ -20,11 +20,10 @@
 #include "wx/wx.h"
 #endif
 
-#if defined(__WIN95__)
-
 #include "wx/msw/private.h"
 
-#include <commctrl.h>
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
 
 #include "wx/tabctrl.h"
 #include "wx/app.h"
@@ -315,7 +314,7 @@ int wxTabCtrl::SetSelection(int item)
 void wxTabCtrl::SetImageList(wxImageList* imageList)
 {
     m_imageList = imageList;
-    TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() );
+    (void) TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() );
 }
 
 // Set the text for an item
@@ -429,6 +428,3 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
 
 }
 #endif
-
-#endif
-    // __WIN95__