define DWORD_PTR &c for Win32 compilation whatever headers we use

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 657912d8a0e2b6320e06cba07016ff6c2c1a770b..d29d1a32e15633e9ae51bedadb5ae3c1fbf474fc 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -120,7 +120,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
     winid,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
     winid,                                                                     \
     -1,                                                                     \

-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \

     NULL                                                                    \
   ),
 
     NULL                                                                    \
   ),
 


@@ -129,7 +129,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
     winid,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
     winid,                                                                     \
     -1,                                                                     \

-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \

     NULL                                                                    \
   ),
 
     NULL                                                                    \
   ),