X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/generic/tipwin.cpp?ds=sidebyside diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index 17093b2d9e..36dd8b550a 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -17,29 +17,26 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "tipwin.h" -#endif - -// For compilers that support precompilatixon, includes "wx/wx.h". +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif +#if wxUSE_TIPWINDOW + +#include "wx/tipwin.h" + #ifndef WX_PRECOMP #include "wx/dcclient.h" + #include "wx/timer.h" + #include "wx/settings.h" #endif // WX_PRECOMP + #ifdef __WXGTK__ #include #endif -#include "wx/tipwin.h" - -#if wxUSE_TIPWINDOW - -#include "wx/timer.h" -#include "wx/settings.h" // ---------------------------------------------------------------------------- // constants @@ -126,7 +123,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 +154,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 +226,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 +242,7 @@ void wxTipWindow::Close() // ---------------------------------------------------------------------------- wxTipWindowView::wxTipWindowView(wxWindow *parent) - : wxWindow(parent, -1, + : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER) { @@ -272,7 +269,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 +290,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; @@ -319,7 +316,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength) // take into account the border size and the margins width = 2*(TEXT_MARGIN_X + 1) + widthMax; - height = 2*(TEXT_MARGIN_Y + 1) + m_parent->m_textLines.GetCount()*m_parent->m_heightLine; + height = 2*(TEXT_MARGIN_Y + 1) + wx_truncate_cast(wxCoord, m_parent->m_textLines.GetCount())*m_parent->m_heightLine; m_parent->SetClientSize(width, height); SetSize(0, 0, width, height); }