~townsend/unity/fix-lp1301394-trusty

« back to all changes in this revision

Viewing changes to UnityCore/IndicatorEntry.h

  • Committer: Marco Trevisan (Treviño)
  • Date: 2014-01-27 17:31:30 UTC
  • mto: (3666.1.7 unity) (3695.4.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3639.
  • Revision ID: mail@3v1n0.net-20140127173130-ifxoobug2tu17c6s
Indicators: remove the ShowDropdownMenu call from Entry, we handle it a lower level now

Show diffs side-by-side

added added

removed removed

Lines of Context:
87
87
 
88
88
  void ShowMenu(int x, int y, unsigned button);
89
89
  void ShowMenu(unsigned int xid, int x, int y, unsigned button);
90
 
  void ShowDropdownMenu(unsigned int xid, int x, int y);
91
 
  void ShowDropdownMenu(int x, int y);
92
90
  void SecondaryActivate();
93
91
  void Scroll(int delta);
94
92
 
103
101
  sigc::signal<void, bool> show_now_changed;
104
102
 
105
103
  sigc::signal<void, std::string const&, unsigned, int, int, unsigned> on_show_menu;
106
 
  sigc::signal<void, std::string const&, unsigned, int, int> on_show_dropdown_menu;
107
104
  sigc::signal<void, std::string const&> on_secondary_activate;
108
105
  sigc::signal<void, std::string const&, int> on_scroll;
109
106