wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 74dfb4cd9d6b71aeae09bddb548daa3427c5b7b6..07112916d4027cb94628c5e7972d84ce9118e1b5 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -27,20 +27,26 @@
 
 #include  <wx/log.h>
 #include  <wx/imaglist.h>
+#include  <wx/event.h>
+#include  <wx/control.h>
 #include  <wx/notebook.h>
 
 #include  <wx/msw/private.h>
 
 // Windows standard headers
 #ifndef   __WIN95__
-  #error  "wxNotebook is not supported under Windows 3.1"
+  #error  "wxNotebook is only supported Windows 95 and above"
 #endif    //Win95
 
 #include  <windowsx.h>  // for SetWindowFont
 
+#ifndef __TWIN32__
 #ifdef __GNUWIN32__
   #include "wx/msw/gnuwin32/extra.h"
-#else   //!GnuWin32
+#endif
+#endif
+
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)
   #include <commctrl.h>
 #endif
 
@@ -69,7 +75,7 @@
   END_EVENT_TABLE()
 
   IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
-  IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
+  IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 #endif
 
 // ============================================================================