From: Robert Roebling Date: Fri, 11 Jun 2004 19:12:45 +0000 (+0000) Subject: Added compatibility fix for wxADJUST_MINSIZE X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/daeb83303c09f9e3225350cd8c18d0436c802b91 Added compatibility fix for wxADJUST_MINSIZE Added defines for HANDHELDPC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/defs.h b/include/wx/defs.h index d033683829..74eb5b8e91 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -399,7 +399,9 @@ typedef int wxWindowID; /* NULL declaration: it must be defined as 0 for C++ programs (in particular, */ /* it must not be defined as "(void *)0" which is standard for C but completely */ /* breaks C++ code) */ +#ifndef __HANDHELDPC__ #include +#endif /* delete pointer if it is not NULL and NULL it afterwards */ /* (checking that it's !NULL before passing it to delete is just a */ @@ -1030,7 +1032,11 @@ enum wxStretch wxTILE = 0xc000, // for compatibility only, default now, don't use explicitly any more - wxADJUST_MINSIZE = 0x0000 +#if WXWIN_COMPATIBILITY_2_4 + wxADJUST_MINSIZE = 0x00100000 +#else + wxADJUST_MINSIZE = 0 +#endif }; /* border flags: the values are chosen for backwards compatibility */ diff --git a/include/wx/platform.h b/include/wx/platform.h index 14707f6104..be0205c91b 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -141,6 +141,18 @@ # endif #endif +#if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC) +# if (_WIN32_WCE >= 400) +# ifndef __WINCE_NET__ +# define __WINCE_NET__ +# endif +# elif (_WIN32_WCE >= 200) +# ifndef __HANDHELDPC__ +# define __HANDHELDPC__ +# endif +# endif +#endif + /* Include wx/setup.h for the Unix platform defines generated by configure and the library compilation options