Applied patch #877159: Joinable threads might crash app if deleted right after Wait.

[wxWidgets.git] / src / msw / toplevel.cpp

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 7f9e9ade6d07de6c49f10cd8f273bc2f2e2e3a1a..760362ee3d835ff4521ce15befdda9dc575175e7 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -45,7 +45,10 @@
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>

-  #include <aygshell.h>
+  #if _WIN32_WCE < 400
+    #include <aygshell.h>
+  #endif
+#include "wx/msw/wince/missing.h"

 #endif
 
 #include "wx/msw/winundef.h"
 #endif
 
 #include "wx/msw/winundef.h"


@@ -131,6 +134,24 @@ END_EVENT_TABLE()
 // wxTopLevelWindowMSW creation
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowMSW creation
 // ----------------------------------------------------------------------------
 

+wxTopLevelWindowMSW::wxTopLevelWindowMSW()
+{
+    Init();
+}
+
+wxTopLevelWindowMSW::wxTopLevelWindowMSW(wxWindow *parent,
+                                         wxWindowID id,
+                                         const wxString& title,
+                                         const wxPoint& pos,
+                                         const wxSize& size,
+                                         long style,
+                                         const wxString& name)
+{
+    Init();
+
+    (void)Create(parent, id, title, pos, size, style, name);
+}
+

 void wxTopLevelWindowMSW::Init()
 {
     m_iconized =
 void wxTopLevelWindowMSW::Init()
 {
     m_iconized =


@@ -737,7 +758,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
                      rect.x, rect.y, rect.width, rect.height,
                      flags);
 
                      rect.x, rect.y, rect.width, rect.height,
                      flags);
 

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

         ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
 #endif
 
         ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
 #endif
 


@@ -747,7 +768,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
     }
     else // stop showing full screen
     {
     }
     else // stop showing full screen
     {

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

         ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
 #endif
         Maximize(m_fsIsMaximized);
         ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
 #endif
         Maximize(m_fsIsMaximized);