← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to src/html/helpwnd.cpp

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/html/helpwnd.cpp
4
4
// Notes:       Based on htmlhelp.cpp, implementing a monolithic
5
5
//              HTML Help controller class,  by Vaclav Slavik
6
6
// Author:      Harm van der Heijden and Vaclav Slavik
7
 
// RCS-ID:      $Id: helpwnd.cpp 60888 2009-06-04 08:01:38Z JS $
 
7
// RCS-ID:      $Id: helpwnd.cpp 67259 2011-03-20 12:27:35Z JS $
8
8
// Copyright:   (c) Harm van der Heijden and Vaclav Slavik
9
9
// Licence:     wxWindows licence
10
10
/////////////////////////////////////////////////////////////////////////////
356
356
    if (htmlWindowBorder == wxBORDER_SUNKEN)
357
357
        htmlWindowBorder = wxBORDER_SIMPLE;
358
358
#else
359
 
    wxBorder htmlWindowBorder = wxBORDER_SIMPLE;
 
359
    wxBorder htmlWindowBorder = wxBORDER_SUNKEN;
360
360
#endif
361
361
 
362
362
    if (helpStyle & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH))