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:
@@ -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;
|
||||
}
|
||||
|
@@ -741,7 +741,8 @@ 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;
|
||||
|
Reference in New Issue
Block a user