Changeset b00a29a in git


Ignore:
Timestamp:
16/09/11 04:02:05 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
de402d4
Parents:
6b061db
Message:

src/mainfrm.cc: Remove special handling for toggling "full screen"
on wxGTK as it's no longer required with modern versions.

git-svn-id: file:///home/survex-svn/survex/trunk@3638 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r6b061db rb00a29a  
     1Fri Sep 16 03:00:51 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * src/mainfrm.cc: Remove special handling for toggling "full screen"
     4          on wxGTK as it's no longer required with modern versions.
     5
    16Fri Sep 16 02:05:12 GMT 2011  Olly Betts <olly@survex.com>
    27
  • src/mainfrm.cc

    r6b061db rb00a29a  
    24562456    if (IsFullScreen()) sidepanel = ShowingSidePanel();
    24572457    if (sidepanel) ToggleSidePanel();
    2458 #ifdef __WXGTK__
    2459     // wxGTK doesn't currently remove the toolbar, statusbar, or menubar.
    2460     // Can't work out how to lose the menubar right now, but this works for
    2461     // the other two.  FIXME: tidy this code up and submit a patch for
    2462     // wxWidgets.
    2463     wxToolBar *tb = GetToolBar();
    2464     if (tb) tb->Show(!IsFullScreen());
    2465     wxStatusBar *sb = GetStatusBar();
    2466     if (sb) sb->Show(!IsFullScreen());
    2467 #if 0
    2468     // FIXME: This sort of works, but we lose the top-level shortcuts
    2469     // (e.g. alt-F for File)
    2470     wxMenuBar *mb = GetMenuBar();
    2471     if (mb) {
    2472         static list<wxMenu *> menus;
    2473         static list<wxString> labels;
    2474         if (IsFullScreen()) {
    2475             // remove menus
    2476             for (int c = mb->GetMenuCount(); c >= 0; --c) {
    2477                 labels.push_back(mb->GetLabelTop(c));
    2478                 menus.push_back(mb->Remove(c));
    2479             }
    2480         } else {
    2481             while (!menus.empty()) {
    2482                 mb->Append(menus.back(), labels.back());
    2483                 menus.pop_back();
    2484                 labels.pop_back();
    2485             }
    2486         }
    2487     }
    2488 #endif
    2489 #endif
    2490 }
     2458}
Note: See TracChangeset for help on using the changeset viewer.