From 61ec769dfbcd4ec8ab3e3efebefdcf3039f90fd0 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 13 Aug 2007 11:13:03 +0000
Subject: [PATCH] Fixes for WinCE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/combo.cpp  | 7 ++++++-
 src/msw/window.cpp | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 44eb4f179b..5702a01bcd 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -693,8 +693,10 @@ bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
 
 wxCoord wxComboCtrl::GetNativeTextIndent() const
 {
+#if wxUSE_UXTHEME
     if ( wxUxThemeEngine::GetIfActive() )
         return NATIVE_TEXT_INDENT_XP;
+#endif
     return NATIVE_TEXT_INDENT_CLASSIC;
 }
 
@@ -721,8 +723,11 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
             // popup but Alt-arrow does
             if ( event.AltDown() ||
                     ( !isPopupShown &&
-                      HasFlag(wxCB_READONLY) &&
+                      HasFlag(wxCB_READONLY)
+#if wxUSE_UXTHEME
+					  &&
                       !wxUxThemeEngine::GetIfActive()
+#endif
                     ) )
             {
                 return true;
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2ee2b289a9..e8b45e3bf8 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1430,7 +1430,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 wxBorder wxWindowMSW::GetThemedBorderStyle() const
 {
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-    return wxBORDER_SIMPLE
+    return wxBORDER_SIMPLE;
 #elif wxUSE_UXTHEME
     if (wxUxThemeEngine::GetIfActive())
         return wxBORDER_THEME;