added wxUSE_TIPWINDOW

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

diff --git a/configure.in b/configure.in
index 188f00ca54cec5e6ad415fd67bb09c7070666648..5a9ac0dd1888e2f6e700db7dad705f6672da2847 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -780,6 +780,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no

+  DEFAULT_wxUSE_TIPWINDOW=no

 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no


@@ -943,6 +944,7 @@ else
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes

+  DEFAULT_wxUSE_TIPWINDOW=yes

 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no


@@ -1189,6 +1191,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes

+  DEFAULT_wxUSE_TIPWINDOW=yes

 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
   DEFAULT_wxUSE_BMPBUTTON=no
 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
   DEFAULT_wxUSE_BMPBUTTON=no


@@ -1227,6 +1230,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no

+  DEFAULT_wxUSE_TIPWINDOW=no

 fi
 
 WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
 fi
 
 WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)


@@ -1266,6 +1270,7 @@ WX_ARG_ENABLE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUS
 WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
 WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
 WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
 WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)

+WX_ARG_ENABLE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)

 WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
 
 dnl ---------------------------------------------------------------------------
 WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
 
 dnl ---------------------------------------------------------------------------


@@ -4501,6 +4506,11 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
         AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
     else
         AC_DEFINE(wxUSE_POPUPWIN)
         AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
     else
         AC_DEFINE(wxUSE_POPUPWIN)

+
+        if test "$wxUSE_TIPWINDOW" = "yes"; then
+            AC_DEFINE(wxUSE_TIPWINDOW)
+        fi
+

         USES_CONTROLS=1
     fi
 fi
         USES_CONTROLS=1
     fi
 fi

diff --git a/setup.h.in b/setup.h.in
index 09f018e62d7959d7b4bf47eddf55a79d69712b08..72b61840a2e61c28435c2045c68e7864c888cfa0 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -206,6 +206,11 @@
 */
 #define wxUSE_POPUPWIN 0
 
 */
 #define wxUSE_POPUPWIN 0
 

+/*
+   Use wxTipWindow
+ */
+#define wxUSE_TIPWINDOW 0
+

 /*
  * Use accelerators
  */
 /*
  * Use accelerators
  */