fix for potention crash when conversion fails

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 5f428af202fbe6bbe8f8147804e7644f85dd0467..141f3bc17d53e4508007aedbe18d0c07468d0e11 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tooltip.cpp
+// Name:        src/gtk1/tooltip.cpp

 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,21 +7,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "tooltip.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/setup.h"
-

 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"

-#include "wx/window.h"

 
 

-#include "wx/gtk/private.h"
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // global data
 
 //-----------------------------------------------------------------------------
 // global data


@@ -58,7 +55,7 @@ void wxToolTip::Apply( wxWindow *win )
 
     m_window = win;
 
 
     m_window = win;
 

-    if (m_text.IsEmpty())
+    if (m_text.empty())

         m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
         m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );


@@ -83,4 +80,3 @@ void wxToolTip::SetDelay( long msecs )
 }
 
 #endif
 }
 
 #endif

-