recognize schemes other than http and ftp in wxLaunchDefaultBrowser()

[wxWidgets.git] / src / os2 / tooltip.cpp

diff --git a/src/os2/tooltip.cpp b/src/os2/tooltip.cpp
index 90254e24821cff9377068628fc8a545aff173fef..300dedee4edecceafd40c9c2aee5fdac946111e7 100644 (file)
--- a/src/os2/tooltip.cpp
+++ b/src/os2/tooltip.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -56,7 +56,6 @@ void wxToolTip::Create(
 )
 {
     ULONG                           lStyle = ES_READONLY | ES_MARGIN | ES_CENTER;
-    wxColour                        vColor;
     LONG                            lColor;
     char                            zFont[128];
 
@@ -72,16 +71,16 @@ void wxToolTip::Create(
                                ,NULL
                               );
     if (!m_hWnd)
-        wxLogError("Unable to create tooltip window");
+        wxLogError(_T("Unable to create tooltip window"));
 
-    vColor.InitFromName("YELLOW");
+    wxColour                        vColor( wxT("YELLOW") );
     lColor = (LONG)vColor.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
-    strcpy(zFont, "10.Helv");
+    strcpy(zFont, "8.Helv");
     ::WinSetPresParam( m_hWnd
                       ,PP_FONTNAMESIZE
                       ,strlen(zFont) + 1
@@ -98,7 +97,7 @@ void wxToolTip::DisplayToolTipWindow(
     LONG                            lWidth = 0L;
     LONG                            lHeight = 0L;
 
-    lWidth = m_sText.Length() * 13;
+    lWidth = m_sText.Length() * 8;
     lHeight = 15;
     ::WinSetWindowPos( m_hWnd
                       ,HWND_TOP
@@ -125,7 +124,7 @@ void wxToolTip::SetTip(
 
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     m_sText = rsTip;
-    lWidth = rsTip.Length() * 13;
+    lWidth = rsTip.Length() * 8;
     lHeight = 15;
     ::WinSetWindowPos( m_hWnd
                       ,HWND_TOP