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

wxUniv port mentioned instead of native, wxButton ports listed, minor placement fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-18 15:36:44 +00:00
parent ec8a8e042e
commit d8d07a796f
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/widgets/button.cpp
View File

@@ -155,7 +155,18 @@ END_EVENT_TABLE()
// ============================================================================ // ============================================================================
IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"),
(int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS) #if defined(__WXUNIVERSAL__)
UNIVERSAL_CTRLS
#elif defined(__WXMSW__) || \
defined(__WXMOTIF__) || \
defined(__WXGTK__) || \
defined(__WXMAC__) || \
defined(__WXPM__) || \
defined(__WXPALMOS__)
NATIVE_CTRLS
#else
GENERIC_CTRLS
#endif
); );
ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book, ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,

14
samples/widgets/datepick.cpp
View File

@@ -137,17 +137,17 @@ DatePickerWidgetsPage::DatePickerWidgetsPage(WidgetsBookCtrl *book,
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL); wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Day"), DatePickerPage_Day , &m_day ), sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Day:"), DatePickerPage_Day , &m_day ),
wxALL | wxALIGN_LEFT , 5 ); 0, wxALL | wxALIGN_RIGHT , 5 );
sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Month"), DatePickerPage_Month , &m_month ), sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Month:"), DatePickerPage_Month , &m_month ),
wxALL | wxALIGN_LEFT , 5 ); 0, wxALL | wxALIGN_RIGHT , 5 );
sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Year"), DatePickerPage_Year , &m_year ), sizerLeft->Add( CreateSizerWithTextAndLabel( wxT("&Year:"), DatePickerPage_Year , &m_year ),
wxALL | wxALIGN_LEFT , 5 ); 0, wxALL | wxALIGN_RIGHT , 5 );
sizerLeft->Add( new wxButton( this, wxID_ANY, wxT("&Set date") ), sizerLeft->Add( new wxButton( this, wxID_ANY, wxT("&Set date") ),
wxALL , 5 ); 0, wxALL , 5 );
// right pane // right pane
wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);

4
samples/widgets/widgets.cpp
View File

@@ -85,7 +85,11 @@ enum
}; };
const wxChar *WidgetsCategories[MAX_PAGES] = { const wxChar *WidgetsCategories[MAX_PAGES] = {
#if defined(__WXUNIVERSAL__)
wxT("Universal"),
#else
wxT("Native"), wxT("Native"),
#endif
wxT("Generic"), wxT("Generic"),
wxT("Pickers"), wxT("Pickers"),
wxT("Comboboxes"), wxT("Comboboxes"),

4
samples/widgets/widgets.h
View File

@@ -47,7 +47,10 @@ class WidgetsPageInfo;
// INTRODUCING NEW PAGES DON'T FORGET TO ADD ENTRIES TO 'WidgetsCategories' // INTRODUCING NEW PAGES DON'T FORGET TO ADD ENTRIES TO 'WidgetsCategories'
enum enum
{ {
// On wxUniversal-based build (wxX11, wxMGL, wxMSWUniv, wxGTKUniv, etc.)
// 'native' means 'made with wxUniv port renderer'
NATIVE_PAGE = 0, NATIVE_PAGE = 0,
UNIVERSAL_PAGE = NATIVE_PAGE,
GENERIC_PAGE, GENERIC_PAGE,
PICKER_PAGE, PICKER_PAGE,
COMBO_PAGE, COMBO_PAGE,
@@ -61,6 +64,7 @@ enum
enum enum
{ {
NATIVE_CTRLS = 1 << NATIVE_PAGE, NATIVE_CTRLS = 1 << NATIVE_PAGE,
UNIVERSAL_CTRLS = NATIVE_CTRLS,
GENERIC_CTRLS = 1 << GENERIC_PAGE, GENERIC_CTRLS = 1 << GENERIC_PAGE,
PICKER_CTRLS = 1 << PICKER_PAGE, PICKER_CTRLS = 1 << PICKER_PAGE,
COMBO_CTRLS = 1 << COMBO_PAGE, COMBO_CTRLS = 1 << COMBO_PAGE,