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

Shortcuts for avoiding #ifdef __SMARTPHONE__ conditions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-23 10:44:16 +00:00
parent da7a860276
commit 119727ad9e
4 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/generic/choicdgg.cpp
View File

@@ -251,10 +251,8 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
#ifdef __SMARTPHONE__
// 1) text message
topsizer->Add( CreateTextSizer( message ), 0, wxEXPAND, 0 );
topsizer->Add( CreateTextSizer( message ), 0, wxEXPAND, wxLARGESMALL(10,0) );
// 2) list box
m_listbox = new wxListBox( this, wxID_LISTBOX,
@@ -264,25 +262,14 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
if ( n > 0 )
m_listbox->SetSelection(0);
topsizer->Add( m_listbox, 1, wxEXPAND, 0 );
topsizer->Add( m_listbox, 1, wxEXPAND, wxLARGESMALL(15,0) );
#ifdef __SMARTPHONE__
SetRightMenu(wxID_CANCEL, _("Cancel"));
#else // __SMARTPHONE__/!__SMARTPHONE__
// 1) text message
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
// 2) list box
m_listbox = new wxListBox( this, wxID_LISTBOX,
wxDefaultPosition, wxDefaultSize,
n, choices,
styleLbox );
if ( n > 0 )
m_listbox->SetSelection(0);
topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
#if wxUSE_STATLINE
// 3) static line
topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
@@ -324,11 +311,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
#if defined(__SMARTPHONE__)
EVT_MENU(wxID_OK, wxSingleChoiceDialog::OnOK)
#else
EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
#endif
EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
END_EVENT_TABLE()