X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/tabctrl.cpp diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index c8a70ab0da..d55fd09bca 100644 --- 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: @@ -13,21 +13,20 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_TAB_DIALOG + #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/wx.h" + #include "wx/app.h" #endif -#if defined(__WIN95__) - #include "wx/msw/private.h" -#include - #include "wx/tabctrl.h" -#include "wx/app.h" #include "wx/msw/imaglist.h" IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) @@ -150,7 +149,7 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.SetInt(idCtrl) ; event.SetSelection(idCtrl); - return ProcessEvent(event); + return GetEventHandler()->ProcessEvent(event); } // Responds to colour changes, and passes event on to children. @@ -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 @@ -430,5 +429,4 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height) } #endif -#endif - // __WIN95__ +#endif // wxUSE_TAB_DIALOG