From: Robin Dunn Date: Tue, 6 Jun 2006 17:50:09 +0000 (+0000) Subject: More compilation fixes. Move dummy wxPowerEvent to where it can be X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0fade4f1470384a796a361c4a32e5a1e4a95be0e More compilation fixes. Move dummy wxPowerEvent to where it can be seen by other modules. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h index 1388d0e2d7..8aaf5f46ba 100644 --- a/wxPython/include/wx/wxPython/wxPython_int.h +++ b/wxPython/include/wx/wxPython/wxPython_int.h @@ -86,6 +86,18 @@ //--------------------------------------------------------------------------- +#ifndef wxHAS_POWER_EVENTS +class wxPowerEvent : public wxEvent +{ +public: + wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType) {} + void Veto() {} + bool IsVetoed() const { return false; } + virtual wxEvent *Clone() const { return new wxPowerEvent(*this); } +}; +#endif + +//--------------------------------------------------------------------------- typedef unsigned char byte; typedef wxPoint2DDouble wxPoint2D; diff --git a/wxPython/src/_power.i b/wxPython/src/_power.i index cbc3bcfa4f..cb8deace69 100644 --- a/wxPython/src/_power.i +++ b/wxPython/src/_power.i @@ -15,20 +15,13 @@ //--------------------------------------------------------------------------- %newgroup + %{ #ifndef wxHAS_POWER_EVENTS // Dummy class and other definitions for platforms that don't have them -class wxPowerEvent : public wxEvent -{ -public: - wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType) {} - void Veto() {} - bool IsVetoed() const { return false; } - - virtual wxEvent *Clone() const { return new wxPowerEvent(*this); } -}; - +// See wxPython_int.h for wxPowerEvent + enum { wxEVT_POWER_SUSPENDING, wxEVT_POWER_SUSPENDED,