Standard SDK fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/power.cpp b/src/msw/power.cpp
index 83819c38fb15a0e381ed5c9bc98446142207e40c..e6b74936a29b21af3a6614e66ed7b5d63a94d7c7 100644 (file)
--- a/src/msw/power.cpp
+++ b/src/msw/power.cpp
@@ -30,6 +30,8 @@
 #include "wx/power.h"
 #include "wx/msw/private.h"
 
 #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)
 #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;
 }
 
     return true;
 }
 

+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 wxPowerType wxGetPowerType()
 {
 // ============================================================================
 // implementation
 // ============================================================================
 
 wxPowerType wxGetPowerType()
 {

+#if !defined(__WINCE_STANDARDSDK__)

     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {
     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {


@@ -76,12 +81,14 @@ wxPowerType wxGetPowerType()
                 break;
         }
     }
                 break;
         }
     }

+#endif

 
     return wxPOWER_UNKNOWN;
 }
 
 wxBatteryState wxGetBatteryState()
 {
 
     return wxPOWER_UNKNOWN;
 }
 
 wxBatteryState wxGetBatteryState()
 {

+#if !defined(__WINCE_STANDARDSDK__)

     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {
     SYSTEM_POWER_STATUS 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;
 }

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 359c874cb8942ee0ea0080e69a64953a952750f9..bfd3f56b4d3187af9f10712c61a7210004be10eb 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -741,7 +741,8 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
     return IsAlwaysMaximized() ||
 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;
            (::IsZoomed(GetHwnd()) != 0) ||
 #endif
            m_maximizeOnShow;