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

Allow choosing the widget variant in the widgets sample.

Browse Source 
Add a menu for selecting wxWindowVariant to use for the widget.
This commit is contained in:
Vadim Zeitlin
2015-03-18 01:29:43 +01:00
parent 3c033d0c13
commit 6448fa074a
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
samples/widgets/widgets.cpp
View File

@@ -87,6 +87,11 @@ enum
Widgets_BorderDouble, Widgets_BorderDouble,
Widgets_BorderDefault, Widgets_BorderDefault,
Widgets_VariantNormal,
Widgets_VariantSmall,
Widgets_VariantMini,
Widgets_VariantLarge,
Widgets_LayoutDirection, Widgets_LayoutDirection,
Widgets_GlobalBusyCursor, Widgets_GlobalBusyCursor,
@@ -168,6 +173,7 @@ protected:
void OnSetFont(wxCommandEvent& event); void OnSetFont(wxCommandEvent& event);
void OnEnable(wxCommandEvent& event); void OnEnable(wxCommandEvent& event);
void OnSetBorder(wxCommandEvent& event); void OnSetBorder(wxCommandEvent& event);
void OnSetVariant(wxCommandEvent& event);
void OnToggleLayoutDirection(wxCommandEvent& event); void OnToggleLayoutDirection(wxCommandEvent& event);
@@ -295,6 +301,9 @@ wxBEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault, EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault,
WidgetsFrame::OnSetBorder) WidgetsFrame::OnSetBorder)
EVT_MENU_RANGE(Widgets_VariantNormal, Widgets_VariantLarge,
WidgetsFrame::OnSetVariant)
EVT_MENU(Widgets_LayoutDirection, WidgetsFrame::OnToggleLayoutDirection) EVT_MENU(Widgets_LayoutDirection, WidgetsFrame::OnToggleLayoutDirection)
EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor) EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor)
@@ -398,6 +407,13 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
menuBorders->AppendRadioItem(Widgets_BorderSunken, wxT("S&unken\tCtrl-Shift-5")); menuBorders->AppendRadioItem(Widgets_BorderSunken, wxT("S&unken\tCtrl-Shift-5"));
menuWidget->AppendSubMenu(menuBorders, wxT("Set &border")); menuWidget->AppendSubMenu(menuBorders, wxT("Set &border"));
wxMenu* const menuVariants = new wxMenu;
menuVariants->AppendRadioItem(Widgets_VariantMini, "&Mini\tCtrl-Shift-6");
menuVariants->AppendRadioItem(Widgets_VariantSmall, "&Small\tCtrl-Shift-7");
menuVariants->AppendRadioItem(Widgets_VariantNormal, "&Normal\tCtrl-Shift-8");
menuVariants->AppendRadioItem(Widgets_VariantLarge, "&Large\tCtrl-Shift-9");
menuWidget->AppendSubMenu(menuVariants, "Set &variant");
menuWidget->AppendSeparator(); menuWidget->AppendSeparator();
menuWidget->AppendCheckItem(Widgets_LayoutDirection, menuWidget->AppendCheckItem(Widgets_LayoutDirection,
"Toggle &layout direction\tCtrl-L"); "Toggle &layout direction\tCtrl-L");
@@ -431,6 +447,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
SetMenuBar(mbar); SetMenuBar(mbar);
mbar->Check(Widgets_Enable, true); mbar->Check(Widgets_Enable, true);
mbar->Check(Widgets_VariantNormal, true);
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
// create controls // create controls
@@ -892,6 +909,28 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
page->SetUpWidget(); page->SetUpWidget();
} }
void WidgetsFrame::OnSetVariant(wxCommandEvent& event)
{
wxWindowVariant v;
switch ( event.GetId() )
{
case Widgets_VariantSmall: v = wxWINDOW_VARIANT_SMALL; break;
case Widgets_VariantMini: v = wxWINDOW_VARIANT_MINI; break;
case Widgets_VariantLarge: v = wxWINDOW_VARIANT_LARGE; break;
default:
wxFAIL_MSG( "unknown window variant" );
wxFALLTHROUGH;
case Widgets_VariantNormal: v = wxWINDOW_VARIANT_NORMAL; break;
}
WidgetsPage::GetAttrs().m_variant = v;
CurrentPage()->SetUpWidget();
CurrentPage()->Layout();
}
void WidgetsFrame::OnToggleLayoutDirection(wxCommandEvent& event) void WidgetsFrame::OnToggleLayoutDirection(wxCommandEvent& event)
{ {
WidgetsPage::GetAttrs().m_dir = event.IsChecked() ? wxLayout_RightToLeft WidgetsPage::GetAttrs().m_dir = event.IsChecked() ? wxLayout_RightToLeft
@@ -1241,6 +1280,8 @@ void WidgetsPage::SetUpWidget()
(*it)->SetCursor(GetAttrs().m_cursor); (*it)->SetCursor(GetAttrs().m_cursor);
} }
(*it)->SetWindowVariant(GetAttrs().m_variant);
(*it)->Refresh(); (*it)->Refresh();
} }

2
samples/widgets/widgets.h
View File

@@ -99,6 +99,7 @@ struct WidgetAttributes
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
m_enabled = true; m_enabled = true;
m_dir = wxLayout_LeftToRight; m_dir = wxLayout_LeftToRight;
m_variant = wxWINDOW_VARIANT_NORMAL;
m_cursor = *wxSTANDARD_CURSOR; m_cursor = *wxSTANDARD_CURSOR;
m_defaultFlags = wxBORDER_DEFAULT; m_defaultFlags = wxBORDER_DEFAULT;
} }
@@ -114,6 +115,7 @@ struct WidgetAttributes
wxColour m_colPageBg; wxColour m_colPageBg;
bool m_enabled; bool m_enabled;
wxLayoutDirection m_dir; wxLayoutDirection m_dir;
wxWindowVariant m_variant;
wxCursor m_cursor; wxCursor m_cursor;
// the default flags, currently only contains border flags // the default flags, currently only contains border flags
int m_defaultFlags; int m_defaultFlags;