X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..f15fa3a93ffd477077d1255ebd9d6335758021c4:/src/generic/tipwin.cpp diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index 17093b2d9e..2eba71e722 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "tipwin.h" -#endif - // For compilers that support precompilatixon, includes "wx/wx.h". #include "wx/wxprec.h" @@ -126,7 +122,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent, #if wxUSE_POPUPWIN : wxPopupTransientWindow(parent) #else - : wxFrame(parent, -1, _T(""), + : wxFrame(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxFRAME_NO_TASKBAR ) #endif @@ -157,15 +153,15 @@ wxTipWindow::wxTipWindow(wxWindow *parent, 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 ); - #endif + #endif #else Move(x, y); - Show(TRUE); + Show(true); #endif } @@ -229,11 +225,11 @@ void wxTipWindow::Close() } #if wxUSE_POPUPWIN - Show(FALSE); + Show(false); #ifdef __WXGTK__ if (GTK_WIDGET_HAS_GRAB(m_widget)) gtk_grab_remove( m_widget ); - #endif + #endif Destroy(); #else wxFrame::Close(); @@ -245,7 +241,7 @@ void wxTipWindow::Close() // ---------------------------------------------------------------------------- wxTipWindowView::wxTipWindowView(wxWindow *parent) - : wxWindow(parent, -1, + : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER) { @@ -272,7 +268,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength) 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') ) @@ -293,21 +289,21 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength) } 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(); - breakLine = FALSE; + breakLine = false; } else // line goes on { current += *p; dc.GetTextExtent(current, &width, &height); if ( width > maxLength ) - breakLine = TRUE; + breakLine = true; if ( width > widthMax ) widthMax = width;