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

Minor corrections to pickers presentation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-01 11:01:17 +00:00
parent 7c808858c9
commit 8b7fdb77c2
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/widgets/picker.cpp
View File

@@ -183,14 +183,19 @@ END_EVENT_TABLE()
// implementation // implementation
// ============================================================================ // ============================================================================
IMPLEMENT_WIDGETS_PAGE(PickerWidgetsPage, _T("Pickers"), PICKER_CTRLS); #if defined(__WXGTK24__)
#define FAMILY_CTRLS NATIVE_CTRLS
#else
#define FAMILY_CTRLS GENERIC_CTRLS
#endif
IMPLEMENT_WIDGETS_PAGE(PickerWidgetsPage, _T("Pickers"),
PICKER_CTRLS | FAMILY_CTRLS);
PickerWidgetsPage::PickerWidgetsPage(WidgetsBookCtrl *book, PickerWidgetsPage::PickerWidgetsPage(WidgetsBookCtrl *book,
wxImageList *imaglist) wxImageList *imaglist)
: WidgetsPage(book, imaglist, picker_xpm) : WidgetsPage(book, imaglist, picker_xpm)
{ {
imaglist->Add(wxBitmap(picker_xpm));
// left pane // left pane
wxSizer *boxleft = new wxBoxSizer(wxVERTICAL); wxSizer *boxleft = new wxBoxSizer(wxVERTICAL);
@@ -264,22 +269,22 @@ PickerWidgetsPage::PickerWidgetsPage(WidgetsBookCtrl *book,
m_sizerPicker = new wxFlexGridSizer(nrows, 2, 0, 0); // 4 rows x 2 columns m_sizerPicker = new wxFlexGridSizer(nrows, 2, 0, 0); // 4 rows x 2 columns
#if wxUSE_COLOURPICKERCTRL #if wxUSE_COLOURPICKERCTRL
m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxColourPickerCtrl:")), m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxColourPickerCtrl:")),
0, wxALIGN_CENTER | wxALL, 5); 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5);
m_sizerPicker->Add(m_clrPicker, 1, wxGROW | wxALL, 5); m_sizerPicker->Add(m_clrPicker, 1, wxGROW | wxALL, 5);
#endif #endif
#if wxUSE_FILEPICKERCTRL #if wxUSE_FILEPICKERCTRL
m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxFilePickerCtrl:")), m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxFilePickerCtrl:")),
0, wxALIGN_CENTER | wxALL, 5); 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5);
m_sizerPicker->Add(m_filePicker, 1, wxGROW | wxALL, 5); m_sizerPicker->Add(m_filePicker, 1, wxGROW | wxALL, 5);
#endif #endif
#if wxUSE_DIRPICKERCTRL #if wxUSE_DIRPICKERCTRL
m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxDirPickerCtrl:")), m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxDirPickerCtrl:")),
0, wxALIGN_CENTER | wxALL, 5); 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5);
m_sizerPicker->Add(m_dirPicker, 1, wxGROW | wxALL, 5); m_sizerPicker->Add(m_dirPicker, 1, wxGROW | wxALL, 5);
#endif #endif
#if wxUSE_FONTPICKERCTRL #if wxUSE_FONTPICKERCTRL
m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxFontPickerCtrl:")), m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxFontPickerCtrl:")),
0, wxALIGN_CENTER | wxALL, 5); 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5);
m_sizerPicker->Add(m_fontPicker, 1, wxGROW | wxALL, 5); m_sizerPicker->Add(m_fontPicker, 1, wxGROW | wxALL, 5);
#endif #endif