adding bitmap button version for colour picker, used by setting wxCLRBTN_USES_BMP_BUTTON to 1, off by default also on Mac for binary compat reasons.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,8 +25,18 @@
|
||||
// the default style
|
||||
#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL)
|
||||
|
||||
#ifndef wxCLRBTN_USES_BMP_BUTTON
|
||||
#define wxCLRBTN_USES_BMP_BUTTON 0
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,
|
||||
#if wxCLRBTN_USES_BMP_BUTTON
|
||||
#include "wx/bmpbutton.h"
|
||||
#define wxCLRBTN_BASE_CLASS wxBitmapButton
|
||||
#else
|
||||
#define wxCLRBTN_BASE_CLASS wxButton
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGenericColourButton : public wxCLRBTN_BASE_CLASS,
|
||||
public wxColourPickerWidgetBase
|
||||
{
|
||||
public:
|
||||
|
Reference in New Issue
Block a user