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

Allow really using wxHeaderCtrl in the grid sample

Browse Source 
The "Native" menu item actually only toggled drawing native-lookalike
labels, but didn't use wxHeaderCtrl as could be expected. Rename the
existing menu item to "Native-like" and add the new "Native" one which
really enables the use of wxHeaderCtrl.
This commit is contained in:
Vadim Zeitlin
2019-07-10 16:29:50 +02:00
parent e8712b3c56
commit 7d229dd695
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/grid/griddemo.cpp
View File

@@ -157,6 +157,7 @@ wxBEGIN_EVENT_TABLE( GridFrame, wxFrame )
EVT_MENU( ID_TOGGLEGRIDSIZING, GridFrame::ToggleGridSizing ) EVT_MENU( ID_TOGGLEGRIDSIZING, GridFrame::ToggleGridSizing )
EVT_MENU( ID_TOGGLEGRIDDRAGCELL, GridFrame::ToggleGridDragCell ) EVT_MENU( ID_TOGGLEGRIDDRAGCELL, GridFrame::ToggleGridDragCell )
EVT_MENU( ID_COLNATIVEHEADER, GridFrame::SetNativeColHeader ) EVT_MENU( ID_COLNATIVEHEADER, GridFrame::SetNativeColHeader )
EVT_MENU( ID_COLNATIVELABELS, GridFrame::SetNativeColLabels )
EVT_MENU( ID_COLDEFAULTHEADER, GridFrame::SetDefaultColHeader ) EVT_MENU( ID_COLDEFAULTHEADER, GridFrame::SetDefaultColHeader )
EVT_MENU( ID_COLCUSTOMHEADER, GridFrame::SetCustomColHeader ) EVT_MENU( ID_COLCUSTOMHEADER, GridFrame::SetCustomColHeader )
EVT_MENU_RANGE( ID_TAB_STOP, ID_TAB_LEAVE, GridFrame::SetTabBehaviour ) EVT_MENU_RANGE( ID_TAB_STOP, ID_TAB_LEAVE, GridFrame::SetTabBehaviour )
@@ -343,6 +344,7 @@ GridFrame::GridFrame()
colHeaderMenu->AppendRadioItem( ID_COLDEFAULTHEADER, "&Default" ); colHeaderMenu->AppendRadioItem( ID_COLDEFAULTHEADER, "&Default" );
colHeaderMenu->AppendRadioItem( ID_COLNATIVEHEADER, "&Native" ); colHeaderMenu->AppendRadioItem( ID_COLNATIVEHEADER, "&Native" );
colHeaderMenu->AppendRadioItem( ID_COLNATIVELABELS, "Native-&like" );
colHeaderMenu->AppendRadioItem( ID_COLCUSTOMHEADER, "&Custom" ); colHeaderMenu->AppendRadioItem( ID_COLCUSTOMHEADER, "&Custom" );
wxMenu *tabBehaviourMenu = new wxMenu; wxMenu *tabBehaviourMenu = new wxMenu;
@@ -704,6 +706,15 @@ void GridFrame::SetNativeColHeader( wxCommandEvent& WXUNUSED(ev) )
CustomColumnHeadersProvider* provider = CustomColumnHeadersProvider* provider =
static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider()); static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider());
provider->UseCustomColHeaders(false); provider->UseCustomColHeaders(false);
grid->UseNativeColHeader(true);
}
void GridFrame::SetNativeColLabels( wxCommandEvent& WXUNUSED(ev) )
{
CustomColumnHeadersProvider* provider =
static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider());
provider->UseCustomColHeaders(false);
grid->UseNativeColHeader(false);
grid->SetUseNativeColLabels(true); grid->SetUseNativeColLabels(true);
} }
@@ -712,6 +723,7 @@ void GridFrame::SetCustomColHeader( wxCommandEvent& WXUNUSED(ev) )
CustomColumnHeadersProvider* provider = CustomColumnHeadersProvider* provider =
static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider()); static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider());
provider->UseCustomColHeaders(true); provider->UseCustomColHeaders(true);
grid->UseNativeColHeader(false);
grid->SetUseNativeColLabels(false); grid->SetUseNativeColLabels(false);
} }
@@ -720,6 +732,7 @@ void GridFrame::SetDefaultColHeader( wxCommandEvent& WXUNUSED(ev) )
CustomColumnHeadersProvider* provider = CustomColumnHeadersProvider* provider =
static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider()); static_cast<CustomColumnHeadersProvider*>(grid->GetTable()->GetAttrProvider());
provider->UseCustomColHeaders(false); provider->UseCustomColHeaders(false);
grid->UseNativeColHeader(false);
grid->SetUseNativeColLabels(false); grid->SetUseNativeColLabels(false);
} }

2
samples/grid/griddemo.h
View File

@@ -39,6 +39,7 @@ class GridFrame : public wxFrame
void ToggleGridSizing( wxCommandEvent& ); void ToggleGridSizing( wxCommandEvent& );
void ToggleGridDragCell ( wxCommandEvent& ); void ToggleGridDragCell ( wxCommandEvent& );
void SetNativeColHeader ( wxCommandEvent& ); void SetNativeColHeader ( wxCommandEvent& );
void SetNativeColLabels ( wxCommandEvent& );
void SetCustomColHeader( wxCommandEvent& ); void SetCustomColHeader( wxCommandEvent& );
void SetDefaultColHeader( wxCommandEvent& ); void SetDefaultColHeader( wxCommandEvent& );
void SetTabBehaviour( wxCommandEvent& ); void SetTabBehaviour( wxCommandEvent& );
@@ -162,6 +163,7 @@ public:
ID_CORNERLABELORIENTATION, ID_CORNERLABELORIENTATION,
ID_COLDEFAULTHEADER, ID_COLDEFAULTHEADER,
ID_COLNATIVEHEADER, ID_COLNATIVEHEADER,
ID_COLNATIVELABELS,
ID_COLCUSTOMHEADER, ID_COLCUSTOMHEADER,
ID_TAB_STOP, ID_TAB_STOP,
ID_TAB_WRAP, ID_TAB_WRAP,