Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move fallback BS_TYPEMASK definition to wx/msw/missing.h

Browse Source 
It can be useful in source files other than src/msw/control.cpp too.
This commit is contained in:
Vadim Zeitlin
2017-12-10 02:24:13 +01:00
parent badf6bc300
commit 588ae3744c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/missing.h
View File

@@ -141,6 +141,11 @@
#define QS_ALLPOSTMESSAGE 0 #define QS_ALLPOSTMESSAGE 0
#endif #endif
// Missing from MinGW 4.8 SDK headers.
#ifndef BS_TYPEMASK
#define BS_TYPEMASK 0xf
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// menu stuff // menu stuff
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/msw/control.cpp
View File

@@ -35,6 +35,8 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/ctrlsub.h" #include "wx/ctrlsub.h"
#include "wx/msw/private.h"
#include "wx/msw/missing.h"
#endif #endif
#if wxUSE_LISTCTRL #if wxUSE_LISTCTRL
@@ -46,16 +48,10 @@
#endif // wxUSE_TREECTRL #endif // wxUSE_TREECTRL
#include "wx/renderer.h" #include "wx/renderer.h"
#include "wx/msw/private.h"
#include "wx/msw/uxtheme.h" #include "wx/msw/uxtheme.h"
#include "wx/msw/dc.h" // for wxDCTemp #include "wx/msw/dc.h" // for wxDCTemp
#include "wx/msw/ownerdrawnbutton.h" #include "wx/msw/ownerdrawnbutton.h"
// Missing from MinGW 4.8 SDK headers.
#ifndef BS_TYPEMASK
#define BS_TYPEMASK 0xf
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------