correcting last commit

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 17093b2d9e5d71b8f2f7fe7b2ce9ac9f03eb16fd..30e6e9d871c3e0842c82fdb289f62e1820efc5d9 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -126,7 +126,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
 #if wxUSE_POPUPWIN
            : wxPopupTransientWindow(parent)
 #else
 #if wxUSE_POPUPWIN
            : wxPopupTransientWindow(parent)
 #else

-           : wxFrame(parent, -1, _T(""),
+           : wxFrame(parent, wxID_ANY, wxEmptyString,

                      wxDefaultPosition, wxDefaultSize,
                      wxNO_BORDER | wxFRAME_NO_TASKBAR )
 #endif
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_BORDER | wxFRAME_NO_TASKBAR )
 #endif


@@ -157,15 +157,15 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
     y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2;
 
 #if wxUSE_POPUPWIN
     y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2;
 
 #if wxUSE_POPUPWIN

-    Position(wxPoint(x, y), wxSize(0, 0));
+    Position(wxPoint(x, y), wxSize(0,0));

     Popup(m_view);
     #ifdef __WXGTK__
         if (!GTK_WIDGET_HAS_GRAB(m_widget))
             gtk_grab_add( m_widget );
     Popup(m_view);
     #ifdef __WXGTK__
         if (!GTK_WIDGET_HAS_GRAB(m_widget))
             gtk_grab_add( m_widget );

-    #endif   
+    #endif

 #else
     Move(x, y);
 #else
     Move(x, y);

-    Show(TRUE);
+    Show(true);

 #endif
 }
 
 #endif
 }
 


@@ -229,11 +229,11 @@ void wxTipWindow::Close()
     }
 
 #if wxUSE_POPUPWIN
     }
 
 #if wxUSE_POPUPWIN

-    Show(FALSE);
+    Show(false);

     #ifdef __WXGTK__
         if (GTK_WIDGET_HAS_GRAB(m_widget))
             gtk_grab_remove( m_widget );
     #ifdef __WXGTK__
         if (GTK_WIDGET_HAS_GRAB(m_widget))
             gtk_grab_remove( m_widget );

-    #endif   
+    #endif

     Destroy();
 #else
     wxFrame::Close();
     Destroy();
 #else
     wxFrame::Close();


@@ -245,7 +245,7 @@ void wxTipWindow::Close()
 // ----------------------------------------------------------------------------
 
 wxTipWindowView::wxTipWindowView(wxWindow *parent)
 // ----------------------------------------------------------------------------
 
 wxTipWindowView::wxTipWindowView(wxWindow *parent)

-               : wxWindow(parent, -1,
+               : wxWindow(parent, wxID_ANY,

                           wxDefaultPosition, wxDefaultSize,
                           wxNO_BORDER)
 {
                           wxDefaultPosition, wxDefaultSize,
                           wxNO_BORDER)
 {


@@ -272,7 +272,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             widthMax = 0;
     m_parent->m_heightLine = 0;
 
             widthMax = 0;
     m_parent->m_heightLine = 0;
 

-    bool breakLine = FALSE;
+    bool breakLine = false;

     for ( const wxChar *p = text.c_str(); ; p++ )
     {
         if ( *p == _T('\n') || *p == _T('\0') )
     for ( const wxChar *p = text.c_str(); ; p++ )
     {
         if ( *p == _T('\n') || *p == _T('\0') )


@@ -293,21 +293,21 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             }
 
             current.clear();
             }
 
             current.clear();

-            breakLine = FALSE;
+            breakLine = false;

         }
         else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
         {
             // word boundary - break the line here
             m_parent->m_textLines.Add(current);
             current.clear();
         }
         else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
         {
             // word boundary - break the line here
             m_parent->m_textLines.Add(current);
             current.clear();

-            breakLine = FALSE;
+            breakLine = false;

         }
         else // line goes on
         {
             current += *p;
             dc.GetTextExtent(current, &width, &height);
             if ( width > maxLength )
         }
         else // line goes on
         {
             current += *p;
             dc.GetTextExtent(current, &width, &height);
             if ( width > maxLength )

-                breakLine = TRUE;
+                breakLine = true;

 
             if ( width > widthMax )
                 widthMax = width;
 
             if ( width > widthMax )
                 widthMax = width;