← Back to branch summary

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

« back to all changes in this revision

Viewing changes to samples/layout/layout.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/layout/layout.cpp
62
62
// MyFrame
63
63
// ----------------------------------------------------------------------------
64
64
 
65
 
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
65
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
66
66
  EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout)
67
67
  EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit)
68
68
 
73
73
  EVT_MENU(LAYOUT_TEST_SET_MINIMAL, MyFrame::TestSetMinimal)
74
74
  EVT_MENU(LAYOUT_TEST_NESTED, MyFrame::TestNested)
75
75
  EVT_MENU(LAYOUT_TEST_WRAP, MyFrame::TestWrap)
76
 
END_EVENT_TABLE()
 
76
wxEND_EVENT_TABLE()
77
77
 
78
78
// Define my frame constructor
79
79
MyFrame::MyFrame()
465
465
};
466
466
 
467
467
 
468
 
BEGIN_EVENT_TABLE(MyGridBagSizerFrame, wxFrame)
 
468
wxBEGIN_EVENT_TABLE(MyGridBagSizerFrame, wxFrame)
469
469
    EVT_BUTTON( GBS_HIDE_BTN,  MyGridBagSizerFrame::OnHideBtn)
470
470
    EVT_BUTTON( GBS_SHOW_BTN,  MyGridBagSizerFrame::OnShowBtn)
471
471
    EVT_BUTTON( GBS_MOVE_BTN1, MyGridBagSizerFrame::OnMoveBtn)
472
472
    EVT_BUTTON( GBS_MOVE_BTN2, MyGridBagSizerFrame::OnMoveBtn)
473
 
END_EVENT_TABLE()
 
473
wxEND_EVENT_TABLE()
474
474
 
475
475
 
476
476
MyGridBagSizerFrame::MyGridBagSizerFrame(wxFrame* parent)
582
582
    ID_SET_BIG
583
583
};
584
584
 
585
 
BEGIN_EVENT_TABLE(MySimpleSizerFrame, wxFrame)
 
585
wxBEGIN_EVENT_TABLE(MySimpleSizerFrame, wxFrame)
586
586
    EVT_MENU( ID_SET_SMALL, MySimpleSizerFrame::OnSetSmallSize)
587
587
    EVT_MENU( ID_SET_BIG, MySimpleSizerFrame::OnSetBigSize)
588
 
END_EVENT_TABLE()
 
588
wxEND_EVENT_TABLE()
589
589
 
590
590
MySimpleSizerFrame::MySimpleSizerFrame(wxFrame* parent)
591
591
    : wxFrame(parent, wxID_ANY, "Simple Sizer Test Frame")
674
674
// MyWrapSizerFrame
675
675
// ----------------------------------------------------------------------------
676
676
 
677
 
BEGIN_EVENT_TABLE(MyWrapSizerFrame, wxFrame)
 
677
wxBEGIN_EVENT_TABLE(MyWrapSizerFrame, wxFrame)
678
678
    EVT_MENU(wxID_ADD, MyWrapSizerFrame::OnAddCheckbox)
679
679
    EVT_MENU(wxID_REMOVE, MyWrapSizerFrame::OnRemoveCheckbox)
680
 
END_EVENT_TABLE()
 
680
wxEND_EVENT_TABLE()
681
681
 
682
682
MyWrapSizerFrame::MyWrapSizerFrame(wxFrame* parent)
683
683
    : wxFrame(parent, wxID_ANY, "Wrap Sizer Test Frame",