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

no real change: put event handlers together at the end of the file

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-07 14:11:33 +00:00
parent bcf324bebe
commit 9a6aafe003
1 changed files with 155 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/generic/statusbr.cpp
View File

@@ -106,14 +106,14 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
wxSize wxStatusBarGeneric::DoGetBestSize() const
{
int width, height;
wxCoord y;
// best width is the width of the parent
GetParent()->GetClientSize(&width, NULL);
// best height is as calculated above in Create
// best height is as calculated above in Create()
wxClientDC dc((wxWindow*)this);
dc.SetFont(GetFont());
wxCoord y;
dc.GetTextExtent(_T("X"), NULL, &y);
height = (int)((11*y)/10 + 2*GetBorderY());
@@ -192,51 +192,6 @@ bool wxStatusBarGeneric::ShowsSizeGrip() const
return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER);
}
void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
#ifdef __WXGTK20__
// Draw grip first
if ( ShowsSizeGrip() )
{
int width, height;
GetClientSize(&width, &height);
if (GetLayoutDirection() == wxLayout_RightToLeft)
{
gtk_paint_resize_grip( m_widget->style,
GTKGetDrawingWindow(),
(GtkStateType) GTK_WIDGET_STATE (m_widget),
NULL,
m_widget,
"statusbar",
GDK_WINDOW_EDGE_SOUTH_WEST,
2, 2, height-2, height-4 );
}
else
{
gtk_paint_resize_grip( m_widget->style,
GTKGetDrawingWindow(),
(GtkStateType) GTK_WIDGET_STATE (m_widget),
NULL,
m_widget,
"statusbar",
GDK_WINDOW_EDGE_SOUTH_EAST,
width-height-2, 2, height-2, height-4 );
}
}
#endif // __WXGTK20__
if (GetFont().Ok())
dc.SetFont(GetFont());
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
for (size_t i = 0; i < m_panes.GetCount(); i ++)
DrawField(dc, i);
}
void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
{
int leftMargin = 2;
@@ -247,7 +202,6 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
wxString text(GetStatusText(i));
wxCoord x = 0, y = 0;
dc.GetTextExtent(text, &x, &y);
int xpos = rect.x + leftMargin;
@@ -333,20 +287,17 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
// we cache m_widthsAbs between calls and recompute it if client
// width has changed (or when it is initially empty)
if ( m_widthsAbs.IsEmpty() || (m_lastClientWidth != width) )
if ( m_widthsAbs.IsEmpty() || m_lastClientWidth != width )
{
wxConstCast(this, wxStatusBarGeneric)->
m_widthsAbs = CalculateAbsWidths(width);
wxConstCast(this, wxStatusBarGeneric)->m_widthsAbs = CalculateAbsWidths(width);
// remember last width for which we have recomputed the widths in pixels
wxConstCast(this, wxStatusBarGeneric)->
m_lastClientWidth = width;
wxConstCast(this, wxStatusBarGeneric)->m_lastClientWidth = width;
}
rect.x = 0;
for ( int i = 0; i < n; i++ )
{
rect.x += m_widthsAbs[i];
}
rect.x += m_borderX;
rect.y = m_borderY;
@@ -372,15 +323,6 @@ void wxStatusBarGeneric::InitColours()
#endif // __WXPM__/!__WXPM__
}
// Responds to colour changes, and passes event on to children.
void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
{
InitColours();
// Propagate the event to the non-top-level children
wxWindow::OnSysColourChanged(event);
}
void wxStatusBarGeneric::SetMinHeight(int height)
{
// check that this min height is not less than minimal height for the
@@ -395,6 +337,65 @@ void wxStatusBarGeneric::SetMinHeight(int height)
}
}
// ----------------------------------------------------------------------------
// wxStatusBarGeneric - event handlers
// ----------------------------------------------------------------------------
void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
#ifdef __WXGTK20__
// Draw grip first
if ( ShowsSizeGrip() )
{
int width, height;
GetClientSize(&width, &height);
if (GetLayoutDirection() == wxLayout_RightToLeft)
{
gtk_paint_resize_grip( m_widget->style,
GTKGetDrawingWindow(),
(GtkStateType) GTK_WIDGET_STATE (m_widget),
NULL,
m_widget,
"statusbar",
GDK_WINDOW_EDGE_SOUTH_WEST,
2, 2, height-2, height-4 );
}
else
{
gtk_paint_resize_grip( m_widget->style,
GTKGetDrawingWindow(),
(GtkStateType) GTK_WIDGET_STATE (m_widget),
NULL,
m_widget,
"statusbar",
GDK_WINDOW_EDGE_SOUTH_EAST,
width-height-2, 2, height-2, height-4 );
}
}
#endif // __WXGTK20__
if (GetFont().IsOk())
dc.SetFont(GetFont());
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
for (size_t i = 0; i < m_panes.GetCount(); i ++)
DrawField(dc, i);
}
// Responds to colour changes, and passes event on to children.
void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
{
InitColours();
// Propagate the event to the non-top-level children
wxWindow::OnSysColourChanged(event);
}
void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
{
#ifdef __WXGTK20__