Added wxRegionGeneric and wxRegionIteratorGeneric using X.org code

[wxWidgets.git] / samples / event / event.cpp

diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index beeaad030d2b0570d96f33d7165982e19620da97..4fd024abb8e42e23da0ff8390d619b967bf6f8ab 100644 (file)
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -60,7 +60,7 @@ DEFINE_EVENT_TYPE(wxEVT_MY_CUSTOM_COMMAND)
 #define EVT_MY_CUSTOM_COMMAND(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
         wxEVT_MY_CUSTOM_COMMAND, id, -1, \
 #define EVT_MY_CUSTOM_COMMAND(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
         wxEVT_MY_CUSTOM_COMMAND, id, -1, \

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

         (wxObject *) NULL \
     ),
 
         (wxObject *) NULL \
     ),
 


@@ -355,7 +355,7 @@ void MyFrame::OnPopEventHandler(wxCommandEvent& WXUNUSED(event))
     SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push);
 }
 
     SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push);
 }
 

-void MyFrame::OnTest(wxCommandEvent& event)
+void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))

 {
     wxLogMessage(_T("This is the test event handler in the main frame"));
 }
 {
     wxLogMessage(_T("This is the test event handler in the main frame"));
 }


@@ -369,14 +369,14 @@ void MyFrame::OnUpdateUIPop(wxUpdateUIEvent& event)
 // custom event methods
 // ----------------------------------------------------------------------------
 
 // custom event methods
 // ----------------------------------------------------------------------------
 

-void MyFrame::OnFireCustom(wxCommandEvent& event)
+void MyFrame::OnFireCustom(wxCommandEvent& WXUNUSED(event))

 {
     wxCommandEvent eventCustom(wxEVT_MY_CUSTOM_COMMAND);
 
     wxPostEvent(this, eventCustom);
 }
 
 {
     wxCommandEvent eventCustom(wxEVT_MY_CUSTOM_COMMAND);
 
     wxPostEvent(this, eventCustom);
 }
 

-void MyFrame::OnProcessCustom(wxCommandEvent& event)
+void MyFrame::OnProcessCustom(wxCommandEvent& WXUNUSED(event))

 {
     wxLogMessage(_T("Got a custom event!"));
 }
 {
     wxLogMessage(_T("Got a custom event!"));
 }