Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use "new" wx-prefixed macros in samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 07:07:55 +00:00
parent 08a02f640a
commit 5b4a70247c
162 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/xrc/custclas.cpp
View File

@@ -62,12 +62,12 @@ IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )
// Event table: connect the events to the handler functions to process them
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE( MyResizableListCtrl, wxListCtrl )
wxBEGIN_EVENT_TABLE( MyResizableListCtrl, wxListCtrl )
// Something to do when right mouse down
EVT_RIGHT_DOWN( MyResizableListCtrl::ContextSensitiveMenu )
// Something to do when resized
EVT_SIZE( MyResizableListCtrl::OnSize )
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
//-----------------------------------------------------------------------------
// Public methods

4
samples/xrc/custclas.h
View File

@@ -32,7 +32,7 @@ class MyResizableListCtrl : public wxListCtrl
// NOTE: Using this REQUIRES a default constructor: that means either: giving a
// default value for all parameters in your constructor, or else having a dummy
// MyResizableListCtrl(){} constructor in addition to your regular one.
DECLARE_DYNAMIC_CLASS( MyResizableListCtrl )
wxDECLARE_DYNAMIC_CLASS( MyResizableListCtrl );
public:
@@ -76,7 +76,7 @@ protected:
private:
// wxWidgets macro, required to be able to use Event tables in the .cpp file.
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};

4
samples/xrc/derivdlg.cpp
View File

@@ -39,12 +39,12 @@
// Event table: connect the events to the handler functions to process them
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(PreferencesDialog, wxDialog)
wxBEGIN_EVENT_TABLE(PreferencesDialog, wxDialog)
EVT_BUTTON( XRCID( "my_button" ), PreferencesDialog::OnMyButtonClicked )
EVT_UPDATE_UI(XRCID( "my_checkbox" ), PreferencesDialog::OnUpdateUIMyCheckbox )
// Note that the ID here isn't a XRCID, it is one of the standard wx ID's.
EVT_BUTTON( wxID_OK, PreferencesDialog::OnOK )
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
//-----------------------------------------------------------------------------
// Public members

2
samples/xrc/derivdlg.h
View File

@@ -51,7 +51,7 @@ private:
void OnOK( wxCommandEvent &event );
// Any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};

4
samples/xrc/myframe.cpp
View File

@@ -77,7 +77,7 @@
// to fire the same kind of event (an EVT_MENU) and thus I give them the same
// ID name to help new users emphasize this point which is often overlooked
// when starting out with wxWidgets.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(XRCID("unload_resource_menuitem"), MyFrame::OnUnloadResourceMenuCommand)
EVT_MENU(XRCID("reload_resource_menuitem"), MyFrame::OnReloadResourceMenuCommand)
EVT_MENU(wxID_EXIT, MyFrame::OnExitToolOrMenuCommand)
@@ -93,7 +93,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(XRCID("variable_expansion_tool_or_menuitem"), MyFrame::OnVariableExpansionToolOrMenuCommand)
EVT_MENU(XRCID("recursive_load"), MyFrame::OnRecursiveLoad)
EVT_MENU(wxID_ABOUT, MyFrame::OnAboutToolOrMenuCommand)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
//-----------------------------------------------------------------------------
// Public methods

2
samples/xrc/myframe.h
View File

@@ -53,7 +53,7 @@ private:
void OnAnimationCtrlPlay(wxCommandEvent& event);
// Any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};