removed assert which could be provoked by correct code

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

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 78f329f0d8c2a34081d1527540380ffb610e258f..1e4e378ac02a8eee68232e16f3c111a30965ffae 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -32,20 +32,23 @@
 
 #include <windows.h>
 
 
 #include <windows.h>
 

-#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #else
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #include "wx/msw/dib.h"
     #include <commctrl.h>
 #else
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #include "wx/msw/dib.h"

-#include "wx/msw/tabctrl.h"
+#include "wx/tabctrl.h"

 #include "wx/app.h"
 #include "wx/msw/private.h"
 #include "wx/msw/imaglist.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 #include "wx/app.h"
 #include "wx/msw/private.h"
 #include "wx/msw/imaglist.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 

+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING)
+

 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
     EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
     EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged)
 END_EVENT_TABLE()