AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Exclude header demonstration in propgrid sample when wxUSE_HEADERCTRL == 0.

Browse Source 
Code responsible for header demonstration should be excluded in this case because header management functions in wxPropertyGridManager depend on wxHeaderCtrl (via wxPGHeaderCtrl) and if it is not present then respective methods in wxPG are not exposed.
This commit is contained in:
Artur Wieczorek 2015-05-31 19:18:36 +02:00
parent 7d6f71bc5e
commit 9c9f80223b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/propgrid/propgrid.cpp
View File

@ -430,7 +430,9 @@ enum
ID_RUNMINIMAL, ID_RUNMINIMAL,
ID_ENABLELABELEDITING, ID_ENABLELABELEDITING,
ID_VETOCOLDRAG, ID_VETOCOLDRAG,
#if wxUSE_HEADERCTRL
ID_SHOWHEADER, ID_SHOWHEADER,
#endif
ID_ONEXTENDEDKEYNAV, ID_ONEXTENDEDKEYNAV,
ID_SHOWPOPUP, ID_SHOWPOPUP,
ID_POPUPGRID ID_POPUPGRID
@ -505,7 +507,9 @@ wxBEGIN_EVENT_TABLE(FormMain, wxFrame)
EVT_MENU( ID_CLEARMODIF, FormMain::OnClearModifyStatusClick ) EVT_MENU( ID_CLEARMODIF, FormMain::OnClearModifyStatusClick )
EVT_MENU( ID_FREEZE, FormMain::OnFreezeClick ) EVT_MENU( ID_FREEZE, FormMain::OnFreezeClick )
EVT_MENU( ID_ENABLELABELEDITING, FormMain::OnEnableLabelEditing ) EVT_MENU( ID_ENABLELABELEDITING, FormMain::OnEnableLabelEditing )
#if wxUSE_HEADERCTRL
EVT_MENU( ID_SHOWHEADER, FormMain::OnShowHeader ) EVT_MENU( ID_SHOWHEADER, FormMain::OnShowHeader )
#endif
EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList ) EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList )
EVT_MENU( ID_COLOURSCHEME1, FormMain::OnColourScheme ) EVT_MENU( ID_COLOURSCHEME1, FormMain::OnColourScheme )
@ -2093,9 +2097,11 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
wxT("Select window style flags used by the grid.")); wxT("Select window style flags used by the grid."));
menuTry->Append(ID_ENABLELABELEDITING, wxT("Enable label editing"), menuTry->Append(ID_ENABLELABELEDITING, wxT("Enable label editing"),
wxT("This calls wxPropertyGrid::MakeColumnEditable(0)")); wxT("This calls wxPropertyGrid::MakeColumnEditable(0)"));
#if wxUSE_HEADERCTRL
menuTry->AppendCheckItem(ID_SHOWHEADER, menuTry->AppendCheckItem(ID_SHOWHEADER,
wxT("Enable header"), wxT("Enable header"),
wxT("This calls wxPropertyGridManager::ShowHeader()")); wxT("This calls wxPropertyGridManager::ShowHeader()"));
#endif // wxUSE_HEADERCTRL
menuTry->AppendSeparator(); menuTry->AppendSeparator();
menuTry->AppendRadioItem( ID_COLOURSCHEME1, wxT("Standard Colour Scheme") ); menuTry->AppendRadioItem( ID_COLOURSCHEME1, wxT("Standard Colour Scheme") );
menuTry->AppendRadioItem( ID_COLOURSCHEME2, wxT("White Colour Scheme") ); menuTry->AppendRadioItem( ID_COLOURSCHEME2, wxT("White Colour Scheme") );
@ -2685,11 +2691,13 @@ void FormMain::OnEnableLabelEditing( wxCommandEvent& WXUNUSED(event) )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#if wxUSE_HEADERCTRL
void FormMain::OnShowHeader( wxCommandEvent& event ) void FormMain::OnShowHeader( wxCommandEvent& event )
{ {
m_pPropGridManager->ShowHeader(event.IsChecked()); m_pPropGridManager->ShowHeader(event.IsChecked());
m_pPropGridManager->SetColumnTitle(2, wxT("Units")); m_pPropGridManager->SetColumnTitle(2, wxT("Units"));
} }
#endif // wxUSE_HEADERCTRL
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

2
samples/propgrid/propgrid.h
View File

@ -191,7 +191,9 @@ public:
void OnClearModifyStatusClick( wxCommandEvent& event ); void OnClearModifyStatusClick( wxCommandEvent& event );
void OnFreezeClick( wxCommandEvent& event ); void OnFreezeClick( wxCommandEvent& event );
void OnEnableLabelEditing( wxCommandEvent& event ); void OnEnableLabelEditing( wxCommandEvent& event );
#if wxUSE_HEADERCTRL
void OnShowHeader( wxCommandEvent& event ); void OnShowHeader( wxCommandEvent& event );
#endif
void OnDumpList( wxCommandEvent& event ); void OnDumpList( wxCommandEvent& event );
void OnCatColours( wxCommandEvent& event ); void OnCatColours( wxCommandEvent& event );
void OnSetColumns( wxCommandEvent& event ); void OnSetColumns( wxCommandEvent& event );