added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 04539083363bad41fda2835423198d963a14f48b..dadd5f4be7109b11deaef084befcf7a3b6a75166 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -126,17 +126,13 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
 typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
 
 #define wxChoicebookEventHandler(func) \
 typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
 
 #define wxChoicebookEventHandler(func) \

-    (wxObjectEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)

 
 

-#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn)                                   \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,                   \
-                     id,                                                      \
-                     wxChoicebookEventHandler(fn))
+#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn))

 
 

-#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)                                  \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,                  \
-                     id,                                                      \
-                     wxChoicebookEventHandler(fn))
+#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn))

 
 #endif // wxUSE_CHOICEBOOK
 
 
 #endif // wxUSE_CHOICEBOOK