check for wxUSE_TIMER in headers, not the files including them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -312,11 +312,15 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
|
||||
return wxPORT_GTK;
|
||||
}
|
||||
|
||||
#if wxUSE_TIMER
|
||||
|
||||
wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
|
||||
{
|
||||
return new wxGTKTimerImpl(timer);
|
||||
}
|
||||
|
||||
#endif // wxUSE_TIMER
|
||||
|
||||
#if wxUSE_DETECT_SM
|
||||
static wxString GetSM()
|
||||
{
|
||||
@@ -483,9 +487,9 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
|
||||
wxString wxGUIAppTraits::GetDesktopEnvironment() const
|
||||
{
|
||||
wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));
|
||||
#if wxUSE_DETECT_SM
|
||||
if ( de.empty() )
|
||||
{
|
||||
#if wxUSE_DETECT_SM
|
||||
static const wxString s_SM = GetSM();
|
||||
|
||||
if (s_SM == wxT("GnomeSM"))
|
||||
|
Reference in New Issue
Block a user