fixed compilation after wxTipWindow base class change, added wxUSE_TIPWINDOW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ced72e708bdbecbf262f815237b4d11a585d3ab4..3360f184222145cdae1161fdf2aa5494f3b21ca3 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -493,6 +493,14 @@
 #   endif
 #endif /* !defined(wxUSE_TEXTFILE) */
 
 #   endif
 #endif /* !defined(wxUSE_TEXTFILE) */
 

+#ifndef wxUSE_TIPWINDOW
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TIPWINDOW must be defined."
+#   else
+#       define wxUSE_TIPWINDOW 0
+#   endif
+#endif /* !defined(wxUSE_TIPWINDOW) */
+

 #ifndef wxUSE_TOOLBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TOOLBAR must be defined."
 #ifndef wxUSE_TOOLBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TOOLBAR must be defined."


@@ -869,5 +877,14 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 

+#if wxUSE_TIPWINDOW && !wxUSE_POPUPWIN
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxTipWindow requires wxPopupWindow"
+#   else
+#       undef wxUSE_POPUPWIN
+#       define wxUSE_POPUPWIN 1
+#   endif
+#endif /* wxUSE_TIPWINDOW */
+

 #endif /* wxUSE_GUI */
 
 #endif /* wxUSE_GUI */
 

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index bf73e59862f33339dc9d29fcfabe6f8a2b6d326a..2a49eafd468c090ce9ed0ad215e6594227e8a302 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -415,12 +415,21 @@
 // Recommended setting: 1 (don't change except for very special programs)
 #define wxUSE_CONTROLS     1
 
 // Recommended setting: 1 (don't change except for very special programs)
 #define wxUSE_CONTROLS     1
 

-// wxPopupWindow class is not used currently by wxMSW
+// wxPopupWindow class is a top level transient window. It is currently used
+// to implement wxTipWindow

 //
 //

-// Default is 0
+// Default is 1

 //
 //

-// Recommended setting: 0
-#define wxUSE_POPUPWIN     0
+// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
+#define wxUSE_POPUPWIN     1
+
+// wxTipWindow allows to implement the custom tooltips, it is used by the
+// context help classes. Requires wxUSE_POPUPWIN.
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 0)
+#define wxUSE_TIPWINDOW    1

 
 // Each of the settings below corresponds to one wxWindows control. They are
 // all switched on by default but may be disabled if you are sure that your
 
 // Each of the settings below corresponds to one wxWindows control. They are
 // all switched on by default but may be disabled if you are sure that your

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index ce4e3ec69a60a153837749549a0d9b2fec8dcecd..8a274e5794662df48dec8b00f118382fbbb9f158 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -20,6 +20,7 @@
 #include "wx/popupwin.h"
 
 #if wxUSE_POPUPWIN
 #include "wx/popupwin.h"
 
 #if wxUSE_POPUPWIN

+

 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------


@@ -55,4 +56,6 @@ private:
 };
 
 #endif // wxUSE_POPUPWIN
 };
 
 #endif // wxUSE_POPUPWIN

+

 #endif // _WX_TIPWIN_H_
 #endif // _WX_TIPWIN_H_

+

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index cb9a8d895fabc48e7d9db76b4f999c16d5b46a98..ba35623830a676c58ae3cdb2e13611f5c421a81b 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -305,6 +305,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {
 
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {

+#if wxUSE_TIPWINDOW

     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)
     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)


@@ -323,6 +324,7 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 
         return TRUE;
     }
 
         return TRUE;
     }

+#endif // wxUSE_TIPWINDOW

 
     return FALSE;
 }
 
     return FALSE;
 }

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index fc18fbff7bf706f9f71985348f697fdcc04ca8b0..824df917432a5fec18738a45ef01cc01a4041f98 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -33,6 +33,9 @@
 #endif // WX_PRECOMP
 
 #include "wx/tipwin.h"
 #endif // WX_PRECOMP
 
 #include "wx/tipwin.h"

+
+#if wxUSE_TIPWINDOW
+

 #include "wx/timer.h"
 #include "wx/settings.h"
 
 #include "wx/timer.h"
 #include "wx/settings.h"
 


@@ -205,4 +208,5 @@ void wxTipWindow::Close()
     Destroy();
 }
 
     Destroy();
 }
 

+#endif // wxUSE_TIPWINDOW

 
 

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index e513a50f6377ab715d480f71a6d3f0c2facf3a6b..ad43374bd6f255454457e1cddb9689cb94360d14 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -195,7 +195,7 @@ bool wxHtmlHelpController::DisplaySection(int sectionNo)
 
 bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint& WXUNUSED(pos))
 {
 
 bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint& WXUNUSED(pos))
 {

-#if wxUSE_HELP
+#if wxUSE_TIPWINDOW

     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)
     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)


@@ -213,7 +213,8 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
 
         return TRUE;
     }
 
         return TRUE;
     }

-#endif
+#endif // wxUSE_TIPWINDOW
+

     return FALSE;
 }
 
     return FALSE;
 }