diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index af95611674..f45bc38d3f 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -181,7 +181,7 @@ typedef struct { // ---------------------------------------------------------------------------- // Toolbar define value missing // ---------------------------------------------------------------------------- -#if defined(__DIGITALMARS__) +#if !defined(CCS_VERT) #define CCS_VERT 0x00000080L #endif diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 8763fcd9fd..70b4f32fa7 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -64,6 +64,10 @@ #include "wx/msw/gnuwin32/extra.h" #endif +#if !defined(CCS_VERT) +#define CCS_VERT 0x00000080L +#endif + #endif // __TWIN32__ #include "wx/msw/dib.h" diff --git a/src/version.mak b/src/version.mak index 40194d0f2c..30f4b95713 100644 --- a/src/version.mak +++ b/src/version.mak @@ -11,7 +11,7 @@ wxMAJOR_VERSION=2 wxMINOR_VERSION=4 -wxRELEASE_NUMBER=0 +wxRELEASE_NUMBER=1 # release number if used in the DLL file names only for the unstable branch as # for the stable branches the micro releases are supposed to be backwards