From ceae285234ec466653b6952fc8d81f6801c0bdb9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 2 Sep 2007 20:24:14 +0000 Subject: [PATCH] Fixes for standard SDK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/power.cpp | 8 ++++++++ src/msw/toplevel.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/msw/power.cpp b/src/msw/power.cpp index 83819c38fb..e6b74936a2 100644 --- a/src/msw/power.cpp +++ b/src/msw/power.cpp @@ -30,6 +30,8 @@ #include "wx/power.h" #include "wx/msw/private.h" +#if !defined(__WINCE_STANDARDSDK__) + #ifdef __WXWINCE__ typedef SYSTEM_POWER_STATUS_EX SYSTEM_POWER_STATUS; BOOL GetSystemPowerStatus(SYSTEM_POWER_STATUS *status) @@ -53,12 +55,15 @@ static inline bool wxGetPowerStatus(SYSTEM_POWER_STATUS *sps) return true; } +#endif + // ============================================================================ // implementation // ============================================================================ wxPowerType wxGetPowerType() { +#if !defined(__WINCE_STANDARDSDK__) SYSTEM_POWER_STATUS sps; if ( wxGetPowerStatus(&sps) ) { @@ -76,12 +81,14 @@ wxPowerType wxGetPowerType() break; } } +#endif return wxPOWER_UNKNOWN; } wxBatteryState wxGetBatteryState() { +#if !defined(__WINCE_STANDARDSDK__) SYSTEM_POWER_STATUS sps; if ( wxGetPowerStatus(&sps) ) { @@ -99,6 +106,7 @@ wxBatteryState wxGetBatteryState() return wxBATTERY_CRITICAL_STATE; } } +#endif return wxBATTERY_UNKNOWN_STATE; } diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 97fec59a6a..3c7bfe03c1 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -742,7 +742,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize) bool wxTopLevelWindowMSW::IsMaximized() const { return IsAlwaysMaximized() || -#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) +#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) && !defined(__WINCE_STANDARDSDK__) (::IsZoomed(GetHwnd()) != 0) || #endif m_maximizeOnShow;