Border fixes for WinCE

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index f5ae3f72e864bd285939af67a62433d317e6ed22..ac97ecbbefb13c51d08f519ffc8260065df1aaa9 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;
         *exflags |= WS_EX_DLGMODALFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;

+#ifndef __POCKETPC__

     else
         msflags |= WS_POPUP;
     else
         msflags |= WS_POPUP;

+#endif

 #endif
 
     // normally we consider that all windows without a caption must be popups,
 #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;
 
         // 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;
         // 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);
 
         ret = CreateDialog(dlgTemplate, title, pos, sizeReal);
         free(dlgTemplate);