update to 2.9.0

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

diff --git a/include/wx/power.h b/include/wx/power.h
index e70fb6c215103cf0345b457aa6691998ed761b31..ccd64e82477536feeab893f999a92b83a7c5a127 100644 (file)
--- a/include/wx/power.h
+++ b/include/wx/power.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/include/wx/power.h
+// Name:        wx/power.h

 // Purpose:     functions and classes for system power management
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     functions and classes for system power management
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -66,13 +66,15 @@ public:
 
 private:
     bool m_veto;
 
 private:
     bool m_veto;

+
+    DECLARE_ABSTRACT_CLASS(wxPowerEvent)

 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()

-    DECLARE_EVENT_TYPE(wxEVT_POWER_SUSPENDING, 406)
-    DECLARE_EVENT_TYPE(wxEVT_POWER_SUSPENDED, 407)
-    DECLARE_EVENT_TYPE(wxEVT_POWER_SUSPEND_CANCEL, 408)
-    DECLARE_EVENT_TYPE(wxEVT_POWER_RESUME, 444)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDING, 406)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDED, 407)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPEND_CANCEL, 408)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_RESUME, 444)

 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&);
 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&);


@@ -105,4 +107,3 @@ WXDLLIMPEXP_BASE wxPowerType wxGetPowerType();
 WXDLLIMPEXP_BASE wxBatteryState wxGetBatteryState();
 
 #endif // _WX_POWER_H_
 WXDLLIMPEXP_BASE wxBatteryState wxGetBatteryState();
 
 #endif // _WX_POWER_H_

-