← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to samples/sound/sound.cpp

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-06-18 12:42:22 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140618124222-y7t2vpsije1cesxy
Tags: 3.0.1-1
* New upstream release
  + Incorporates most of the patches we were carrying - only one left is:
    wx-config-conditionalise-webview-in-std.patch
* Drop versioning of dependencies from run-time libraries to wx-common -
  this will make the transition to the next wx version harder, and also
  makes backporting to wheezy more work.
* Mark -dbg packages as "Multi-Arch: same".
* Correct short descriptions of the webview packages to not just be
  copies of the corresponding media package's short description.
* Wrap 81 character line in package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
samples/sound/sound.cpp
92
92
    wxTextCtrl* m_tc;
93
93
 
94
94
    // any class wishing to process wxWidgets events must use this macro
95
 
    DECLARE_EVENT_TABLE()
 
95
    wxDECLARE_EVENT_TABLE();
96
96
};
97
97
 
98
98
// ----------------------------------------------------------------------------
127
127
// the event tables connect the wxWidgets events with the functions (event
128
128
// handlers) which process them. It can be also done at run-time, but for the
129
129
// simple menu events like this the static method is much simpler.
130
 
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
130
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
131
131
    EVT_MENU(Sound_SelectFile,       MyFrame::OnSelectFile)
132
132
#ifdef __WXMSW__
133
133
    EVT_MENU(Sound_SelectResource,   MyFrame::OnSelectResource)
141
141
    EVT_MENU(Sound_PlayLoop,         MyFrame::OnPlayLoop)
142
142
    EVT_MENU(Sound_Stop,             MyFrame::OnStop)
143
143
    EVT_MENU(Sound_PlayBell,         MyFrame::OnPlayBell)
144
 
END_EVENT_TABLE()
 
144
wxEND_EVENT_TABLE()
145
145
 
146
146
// Create a new application object: this macro will allow wxWidgets to create
147
147
// the application object during program execution (it's better than using a