Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxTipWindow can now derived from wxFrame if not wxUSE_POPUPWIN, or

Browse Source 
wxPopupTransientWindow otherwise.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-12-02 01:54:38 +00:00
parent 673ad11240
commit 961c54c333
3 changed files with 171 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/chkconf.h
View File

@@ -877,14 +877,5 @@
# endif
#endif /* wxUSE_CLIPBOARD */
#if wxUSE_TIPWINDOW && !wxUSE_POPUPWIN
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxTipWindow requires wxPopupWindow"
# else
# undef wxUSE_POPUPWIN
# define wxUSE_POPUPWIN 1
# endif
#endif /* wxUSE_TIPWINDOW */
#endif /* wxUSE_GUI */

23
include/wx/tipwin.h
View File

@@ -17,16 +17,25 @@
#pragma interface "tipwin.h"
#endif
#include "wx/popupwin.h"
#if wxUSE_TIPWINDOW
#if wxUSE_POPUPWIN
#include "wx/popupwin.h"
#else
#include "wx/frame.h"
#endif
// ----------------------------------------------------------------------------
// wxTipWindow
// ----------------------------------------------------------------------------
#if wxUSE_POPUPWIN
class WXDLLEXPORT wxTipWindow : public wxPopupTransientWindow
#else
class WXDLLEXPORT wxTipWindow : public wxFrame
#endif
{
friend class wxTipWindowView;
public:
// Supply windowPtr for it to null the given address
// when the window has closed.
@@ -37,15 +46,15 @@ public:
void SetTipWindowPtr(wxTipWindow** windowPtr) { m_windowPtr = windowPtr; }
// calculate the client rect we need to display the text
void Adjust(const wxString& text, wxCoord maxLength);
void Close();
protected:
// event handlers
void OnMouseClick(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
#if !wxUSE_POPUPWIN
void OnActivate(wxActivateEvent& event);
void OnKillFocus(wxFocusEvent& event);
#endif
private:
wxArrayString m_textLines;
@@ -55,7 +64,5 @@ private:
DECLARE_EVENT_TABLE()
};
#endif // wxUSE_POPUPWIN
#endif // wxUSE_TIPWINDOW
#endif // _WX_TIPWIN_H_

206
src/generic/tipwin.cpp
View File

@@ -54,14 +54,53 @@ static const wxCoord TEXT_MARGIN_Y = 3;
// event tables
// ----------------------------------------------------------------------------
#if wxUSE_POPUPWIN
BEGIN_EVENT_TABLE(wxTipWindow, wxPopupTransientWindow)
#else
BEGIN_EVENT_TABLE(wxTipWindow, wxFrame)
#endif
EVT_LEFT_DOWN(wxTipWindow::OnMouseClick)
EVT_RIGHT_DOWN(wxTipWindow::OnMouseClick)
EVT_MIDDLE_DOWN(wxTipWindow::OnMouseClick)
EVT_PAINT(wxTipWindow::OnPaint)
#if !wxUSE_POPUPWIN
EVT_KILL_FOCUS(wxTipWindow::OnKillFocus)
EVT_ACTIVATE(wxTipWindow::OnActivate)
#endif
END_EVENT_TABLE()
// Viewer window to put in the frame
class wxTipWindowView: public wxWindow
{
public:
wxTipWindowView(wxWindow *parent);
// event handlers
void OnPaint(wxPaintEvent& event);
void OnMouseClick(wxMouseEvent& event);
#if !wxUSE_POPUPWIN
void OnKillFocus(wxFocusEvent& event);
#endif
// calculate the client rect we need to display the text
void Adjust(const wxString& text, wxCoord maxLength);
private:
long m_creationTime;
wxTipWindow* m_parent;
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxTipWindowView, wxWindow)
EVT_PAINT(wxTipWindowView::OnPaint)
EVT_LEFT_DOWN(wxTipWindowView::OnMouseClick)
EVT_RIGHT_DOWN(wxTipWindowView::OnMouseClick)
EVT_MIDDLE_DOWN(wxTipWindowView::OnMouseClick)
#if !wxUSE_POPUPWIN
EVT_KILL_FOCUS(wxTipWindowView::OnKillFocus)
#endif
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// wxTipWindow
// ----------------------------------------------------------------------------
@@ -69,7 +108,13 @@ END_EVENT_TABLE()
wxTipWindow::wxTipWindow(wxWindow *parent,
const wxString& text,
wxCoord maxLength, wxTipWindow** windowPtr)
#if wxUSE_POPUPWIN
: wxPopupTransientWindow(parent)
#else
: wxFrame(parent, -1, _T(""),
wxDefaultPosition, wxDefaultSize,
wxNO_BORDER | wxFRAME_NO_TASKBAR )
#endif
{
m_windowPtr = windowPtr;
@@ -83,15 +128,19 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
#endif
SetBackgroundColour(bkCol);
// set size and position
Adjust(text, maxLength);
// set size, position and show it
wxTipWindowView* tipWindowView = new wxTipWindowView(this);
tipWindowView->Adjust(text, maxLength);
tipWindowView->SetFocus();
int x, y;
wxGetMousePosition(&x, &y);
#if wxUSE_POPUPWIN
Position(wxPoint(x, y+10), wxSize(0,0));
//Show(TRUE);
Popup();
SetFocus();
Popup(tipWindowView);
#else
Move(x, y + 10);
Show(TRUE);
#endif
}
wxTipWindow::~wxTipWindow()
@@ -107,39 +156,57 @@ void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))
Close();
}
void wxTipWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
#if !wxUSE_POPUPWIN
void wxTipWindow::OnActivate(wxActivateEvent& event)
{
wxPaintDC dc(this);
wxRect rect;
wxSize size = GetClientSize();
rect.width = size.x;
rect.height = size.y;
// first filll the background
dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
dc.SetPen( * wxBLACK_PEN );
dc.DrawRectangle(rect);
// and then draw the text line by line
dc.SetFont(GetFont());
wxPoint pt;
pt.x = TEXT_MARGIN_X;
pt.y = TEXT_MARGIN_Y;
size_t count = m_textLines.GetCount();
for ( size_t n = 0; n < count; n++ )
{
dc.DrawText(m_textLines[n], pt);
pt.y += m_heightLine;
}
if (!event.GetActive())
Close();
}
void wxTipWindow::OnKillFocus(wxFocusEvent& WXUNUSED(event))
{
// Under Windows at least, we will get this immediately
// because when the view window is focussed, the
// tip window goes out of focus.
#ifdef __WXGTK__
Close();
#endif
}
#endif
void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength)
void wxTipWindow::Close()
{
#if wxUSE_POPUPWIN
Show(FALSE);
Destroy();
#else
wxFrame::Close();
#endif
}
// ----------------------------------------------------------------------------
// wxTipWindowView
// ----------------------------------------------------------------------------
wxTipWindowView::wxTipWindowView(wxWindow *parent)
: wxWindow(parent, -1,
wxDefaultPosition, wxDefaultSize,
wxNO_BORDER)
{
// set colours
SetForegroundColour(*wxBLACK);
#ifdef __WXMSW__
wxColour bkCol(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_INFOBK));
#else
wxColour bkCol(wxColour(255, 255, 225));
#endif
SetBackgroundColour(bkCol);
m_creationTime = wxGetLocalTime();
m_parent = (wxTipWindow*)parent;
}
void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
{
wxClientDC dc(this);
dc.SetFont(GetFont());
@@ -149,7 +216,7 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength)
wxString current;
wxCoord height, width,
widthMax = 0;
m_heightLine = 0;
m_parent->m_heightLine = 0;
bool breakLine = FALSE;
for ( const wxChar *p = text.c_str(); ; p++ )
@@ -160,10 +227,10 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength)
if ( width > widthMax )
widthMax = width;
if ( height > m_heightLine )
m_heightLine = height;
if ( height > m_parent->m_heightLine )
m_parent->m_heightLine = height;
m_textLines.Add(current);
m_parent->m_textLines.Add(current);
if ( !*p )
{
@@ -177,7 +244,7 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength)
else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
{
// word boundary - break the line here
m_textLines.Add(current);
m_parent->m_textLines.Add(current);
current.clear();
breakLine = FALSE;
}
@@ -191,22 +258,61 @@ void wxTipWindow::Adjust(const wxString& text, wxCoord maxLength)
if ( width > widthMax )
widthMax = width;
if ( height > m_heightLine )
m_heightLine = height;
if ( height > m_parent->m_heightLine )
m_parent->m_heightLine = height;
}
}
// take into account the border size and the margins
SetClientSize(2*(TEXT_MARGIN_X + 1) + widthMax,
2*(TEXT_MARGIN_Y + 1) + m_textLines.GetCount() * m_heightLine);
width = 2*(TEXT_MARGIN_X + 1) + widthMax;
height = 2*(TEXT_MARGIN_Y + 1) + m_parent->m_textLines.GetCount()*m_parent->m_heightLine;
m_parent->SetClientSize(width, height);
SetSize(0, 0, width, height);
}
void wxTipWindow::Close()
void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
{
Show(FALSE);
Destroy();
wxPaintDC dc(this);
wxRect rect;
wxSize size = GetClientSize();
rect.width = size.x;
rect.height = size.y;
// first filll the background
dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
dc.SetPen( wxPen(GetForegroundColour(), 1, wxSOLID) );
dc.DrawRectangle(rect);
// and then draw the text line by line
dc.SetTextBackground(GetBackgroundColour());
dc.SetTextForeground(GetForegroundColour());
dc.SetFont(GetFont());
wxPoint pt;
pt.x = TEXT_MARGIN_X;
pt.y = TEXT_MARGIN_Y;
size_t count = m_parent->m_textLines.GetCount();
for ( size_t n = 0; n < count; n++ )
{
dc.DrawText(m_parent->m_textLines[n], pt);
pt.y += m_parent->m_heightLine;
}
}
#endif // wxUSE_TIPWINDOW
void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event))
{
m_parent->Close();
}
#if !wxUSE_POPUPWIN
void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event))
{
// Workaround the kill focus event happening just after creation in wxGTK
if (wxGetLocalTime() > m_creationTime + 1)
m_parent->Close();
}
#endif
#endif