From 9a35701127e3e8d2c7fb433d85c7b3954ccbfc9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 28 Sep 2004 17:29:37 +0000 Subject: [PATCH] Hardware defines spec. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/choicdgg.cpp | 3 ++- src/generic/dirdlgg.cpp | 4 ++-- src/generic/numdlgg.cpp | 3 ++- src/generic/progdlgg.cpp | 2 +- src/generic/textdlgg.cpp | 3 ++- src/generic/tipdlg.cpp | 16 ++++++++-------- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index 15e85bb44a..6e591c78cd 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -59,7 +59,7 @@ // --------------------------------------------------------------------------- /* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on + device we display on - take it from something like wxDesktopPolicy in the future */ #if defined(__SMARTPHONE__) @@ -278,6 +278,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent, topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) ); + // smart phones does not support or do not waste space for wxButtons #ifdef __SMARTPHONE__ SetRightMenu(wxID_CANCEL, _("Cancel")); diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index 72ede7a30c..8d27c3320b 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -58,7 +58,7 @@ static const int ID_GO_HOME = 1006; // --------------------------------------------------------------------------- /* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on + device we display on - take it from something like wxDesktopPolicy in the future */ #if defined(__SMARTPHONE__) @@ -100,7 +100,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - // Smartphone does not have buttons + // smart phones does not support or do not waste space for wxButtons #if defined(__SMARTPHONE__) wxMenu *dirMenu = new wxMenu; diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 3ac47c5bfb..d8a6f2ae5f 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -63,7 +63,7 @@ // --------------------------------------------------------------------------- /* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on + device we display on - take it from something like wxDesktopPolicy in the future */ #if defined(__SMARTPHONE__) @@ -125,6 +125,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, // add both topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); + // smart phones does not support or do not waste space for wxButtons #ifdef __SMARTPHONE__ SetRightMenu(wxID_CANCEL, _("Cancel")); diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index b8010a4813..5dbc359334 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -51,7 +51,7 @@ // --------------------------------------------------------------------------- /* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on + device we display on - take it from something like wxDesktopPolicy in the future */ #if defined(__SMARTPHONE__) diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index 961a20a63f..276e745fb6 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -57,7 +57,7 @@ static const int wxID_TEXT = 3000; // --------------------------------------------------------------------------- /* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on + device we display on - take it from something like wxDesktopPolicy in the future */ #if defined(__SMARTPHONE__) @@ -112,6 +112,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, #endif // wxUSE_VALIDATORS + // smart phones does not support or do not waste space for wxButtons #ifdef __SMARTPHONE__ SetRightMenu(wxID_CANCEL, _("Cancel")); diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index bd27ad9313..a3514774fd 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -60,7 +60,7 @@ static const int wxID_NEXT_TIP = 32000; // whatever // --------------------------------------------------------------------------- /* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on + device we display on - take it from something like wxDesktopPolicy in the future */ #if defined(__SMARTPHONE__) @@ -224,6 +224,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, // 1) create all controls in tab order + // smart phones does not support or do not waste space for wxButtons #ifndef __SMARTPHONE__ // FIXME: use stock wxID_CLOSE button here! wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("Close")); @@ -232,6 +233,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup")); m_checkbox->SetValue(showAtStartup); + // smart phones does not support or do not waste space for wxButtons #ifndef __SMARTPHONE__ wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip")); #endif @@ -288,7 +290,11 @@ wxTipDialog::wxTipDialog(wxWindow *parent, wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL ); bottom->Add( m_checkbox, 0, wxCENTER ); -#ifndef __SMARTPHONE__ + // smart phones does not support or do not waste space for wxButtons +#ifdef __SMARTPHONE__ + SetRightMenu(wxID_NEXT_TIP, _("Next")); + SetLeftMenu(wxID_CANCEL, _("Close")); +#else bottom->Add( 10,10,1 ); bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) ); bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) ); @@ -304,12 +310,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent, topsizer->Fit( this ); Centre(wxBOTH | wxCENTER_FRAME); - -#ifdef __SMARTPHONE__ - SetRightMenu(wxID_NEXT_TIP, _("Next")); - SetLeftMenu(wxID_CANCEL, _("Close")); -#endif - } // ---------------------------------------------------------------------------- -- 2.45.2