From 30dfe2ff149185932b79d14acda4b216aa87d2a7 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 2 Apr 2005 21:40:59 +0000 Subject: [PATCH] No resize border on WinCE by default git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dialog.h | 2 +- include/wx/dirdlg.h | 9 +++++++-- include/wx/toplevel.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 40111ed..7564636 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 c1d0a50..78d21ae 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 bfbe0ac..2ea8474 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 \ -- 2.7.4