Updated to Scintilla from 1.45 to 1.47

[wxWidgets.git] / include / wx / tooltip.h

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 017bed7de195181b66b3d79eff17c6395b698768..4dc9c82dc0c8f13abeb0b663f06113c43fb90fcc 100644 (file)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -1,14 +1,16 @@
 #ifndef _WX_TOOLTIP_H_BASE_
 #define _WX_TOOLTIP_H_BASE_
 
 #ifndef _WX_TOOLTIP_H_BASE_
 #define _WX_TOOLTIP_H_BASE_
 

+#include "wx/setup.h"
+
+#if wxUSE_TOOLTIPS
+

 #if defined(__WXMSW__)
 #include "wx/msw/tooltip.h"
 #elif defined(__WXMOTIF__)
 // #include "wx/motif/tooltip.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tooltip.h"
 #if defined(__WXMSW__)
 #include "wx/msw/tooltip.h"
 #elif defined(__WXMOTIF__)
 // #include "wx/motif/tooltip.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tooltip.h"

-#elif defined(__WXQT__)
-#include "wx/qt/tooltip.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
 #elif defined(__WXPM__)


@@ -17,5 +19,8 @@
 // #include "wx/stubs/tooltip.h"
 #endif
 
 // #include "wx/stubs/tooltip.h"
 #endif
 

+#endif
+    // wxUSE_TOOLTIPS
+

 #endif
     // _WX_TOOLTIP_H_BASE_
 #endif
     // _WX_TOOLTIP_H_BASE_