cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct some compile warnings and errors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-02-06 20:37:57 +00:00
parent d5f7923b9e
commit 5f9eb69c1c
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/stc/PlatWX.cpp
View File

@ -713,7 +713,7 @@ public:
event.Skip();
}
void OnKillFocus(wxFocusEvent& event) {
void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {
// Do nothing. Prevents base class from resetting the colors...
}
@ -799,7 +799,7 @@ public:
event.Skip();
}
void OnActivate(wxListEvent& event) {
void OnActivate(wxListEvent& WXUNUSED(event)) {
doubleClickAction(doubleClickActionData);
}

8
contrib/src/stc/ScintillaWX.cpp
View File

@ -85,7 +85,7 @@ public:
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());
@ -205,9 +205,11 @@ bool ScintillaWX::SetIdle(bool 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
stc->Disconnect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
stc->Disconnect(-1, wxEVT_IDLE,
(wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
idler.state = on;
}
return idler.state;

4
src/stc/PlatWX.cpp
View File

@ -713,7 +713,7 @@ public:
event.Skip();
}
void OnKillFocus(wxFocusEvent& event) {
void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {
// Do nothing. Prevents base class from resetting the colors...
}
@ -799,7 +799,7 @@ public:
event.Skip();
}
void OnActivate(wxListEvent& event) {
void OnActivate(wxListEvent& WXUNUSED(event)) {
doubleClickAction(doubleClickActionData);
}

8
src/stc/ScintillaWX.cpp
View File

@ -85,7 +85,7 @@ public:
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());
@ -205,9 +205,11 @@ bool ScintillaWX::SetIdle(bool 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
stc->Disconnect(-1, wxEVT_IDLE, (wxObjectEventFunction)&wxStyledTextCtrl::OnIdle);
stc->Disconnect(-1, wxEVT_IDLE,
(wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
idler.state = on;
}
return idler.state;