Hardware defines spec.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-28 17:29:37 +00:00
parent 0c44ec9737
commit 9a35701127
6 changed files with 17 additions and 14 deletions

View File

@@ -59,7 +59,7 @@
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/* Macro for avoiding #ifdefs when value have to be different depending on size of /* 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__) #if defined(__SMARTPHONE__)
@@ -278,6 +278,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) ); 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__ #ifdef __SMARTPHONE__
SetRightMenu(wxID_CANCEL, _("Cancel")); SetRightMenu(wxID_CANCEL, _("Cancel"));

View File

@@ -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 /* 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__) #if defined(__SMARTPHONE__)
@@ -100,7 +100,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); 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__) #if defined(__SMARTPHONE__)
wxMenu *dirMenu = new wxMenu; wxMenu *dirMenu = new wxMenu;

View File

@@ -63,7 +63,7 @@
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/* Macro for avoiding #ifdefs when value have to be different depending on size of /* 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__) #if defined(__SMARTPHONE__)
@@ -125,6 +125,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
// add both // add both
topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
// smart phones does not support or do not waste space for wxButtons
#ifdef __SMARTPHONE__ #ifdef __SMARTPHONE__
SetRightMenu(wxID_CANCEL, _("Cancel")); SetRightMenu(wxID_CANCEL, _("Cancel"));

View File

@@ -51,7 +51,7 @@
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/* Macro for avoiding #ifdefs when value have to be different depending on size of /* 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__) #if defined(__SMARTPHONE__)

View File

@@ -57,7 +57,7 @@ static const int wxID_TEXT = 3000;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/* Macro for avoiding #ifdefs when value have to be different depending on size of /* 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__) #if defined(__SMARTPHONE__)
@@ -112,6 +112,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
#endif #endif
// wxUSE_VALIDATORS // wxUSE_VALIDATORS
// smart phones does not support or do not waste space for wxButtons
#ifdef __SMARTPHONE__ #ifdef __SMARTPHONE__
SetRightMenu(wxID_CANCEL, _("Cancel")); SetRightMenu(wxID_CANCEL, _("Cancel"));

View File

@@ -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 /* 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__) #if defined(__SMARTPHONE__)
@@ -224,6 +224,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
// 1) create all controls in tab order // 1) create all controls in tab order
// smart phones does not support or do not waste space for wxButtons
#ifndef __SMARTPHONE__ #ifndef __SMARTPHONE__
// FIXME: use stock wxID_CLOSE button here! // FIXME: use stock wxID_CLOSE button here!
wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("Close")); 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 = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
m_checkbox->SetValue(showAtStartup); m_checkbox->SetValue(showAtStartup);
// smart phones does not support or do not waste space for wxButtons
#ifndef __SMARTPHONE__ #ifndef __SMARTPHONE__
wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip")); wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
#endif #endif
@@ -288,7 +290,11 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
bottom->Add( m_checkbox, 0, wxCENTER ); 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( 10,10,1 );
bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) ); bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
bottom->Add( btnClose, 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 ); topsizer->Fit( this );
Centre(wxBOTH | wxCENTER_FRAME); Centre(wxBOTH | wxCENTER_FRAME);
#ifdef __SMARTPHONE__
SetRightMenu(wxID_NEXT_TIP, _("Next"));
SetLeftMenu(wxID_CANCEL, _("Close"));
#endif
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------