← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wxwidgets2.8/maverick-proposed

« back to all changes in this revision

Viewing changes to src/generic/statusbr.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Devid Filoni
  • Date: 2008-06-30 22:02:17 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080630220217-vag3tkfp91t0453d
Tags: 2.8.8.0-0ubuntu1
https://launchpad.net/bugs/244355
https://launchpad.net/bugs/242164
https://launchpad.net/bugs/211553
https://launchpad.net/bugs/236876
* New upstream version, based on the upstream tarball
  wxPython-src-2.8.8.0.tar.bz2, remove upstream debian dir (LP: #244355).
* Add debian/watch file, LP: #242164.
* Edit get-orig-source target to provide a .orig.tar.gz with the same md5 for
  each .orig.tar.gz generated.
* debian/rules: remove get-orig-source from .PHONY target.
* debian/control.in: add python-wxtools in python-wxgtk=V=U Suggests field.
* Do not apply fix_from_upstream_svn_r52465 patch, not needed.
* Regenerate octave_oct, tcl_tk_tcl patches for the new version.
* Fix spelling-error-in-description lintian warning.
* Fix depends-on-obsolete-package lintian error.
* Fix executable-not-elf-or-script lintian warnings.
* Fix script-not-executable lintian warnings.
* Fix missing-dependency-on-libc lintian error.
* Fix dbg-package-missing-depends lintian warnings.
* Fix package-contains-empty-directory lintian warnings.
* Fix manpage-has-errors-from-man lintian warning.
* Fix image-file-in-usr-lib lintian warnings:
  - add editra_pixmaps patch
  - add xrced_bitmaps patch
* Fix unused-override lintian info.
* Fix malformed-override lintian errors.
* Fix extra-license-file lintian warnings.
* Install upstream wx.pth instead of generated file links (LP: #211553).
* Add editra.png, pyshell.png (encoded using uuencode) icons, LP: #236876:
  - debian/rules: use uudecode to decode .png icons.
* Add a new pyshell.xpm icon.
* Fix doc-base-file-references-missing-file lintian error.
* Fix doc-base-unknown-section lintian warning.
* Fix ruby-script-but-no-ruby-dep lintian errors.
* Fix wish-script-but-no-wish-dep lintian errors.
* Fix missing-dep-for-interpreter errors.
* Bump Standards-Version to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/generic/statusbr.cpp
4
4
// Author:      Julian Smart
5
5
// Modified by:
6
6
// Created:     01/02/97
7
 
// RCS-ID:      $Id: statusbr.cpp 42157 2006-10-20 11:01:50Z SC $
 
7
// RCS-ID:      $Id: statusbr.cpp 51615 2008-02-09 15:10:13Z VZ $
8
8
// Copyright:   (c) Julian Smart
9
9
// Licence:     wxWindows licence
10
10
/////////////////////////////////////////////////////////////////////////////
81
81
    SetFont(*wxSMALL_FONT);
82
82
#endif
83
83
 
84
 
        wxCoord y;
85
 
        {
86
 
                // Set the height according to the font and the border size
87
 
                wxClientDC dc(this);
88
 
                dc.SetFont(GetFont());
 
84
    wxCoord y;
 
85
    {
 
86
        // Set the height according to the font and the border size
 
87
        wxClientDC dc(this);
 
88
        dc.SetFont(GetFont());
89
89
 
90
 
                dc.GetTextExtent(_T("X"), NULL, &y );
91
 
        }
 
90
        dc.GetTextExtent(_T("X"), NULL, &y );
 
91
    }
92
92
    int height = (int)( (11*y)/10 + 2*GetBorderY());
93
93
 
94
94
    SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
200
200
    {
201
201
        int width, height;
202
202
        GetClientSize(&width, &height);
203
 
        
 
203
 
204
204
        if (GetLayoutDirection() == wxLayout_RightToLeft)
205
205
        {
206
206
            gtk_paint_resize_grip( m_widget->style,
368
368
// Initialize colours
369
369
void wxStatusBarGeneric::InitColours()
370
370
{
371
 
    // Shadow colours
372
 
#if defined(__WXMSW__) || defined(__WXMAC__)
373
 
    wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
374
 
    m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
375
 
 
376
 
    wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
377
 
    m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
378
 
#elif defined(__WXPM__)
 
371
#if defined(__WXPM__)
379
372
    m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
380
373
    m_hilightPen = *wxWHITE_PEN;
381
374
 
382
375
    SetBackgroundColour(*wxLIGHT_GREY);
383
376
    SetForegroundColour(*wxBLACK);
384
 
#else
385
 
    m_mediumShadowPen = *wxGREY_PEN;
386
 
    m_hilightPen = *wxWHITE_PEN;
387
 
#endif
 
377
#else // !__WXPM__
 
378
    m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
 
379
    m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
 
380
#endif // __WXPM__/!__WXPM__
388
381
}
389
382
 
390
383
// Responds to colour changes, and passes event on to children.