Remove wx/dcbuffer.h dependency from wx/generic/combo.h
This header doesn't really need to be included from here and it was done solely in order to get the value of wxALWAYS_NATIVE_DOUBLE_BUFFER from it. Move the code using this macro in the .cpp file instead.
This commit is contained in:
@@ -30,8 +30,6 @@
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/dcbuffer.h"
|
|
||||||
|
|
||||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
|
class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
|
||||||
@@ -96,19 +94,7 @@ protected:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For better transparent background rendering
|
// For better transparent background rendering
|
||||||
virtual bool HasTransparentBackground() wxOVERRIDE
|
virtual bool HasTransparentBackground() wxOVERRIDE;
|
||||||
{
|
|
||||||
#if wxALWAYS_NATIVE_DOUBLE_BUFFER
|
|
||||||
#ifdef __WXGTK__
|
|
||||||
// Sanity check for GTK+
|
|
||||||
return IsDoubleBuffered();
|
|
||||||
#else
|
|
||||||
return true;
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mandatory virtuals
|
// Mandatory virtuals
|
||||||
virtual void OnResize() wxOVERRIDE;
|
virtual void OnResize() wxOVERRIDE;
|
||||||
|
@@ -198,6 +198,20 @@ wxGenericComboCtrl::~wxGenericComboCtrl()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxGenericComboCtrl::HasTransparentBackground()
|
||||||
|
{
|
||||||
|
#if wxALWAYS_NATIVE_DOUBLE_BUFFER
|
||||||
|
#ifdef __WXGTK__
|
||||||
|
// Sanity check for GTK+
|
||||||
|
return IsDoubleBuffered();
|
||||||
|
#else
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void wxGenericComboCtrl::OnResize()
|
void wxGenericComboCtrl::OnResize()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user