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

diff --git a/include/wx/generic/private/timer.h b/include/wx/generic/private/timer.h
index 9db8f4148906853b7b336e4928d683b05072167f..fcf598d1da6e177056b086659150c9c8b91c5cd5 100644 (file)
--- a/include/wx/generic/private/timer.h
+++ b/include/wx/generic/private/timer.h
@@ -7,10 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef _WX_GENERIC_PRIVATE_TIMER_H_
 #define _WX_GENERIC_PRIVATE_TIMER_H_
 
 #ifndef _WX_GENERIC_PRIVATE_TIMER_H_
 #define _WX_GENERIC_PRIVATE_TIMER_H_
 

+#if wxUSE_TIMER
+

 #include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------


@@ -40,4 +41,6 @@ private:
     wxTimerDesc *m_desc;
 };
 
     wxTimerDesc *m_desc;
 };
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_GENERIC_PRIVATE_TIMER_H_
 #endif // _WX_GENERIC_PRIVATE_TIMER_H_

diff --git a/include/wx/gtk/private/timer.h b/include/wx/gtk/private/timer.h
index 2753541ef65b2b4b6f84901570c64ae6daef88d3..53d51fc9d5af1f808be15ae77705bc9088c97fbe 100644 (file)
--- a/include/wx/gtk/private/timer.h
+++ b/include/wx/gtk/private/timer.h
@@ -10,6 +10,8 @@
 #ifndef _WX_GTK_PRIVATE_TIMER_H_
 #define _WX_GTK_PRIVATE_TIMER_H_
 
 #ifndef _WX_GTK_PRIVATE_TIMER_H_
 #define _WX_GTK_PRIVATE_TIMER_H_
 

+#if wxUSE_TIMER
+

 #include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------


@@ -29,4 +31,6 @@ protected:
     int m_sourceId;
 };
 
     int m_sourceId;
 };
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_GTK_PRIVATE_TIMER_H_
 #endif // _WX_GTK_PRIVATE_TIMER_H_

diff --git a/include/wx/unix/private/timer.h b/include/wx/unix/private/timer.h
index 17776738c99c9a2054faac9557167cb9a6286a40..535ba7db95b3e6abc1b7f429bcc239c4945918ff 100644 (file)
--- a/include/wx/unix/private/timer.h
+++ b/include/wx/unix/private/timer.h
@@ -11,6 +11,8 @@
 #ifndef _WX_UNIX_PRIVATE_TIMER_H_
 #define _WX_UNIX_PRIVATE_TIMER_H_
 
 #ifndef _WX_UNIX_PRIVATE_TIMER_H_
 #define _WX_UNIX_PRIVATE_TIMER_H_
 

+#if wxUSE_TIMER
+

 #include "wx/private/timer.h"
 
 // the type used for milliseconds is large enough for microseconds too but
 #include "wx/private/timer.h"
 
 // the type used for milliseconds is large enough for microseconds too but


@@ -135,4 +137,6 @@ private:
 // returns the number of microseconds since the Epoch
 extern wxUsecClock_t wxGetLocalTimeUsec();
 
 // returns the number of microseconds since the Epoch
 extern wxUsecClock_t wxGetLocalTimeUsec();
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_UNIX_PRIVATE_TIMER_H_
 #endif // _WX_UNIX_PRIVATE_TIMER_H_

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 445a5f3bb707c8fada1c01c63238b1e0fd0c8fd0..6b3e1751a2ee727575bf4ae5ff167e043a3d2968 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -312,11 +312,15 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
     return wxPORT_GTK;
 }
 
     return wxPORT_GTK;
 }
 

+#if wxUSE_TIMER
+

 wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxGTKTimerImpl(timer);
 }
 
 wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxGTKTimerImpl(timer);
 }
 

+#endif // wxUSE_TIMER
+

 #if wxUSE_DETECT_SM
 static wxString GetSM()
 {
 #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"));
 wxString wxGUIAppTraits::GetDesktopEnvironment() const
 {
     wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));

+#if wxUSE_DETECT_SM

     if ( de.empty() )
     {
     if ( de.empty() )
     {

-#if wxUSE_DETECT_SM

         static const wxString s_SM = GetSM();
 
         if (s_SM == wxT("GnomeSM"))
         static const wxString s_SM = GetSM();
 
         if (s_SM == wxT("GnomeSM"))

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index fb2bdf58baff086f17d24c8e726e8913ed584ee5..9773a110a5be2c6a9f3075e0cebebba226d342f0 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -34,9 +34,7 @@
 #include "wx/unix/execute.h"
 #include "wx/evtloop.h"
 
 #include "wx/unix/execute.h"
 #include "wx/evtloop.h"
 

-#if wxUSE_TIMER
-    #include "wx/unix/private/timer.h"
-#endif // wxUSE_TIMER
+#include "wx/unix/private/timer.h"

 
 // for waitpid()
 #include <sys/types.h>
 
 // for waitpid()
 #include <sys/types.h>

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index ff12e32638aa20b1eaaa1b42431009561a827793..34dd79ab9b27129c9e1026372c7bcf96f93e471b 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -32,9 +32,7 @@
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/private/selectdispatcher.h"
 
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/private/selectdispatcher.h"
 

-#if wxUSE_TIMER
-    #include "wx/generic/private/timer.h"
-#endif
+#include "wx/generic/private/timer.h"

 
 #define TRACE_EVENTS _T("events")
 
 
 #define TRACE_EVENTS _T("events")
 

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 67e641c3cb5a92061372bcc0581542e803619674..51736ee3321875bdb4e781030304e5bdc85835ed 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -41,7 +41,6 @@
 #endif
 
 // Various X11 Atoms used in this file:
 #endif
 
 // Various X11 Atoms used in this file:

-static Atom _NET_WM_ICON = 0;

 static Atom _NET_WM_STATE = 0;
 static Atom _NET_WM_STATE_FULLSCREEN = 0;
 static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;
 static Atom _NET_WM_STATE = 0;
 static Atom _NET_WM_STATE_FULLSCREEN = 0;
 static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;


@@ -106,10 +105,13 @@ private:
 // Setting icons for window manager:
 // ----------------------------------------------------------------------------
 
 // Setting icons for window manager:
 // ----------------------------------------------------------------------------
 

+#if wxUSE_IMAGE && !wxUSE_NANOX
+
+static Atom _NET_WM_ICON = 0;
+

 void
 wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
 {
 void
 wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
 {

-#if !wxUSE_NANOX

     size_t size = 0;
 
     const size_t numIcons = ib.GetIconCount();
     size_t size = 0;
 
     const size_t numIcons = ib.GetIconCount();


@@ -184,9 +186,9 @@ wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
                          WindowCast(window),
                          _NET_WM_ICON );
     }
                          WindowCast(window),
                          _NET_WM_ICON );
     }

-#endif // !wxUSE_NANOX

 }
 
 }
 

+#endif // wxUSE_IMAGE && !wxUSE_NANOX

 
 // ----------------------------------------------------------------------------
 // Fullscreen mode:
 
 // ----------------------------------------------------------------------------
 // Fullscreen mode: