diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 40111edb24..7564636c38 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxStdDialogButtonSizer;
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 #ifdef __WXWINCE__
-#define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX)
+#define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX | wxNO_BORDER)
 #else
 #define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
 #endif
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index c1d0a50fd4..78d21ae1cd 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -13,8 +13,13 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
 extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr;
 extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
 
-#define wxDD_DEFAULT_STYLE \
-    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+#ifdef __WXWINCE__
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+#else
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+#endif
 
 /*
     The interface (TODO: make the other classes really derive from it!) is
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index bfbe0ac8e4..2ea84745b8 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -71,7 +71,7 @@ class WXDLLEXPORT wxTopLevelWindowBase;
     #elif defined(__WINCE_STANDARDSDK__)
         #define wxDEFAULT_FRAME_STYLE (wxMAXIMIZE|wxCLOSE_BOX)
     #else
-        #define wxDEFAULT_FRAME_STYLE (0)
+        #define wxDEFAULT_FRAME_STYLE (wxNO_BORDER)
     #endif
 #else // !__WXWINCE__
     #define wxDEFAULT_FRAME_STYLE \