renamed RGBColor setter to avoid former overload being an override

[wxWidgets.git] / src / generic / tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 272db7296d6573ec3906706253b18dd62df5da70..f8b008b5f48f1ab18bc7883a445efdf05d9a99d8 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "tipdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -200,6 +196,9 @@ wxString wxFileTipProvider::GetTip()
         tip = tip.BeforeLast(wxT('\"'));
         // ...and replace escaped quotes
         tip.Replace(wxT("\\\""), wxT("\""));
+
+        // and translate it as requested
+        tip = wxGetTranslation(tip);
     }
 
     return tip;
@@ -222,7 +221,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                       wxDEFAULT_DIALOG_STYLE
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
                       | wxRESIZE_BORDER
-#endif                      
+#endif
                       )
 {
     m_tipProvider = tipProvider;
@@ -258,7 +257,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                             wxTE_MULTILINE |
                             wxTE_READONLY |
                             wxTE_NO_VSCROLL |
-                            wxTE_RICH | // a hack to get rid of vert scrollbar
+                            wxTE_RICH2 | // a hack to get rid of vert scrollbar
                             wxDEFAULT_CONTROL_BORDER
                             );
 #if defined(__WXMSW__)