Change wxGetCurrentUTime as wxGetCurrentMTime (milli not micro!)

[wxWidgets.git] / include / wx / msw / notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 934be280476a610ba17b6cc835aef9cdfd04462c..1a5dde10c11223c40559d099d553c6d76b589317 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -22,6 +22,16 @@
   #include <wx/dynarray.h>
 #endif  //_DYNARRAY_H
 
+// This is a work-around for missing defines in gcc-2.95 headers
+#ifndef TCS_RIGHT
+#define TCS_RIGHT       0x0002
+#endif
+#ifndef TCS_VERTICAL
+#define TCS_VERTICAL    0x0080
+#endif
+#ifndef TCS_BOTTOM
+#define TCS_BOTTOM      TCS_RIGHT
+#endif
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
@@ -33,14 +43,8 @@ class WXDLLEXPORT wxWindow;
 // array of notebook pages
 typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
 
-#undef WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 
-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
-
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
@@ -143,7 +147,7 @@ public:
 
   // callbacks
   // ---------
-  void OnWindowCreate(wxWindowCreateEvent& event);
+  void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);