Absolutely no idea what DisableAutomaticSETranslator is but

WinCE doesn't like it

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 83f224db2c7d1e0143fa9b0b542461f5bb201690..15741e3ed70ff1c403e17490705d1c8b1f1ba40d 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -239,7 +239,9 @@ wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
 
 int wxEntry(int& argc, wxChar **argv)
 {
+#ifndef __WXWINCE__
     DisableAutomaticSETranslator();
+#endif
 
     return wxEntryReal(argc, argv);
 }

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 7d7bdf9bddb01c7176a625dfea5f4f7450a4ae6c..9888a264914c204568f6b9b779f54c4bf6491b43 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1146,8 +1146,9 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 
     // using this flag results in very significant reduction in flicker,
     // especially with controls inside the static boxes (as the interior of the
-    // box is not redrawn twice)
-    if (!wxSystemOptions::GetOptionInt(wxT("msw.window.no-clip-children")) == 1)
+    // box is not redrawn twice).
+    // wxCLIP_CHILDREN support is for compatibility with old applications only.
+    if ((!wxSystemOptions::GetOptionInt(wxT("msw.window.no-clip-children")) == 1) || (flags & wxCLIP_CHILDREN))
         style |= WS_CLIPCHILDREN;
 
     // it doesn't seem useful to use WS_CLIPSIBLINGS here as we officially