RegisterAdditionalEditors() to work even if no wxPropertyGrids created, in sample moved editor registration before first CreateGrid() call to prevent crash, removed wxPG_USE_WXMODULE support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2069,6 +2069,13 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
|
||||
wxInitAllImageHandlers();
|
||||
#endif
|
||||
|
||||
// Register all editors (SpinCtrl etc.)
|
||||
m_pPropGridManager->RegisterAdditionalEditors();
|
||||
|
||||
// Register our sample custom editors
|
||||
m_pSampleMultiButtonEditor =
|
||||
wxPropertyGrid::RegisterEditorClass(new wxSampleMultiButtonEditor());
|
||||
|
||||
CreateGrid( // style
|
||||
wxPG_BOLD_MODIFIED |
|
||||
wxPG_SPLITTER_AUTO_CENTER |
|
||||
@@ -2088,13 +2095,6 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
|
||||
//| wxPG_EX_HELP_AS_TOOLTIPS
|
||||
);
|
||||
|
||||
// Register all editors (SpinCtrl etc.)
|
||||
m_pPropGridManager->RegisterAdditionalEditors();
|
||||
|
||||
// Register our sample custom editors
|
||||
m_pSampleMultiButtonEditor =
|
||||
wxPropertyGrid::RegisterEditorClass(new wxSampleMultiButtonEditor());
|
||||
|
||||
//
|
||||
// Create menubar
|
||||
wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
|
||||
|
Reference in New Issue
Block a user