← Back to branch summary

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

« back to all changes in this revision

Viewing changes to samples/thread/thread.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/thread/thread.cpp
172
172
    bool m_cancelled;
173
173
    wxCriticalSection m_csCancelled;        // protects m_cancelled
174
174
 
175
 
    DECLARE_EVENT_TABLE()
 
175
    wxDECLARE_EVENT_TABLE();
176
176
};
177
177
 
178
178
// ----------------------------------------------------------------------------
284
284
    MyGUIThread m_thread;
285
285
    int m_nCurrentProgress;
286
286
 
287
 
    DECLARE_EVENT_TABLE()
 
287
    wxDECLARE_EVENT_TABLE();
288
288
};
289
289
 
290
290
// ============================================================================
323
323
// MyFrame
324
324
// ----------------------------------------------------------------------------
325
325
 
326
 
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
326
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
327
327
    EVT_MENU(THREAD_QUIT, MyFrame::OnQuit)
328
328
    EVT_MENU(THREAD_CLEAR, MyFrame::OnClear)
329
329
    EVT_MENU(THREAD_START_THREAD, MyFrame::OnStartThread)
342
342
    EVT_UPDATE_UI(THREAD_START_WORKER, MyFrame::OnUpdateWorker)
343
343
    EVT_THREAD(WORKER_EVENT, MyFrame::OnWorkerEvent)
344
344
    EVT_IDLE(MyFrame::OnIdle)
345
 
END_EVENT_TABLE()
 
345
wxEND_EVENT_TABLE()
346
346
 
347
347
// My frame constructor
348
348
MyFrame::MyFrame(const wxString& title)
817
817
// MyImageDialog
818
818
// ----------------------------------------------------------------------------
819
819
 
820
 
BEGIN_EVENT_TABLE(MyImageDialog, wxDialog)
 
820
wxBEGIN_EVENT_TABLE(MyImageDialog, wxDialog)
821
821
    EVT_THREAD(GUITHREAD_EVENT, MyImageDialog::OnGUIThreadEvent)
822
822
    EVT_PAINT(MyImageDialog::OnPaint)
823
 
END_EVENT_TABLE()
 
823
wxEND_EVENT_TABLE()
824
824
 
825
825
MyImageDialog::MyImageDialog(wxFrame *parent)
826
826
    : wxDialog(parent, wxID_ANY, "Image created by a secondary thread",