fixing osx_carbon

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

diff --git a/src/os2/tooltip.cpp b/src/os2/tooltip.cpp
index 38d58abce4ab8c6ede411b4d19d832edc253ab6e..3407b154e4207785ac0de570b8a9e7c0c40e61a5 100644 (file)
--- a/src/os2/tooltip.cpp
+++ b/src/os2/tooltip.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/tooltip.cpp
+// Name:        src/os2/tooltip.cpp

 // Purpose:     wxToolTip class implementation for MSW
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxToolTip class implementation for MSW
 // Author:      David Webster
 // Modified by:
 // 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;
 )
 {
     ULONG                           lStyle = ES_READONLY | ES_MARGIN | ES_CENTER;

-    wxColour                        vColor;

     LONG                            lColor;
     char                            zFont[128];
 
     LONG                            lColor;
     char                            zFont[128];
 


@@ -72,9 +71,11 @@ void wxToolTip::Create(
                                ,NULL
                               );
     if (!m_hWnd)
                                ,NULL
                               );
     if (!m_hWnd)

-        wxLogError("Unable to create tooltip window");
+    {
+        wxLogError(wxT("Unable to create tooltip window"));
+    }

 
 

-    vColor.InitFromName("YELLOW");
+    wxColour                        vColor( wxT("YELLOW") );

     lColor = (LONG)vColor.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
     lColor = (LONG)vColor.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR


@@ -98,7 +99,7 @@ void wxToolTip::DisplayToolTipWindow(
     LONG                            lWidth = 0L;
     LONG                            lHeight = 0L;
 
     LONG                            lWidth = 0L;
     LONG                            lHeight = 0L;
 

-    lWidth = m_sText.Length() * 13;
+    lWidth = m_sText.Length() * 8;

     lHeight = 15;
     ::WinSetWindowPos( m_hWnd
                       ,HWND_TOP
     lHeight = 15;
     ::WinSetWindowPos( m_hWnd
                       ,HWND_TOP