correct some compile warnings and errors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 56205b99a4c574bfef0b9b8797928f53ea18bc8d..39569116f9d6938171f98bd4c51d8145b5fcbb7f 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -713,7 +713,7 @@ public:
         event.Skip();
     }
 
         event.Skip();
     }
 

-    void OnKillFocus(wxFocusEvent& event) {
+    void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {

         // Do nothing.  Prevents base class from resetting the colors...
     }
 
         // Do nothing.  Prevents base class from resetting the colors...
     }
 


@@ -799,7 +799,7 @@ public:
         event.Skip();
     }
 
         event.Skip();
     }
 

-    void OnActivate(wxListEvent& event) {
+    void OnActivate(wxListEvent& WXUNUSED(event)) {

         doubleClickAction(doubleClickActionData);
     }
 
         doubleClickAction(doubleClickActionData);
     }
 

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index a324274b7c25b73516e3a9f62ce786879ca4eade..d382203bfda76af086c4ee089697854a9bc588c7 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -85,7 +85,7 @@ public:
 
     bool AcceptsFocus() const { return FALSE; }
 
 
     bool AcceptsFocus() const { return FALSE; }
 

-    void OnPaint(wxPaintEvent& evt) {
+    void OnPaint(wxPaintEvent& WXUNUSED(evt)) {

         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());


@@ -205,9 +205,11 @@ bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
         if (on) 
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
         if (on) 

-            stc->Connect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
+            stc->Connect(-1, wxEVT_IDLE,
+                         (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);

         else
         else

-            stc->Disconnect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
+            stc->Disconnect(-1, wxEVT_IDLE,
+                            (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);

         idler.state = on;
     }
     return idler.state;
         idler.state = on;
     }
     return idler.state;

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 56205b99a4c574bfef0b9b8797928f53ea18bc8d..39569116f9d6938171f98bd4c51d8145b5fcbb7f 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -713,7 +713,7 @@ public:
         event.Skip();
     }
 
         event.Skip();
     }
 

-    void OnKillFocus(wxFocusEvent& event) {
+    void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {

         // Do nothing.  Prevents base class from resetting the colors...
     }
 
         // Do nothing.  Prevents base class from resetting the colors...
     }
 


@@ -799,7 +799,7 @@ public:
         event.Skip();
     }
 
         event.Skip();
     }
 

-    void OnActivate(wxListEvent& event) {
+    void OnActivate(wxListEvent& WXUNUSED(event)) {

         doubleClickAction(doubleClickActionData);
     }
 
         doubleClickAction(doubleClickActionData);
     }
 

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index a324274b7c25b73516e3a9f62ce786879ca4eade..d382203bfda76af086c4ee089697854a9bc588c7 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -85,7 +85,7 @@ public:
 
     bool AcceptsFocus() const { return FALSE; }
 
 
     bool AcceptsFocus() const { return FALSE; }
 

-    void OnPaint(wxPaintEvent& evt) {
+    void OnPaint(wxPaintEvent& WXUNUSED(evt)) {

         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());


@@ -205,9 +205,11 @@ bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
         if (on) 
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
         if (on) 

-            stc->Connect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
+            stc->Connect(-1, wxEVT_IDLE,
+                         (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);

         else
         else

-            stc->Disconnect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
+            stc->Disconnect(-1, wxEVT_IDLE,
+                            (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);

         idler.state = on;
     }
     return idler.state;
         idler.state = on;
     }
     return idler.state;