startup tips for Unix

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

diff --git a/acconfig.h b/acconfig.h
index b19c84594cba5cbbab7c8e2bb62f3ddef704abde..f0b87b500b819c4582ee23fcfb4a1c0dc5c88310 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -144,6 +144,11 @@
  */
 #define wxUSE_TEXTDLG 0
 
+/*
+ * Use startup tips
+ */
+#define wxUSE_STARTUP_TIPS 0
+
 /*
  * Use progress dialog
  */

diff --git a/configure.in b/configure.in
index 21ffaa8a7b3c5da974c843bd721e8058baa8389c..5e6a6fa14ada07ef3f0815ecedc518371f1b5286 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -289,6 +289,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_COMMONDLGS=no
   DEFAULT_wxUSE_DIRDLG=no
   DEFAULT_wxUSE_TEXTDLG=no
+  DEFAULT_wxUSE_STARTUP_TIPS=no
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_VALIDATORS=yes
@@ -387,6 +388,7 @@ else
   DEFAULT_wxUSE_COMMONDLGS=yes
   DEFAULT_wxUSE_DIRDLG=yes
   DEFAULT_wxUSE_TEXTDLG=yes
+  DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_VALIDATORS=yes
@@ -670,6 +672,7 @@ dnl ---------------------------------------------------------------------------
 WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], wxUSE_COMMONDLGS)
 WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
 WX_ARG_ENABLE(textdlg,     [  --enable-textdlg        use wxTextDialog], wxUSE_TEXTDLG)
+WX_ARG_ENABLE(tipdlg,      [  --enable-tipdlg         use startup tips], wxUSE_STARTUP_TIPS)
 WX_ARG_ENABLE(progressdlg, [  --enable-progressdlg    use wxProgressDialog], wxUSE_PROGRESSDLG)
 WX_ARG_ENABLE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
 WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
@@ -1969,6 +1972,14 @@ if test "$wxUSE_TEXTDLG" = "yes"; then
     AC_DEFINE(wxUSE_TEXTDLG)
 fi
 
+if test "$wxUSE_STARTUP_TIPS" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       AC_MSG_WARN(Startup tips requires constraints and won't be compiled without them)
+    else
+        AC_DEFINE(wxUSE_STARTUP_TIPS)
+    fi
+fi
+
 if test "$wxUSE_PROGRESSDLG" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then
        AC_MSG_WARN(wxProgressDialog requires constraints so it won't be compiled without them)

diff --git a/include/wx/generic/tip.xpm b/include/wx/generic/tip.xpm
index fb4a3707407b283bf4e434ea3f028c2df902c846..2aaebfb1a3f3f079f32382dcd55ce35de3a29f98 100644 (file)
--- a/include/wx/generic/tip.xpm
+++ b/include/wx/generic/tip.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *magick[] = {
+static char *tipIcon[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 7 1",
 "  c Gray0",