Use wxFileSystem for left hand side. Patches 1169934 and 1173497 from Stas

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index f5ae3f72e864bd285939af67a62433d317e6ed22..374c929e2661366e031145118ed1309c648550ce 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -181,8 +181,10 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         *exflags |= WS_EX_DLGMODALFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
+#ifndef __POCKETPC__
     else
         msflags |= WS_POPUP;
+#endif
 #endif
 
     // normally we consider that all windows without a caption must be popups,
@@ -508,9 +510,11 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         // all dialogs are popups
         dlgTemplate->style |= WS_POPUP;
 
+#ifndef __WXWINCE__
         // force 3D-look if necessary, it looks impossibly ugly otherwise
         if ( style & (wxRESIZE_BORDER | wxCAPTION) )
             dlgTemplate->style |= DS_MODALFRAME;
+#endif
 
         ret = CreateDialog(dlgTemplate, title, pos, sizeReal);
         free(dlgTemplate);
@@ -544,11 +548,13 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         );
     }
 
-    // Native look is full screen window on Smartphones and Standard SDK.
-    // TODO: check that we need this (if we're passing default values to ctor).
-    // Also check that there really is a difference between PocketPC and Smartphone in this regard.
+    // Note: if we include PocketPC in this test, dialogs can fail to show up,
+    // for example the text entry dialog in the dialogs sample. Problem with Maximise()?
 #if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__WINCE_STANDARDSDK__))
+    // Smartphone dialogs should always be maximized.
+#if !defined(__SMARTPHONE__)
     if ( style & wxMAXIMIZE )
+#endif
     {
         this->Maximize();
     }