Standard SDK fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-09-02 20:26:43 +00:00
parent c899416db0
commit a8e893433a
2 changed files with 10 additions and 1 deletions

View File

@@ -30,6 +30,8 @@
#include "wx/power.h" #include "wx/power.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if !defined(__WINCE_STANDARDSDK__)
#ifdef __WXWINCE__ #ifdef __WXWINCE__
typedef SYSTEM_POWER_STATUS_EX SYSTEM_POWER_STATUS; typedef SYSTEM_POWER_STATUS_EX SYSTEM_POWER_STATUS;
BOOL GetSystemPowerStatus(SYSTEM_POWER_STATUS *status) BOOL GetSystemPowerStatus(SYSTEM_POWER_STATUS *status)
@@ -53,12 +55,15 @@ static inline bool wxGetPowerStatus(SYSTEM_POWER_STATUS *sps)
return true; return true;
} }
#endif
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
wxPowerType wxGetPowerType() wxPowerType wxGetPowerType()
{ {
#if !defined(__WINCE_STANDARDSDK__)
SYSTEM_POWER_STATUS sps; SYSTEM_POWER_STATUS sps;
if ( wxGetPowerStatus(&sps) ) if ( wxGetPowerStatus(&sps) )
{ {
@@ -76,12 +81,14 @@ wxPowerType wxGetPowerType()
break; break;
} }
} }
#endif
return wxPOWER_UNKNOWN; return wxPOWER_UNKNOWN;
} }
wxBatteryState wxGetBatteryState() wxBatteryState wxGetBatteryState()
{ {
#if !defined(__WINCE_STANDARDSDK__)
SYSTEM_POWER_STATUS sps; SYSTEM_POWER_STATUS sps;
if ( wxGetPowerStatus(&sps) ) if ( wxGetPowerStatus(&sps) )
{ {
@@ -99,6 +106,7 @@ wxBatteryState wxGetBatteryState()
return wxBATTERY_CRITICAL_STATE; return wxBATTERY_CRITICAL_STATE;
} }
} }
#endif
return wxBATTERY_UNKNOWN_STATE; return wxBATTERY_UNKNOWN_STATE;
} }

View File

@@ -741,7 +741,8 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
bool wxTopLevelWindowMSW::IsMaximized() const bool wxTopLevelWindowMSW::IsMaximized() const
{ {
return IsAlwaysMaximized() || return IsAlwaysMaximized() ||
#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) && !defined(__WINCE_STANDARDSDK__)
(::IsZoomed(GetHwnd()) != 0) || (::IsZoomed(GetHwnd()) != 0) ||
#endif #endif
m_maximizeOnShow; m_maximizeOnShow;