projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle wxALWAYS_SHOW_SB in wxOSX.
[wxWidgets.git]
/
src
/
generic
/
tipwin.cpp
diff --git
a/src/generic/tipwin.cpp
b/src/generic/tipwin.cpp
index c64fa5a569729e6077cf05a085a238c422aafe3f..ede0ae3913d9ab9bdfb4652fcd18fd917c651000 100644
(file)
--- a/
src/generic/tipwin.cpp
+++ b/
src/generic/tipwin.cpp
@@
-71,7
+71,7
@@
private:
#endif // !wxUSE_POPUPWIN
DECLARE_EVENT_TABLE()
#endif // !wxUSE_POPUPWIN
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxTipWindowView)
+ wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
};
// ============================================================================
};
// ============================================================================
@@
-167,7
+167,7
@@
wxTipWindow::~wxTipWindow()
{
*m_windowPtr = NULL;
}
{
*m_windowPtr = NULL;
}
- #if
def
wxUSE_POPUPWIN
+ #if wxUSE_POPUPWIN
#ifdef __WXGTK__
if ( m_view->HasCapture() )
m_view->ReleaseMouse();
#ifdef __WXGTK__
if ( m_view->HasCapture() )
m_view->ReleaseMouse();
@@
-226,7
+226,11
@@
void wxTipWindow::Close()
if ( m_view->HasCapture() )
m_view->ReleaseMouse();
#endif
if ( m_view->HasCapture() )
m_view->ReleaseMouse();
#endif
- Destroy();
+ // Under OS X we get destroyed because of wxEVT_KILL_FOCUS generated by
+ // Show(false).
+ #ifndef __WXOSX__
+ Destroy();
+ #endif
#else
wxFrame::Close();
#endif
#else
wxFrame::Close();
#endif
@@
-267,7
+271,7
@@
void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
bool breakLine = false;
for ( const wxChar *p = text.c_str(); ; p++ )
{
bool breakLine = false;
for ( const wxChar *p = text.c_str(); ; p++ )
{
- if ( *p ==
_T('\n') || *p == _
T('\0') )
+ if ( *p ==
wxT('\n') || *p == wx
T('\0') )
{
dc.GetTextExtent(current, &width, &height);
if ( width > widthMax )
{
dc.GetTextExtent(current, &width, &height);
if ( width > widthMax )
@@
-287,7
+291,7
@@
void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
current.clear();
breakLine = false;
}
current.clear();
breakLine = false;
}
- else if ( breakLine && (*p ==
_T(' ') || *p == _
T('\t')) )
+ else if ( breakLine && (*p ==
wxT(' ') || *p == wx
T('\t')) )
{
// word boundary - break the line here
m_parent->m_textLines.Add(current);
{
// word boundary - break the line here
m_parent->m_textLines.Add(current);
@@
-326,8
+330,8
@@
void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
rect.height = size.y;
// first filll the background
rect.height = size.y;
// first filll the background
- dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
- dc.SetPen(
wxPen(GetForegroundColour(), 1, wxSOLID)
);
+ dc.SetBrush(wxBrush(GetBackgroundColour(), wx
BRUSHSTYLE_
SOLID));
+ dc.SetPen(
wxPen(GetForegroundColour(), 1, wxPENSTYLE_SOLID)
);
dc.DrawRectangle(rect);
// and then draw the text line by line
dc.DrawRectangle(rect);
// and then draw the text line by line