← Back to branch summary

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

« back to all changes in this revision

Viewing changes to samples/propgrid/propgrid.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/propgrid/propgrid.cpp
80
80
 
81
81
class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor
82
82
{
83
 
    DECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor)
 
83
    wxDECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor);
84
84
public:
85
85
    wxSampleMultiButtonEditor() {}
86
86
    virtual ~wxSampleMultiButtonEditor() {}
441
441
// Event table
442
442
// -----------------------------------------------------------------------
443
443
 
444
 
BEGIN_EVENT_TABLE(FormMain, wxFrame)
 
444
wxBEGIN_EVENT_TABLE(FormMain, wxFrame)
445
445
    EVT_IDLE(FormMain::OnIdle)
446
446
    EVT_MOVE(FormMain::OnMove)
447
447
    EVT_SIZE(FormMain::OnResize)
557
557
 
558
558
    EVT_CONTEXT_MENU( FormMain::OnContextMenu )
559
559
    EVT_BUTTON(ID_SHOWPOPUP, FormMain::OnShowPopup)
560
 
END_EVENT_TABLE()
 
560
wxEND_EVENT_TABLE()
561
561
 
562
562
// -----------------------------------------------------------------------
563
563
 
1768
1768
    void OnPageChange( wxPropertyGridEvent& event );
1769
1769
 
1770
1770
private:
1771
 
    DECLARE_EVENT_TABLE()
 
1771
    wxDECLARE_EVENT_TABLE();
1772
1772
};
1773
1773
 
1774
1774
 
1775
 
BEGIN_EVENT_TABLE(wxMyPropertyGridPage, wxPropertyGridPage)
 
1775
wxBEGIN_EVENT_TABLE(wxMyPropertyGridPage, wxPropertyGridPage)
1776
1776
    EVT_PG_SELECTED( wxID_ANY, wxMyPropertyGridPage::OnPropertySelect )
1777
1777
    EVT_PG_CHANGING( wxID_ANY, wxMyPropertyGridPage::OnPropertyChanging )
1778
1778
    EVT_PG_CHANGED( wxID_ANY, wxMyPropertyGridPage::OnPropertyChange )
1779
1779
    EVT_PG_PAGE_CHANGED( wxID_ANY, wxMyPropertyGridPage::OnPageChange )
1780
 
END_EVENT_TABLE()
 
1780
wxEND_EVENT_TABLE()
1781
1781
 
1782
1782
 
1783
1783
void wxMyPropertyGridPage::OnPropertySelect( wxPropertyGridEvent& WXUNUSED(event) )
1817
1817
        event.Skip();
1818
1818
    }
1819
1819
private:
1820
 
    DECLARE_EVENT_TABLE()
 
1820
    wxDECLARE_EVENT_TABLE();
1821
1821
};
1822
1822
 
1823
 
BEGIN_EVENT_TABLE(wxPGKeyHandler,wxEvtHandler)
 
1823
wxBEGIN_EVENT_TABLE(wxPGKeyHandler,wxEvtHandler)
1824
1824
    EVT_KEY_DOWN( wxPGKeyHandler::OnKeyEvent )
1825
 
END_EVENT_TABLE()
 
1825
wxEND_EVENT_TABLE()
1826
1826
 
1827
1827
 
1828
1828
// -----------------------------------------------------------------------
3263
3263
        SetSize(pos.x, pos.y, size.x, size.y);
3264
3264
    }
3265
3265
 
3266
 
    DECLARE_CLASS(PropertyGridPopup)
3267
 
    DECLARE_EVENT_TABLE()
 
3266
    wxDECLARE_ABSTRACT_CLASS(PropertyGridPopup);
 
3267
    wxDECLARE_EVENT_TABLE();
3268
3268
};
3269
3269
 
3270
3270
IMPLEMENT_CLASS(PropertyGridPopup, wxPopupWindow)
3271
 
BEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow)
 
3271
wxBEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow)
3272
3272
    EVT_PG_ITEM_COLLAPSED(ID_POPUPGRID, PropertyGridPopup::OnCollapse)
3273
3273
    EVT_PG_ITEM_EXPANDED(ID_POPUPGRID, PropertyGridPopup::OnExpand)
3274
 
END_EVENT_TABLE()
 
3274
wxEND_EVENT_TABLE()
3275
3275
 
3276
3276
 
3277
3277
void FormMain::OnShowPopup(wxCommandEvent& WXUNUSED(event))