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

WinCE adaptations

Browse Source 
Simplified comment


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-02 17:35:59 +00:00
parent 03775239e2
commit 0906c58d05
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/propdlg.cpp
View File

@@ -43,6 +43,9 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
const wxPoint& pos, const wxSize& sz, long style, const wxPoint& pos, const wxSize& sz, long style,
const wxString& name) const wxString& name)
{ {
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
style = wxNO_BORDER;
#endif
if (!wxDialog::Create(parent, id, title, pos, sz, style, name)) if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
return false; return false;
@@ -53,7 +56,7 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
m_innerSizer = new wxBoxSizer( wxVERTICAL ); m_innerSizer = new wxBoxSizer( wxVERTICAL );
int extraSpace = 5; int extraSpace = 5;
#ifdef __WXWINCE__ #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
extraSpace=0; extraSpace=0;
#endif #endif
topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace); topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
@@ -73,7 +76,7 @@ void wxPropertySheetDialog::Init()
// Layout the dialog, to be called after pages have been created // Layout the dialog, to be called after pages have been created
void wxPropertySheetDialog::LayoutDialog() void wxPropertySheetDialog::LayoutDialog()
{ {
#ifndef __WXWINCE__ #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
GetSizer()->Fit(this); GetSizer()->Fit(this);
Centre(wxBOTH); Centre(wxBOTH);
#endif #endif
@@ -83,12 +86,13 @@ void wxPropertySheetDialog::LayoutDialog()
void wxPropertySheetDialog::CreateButtons(int flags) void wxPropertySheetDialog::CreateButtons(int flags)
{ {
#if defined(__SMARTPHONE__) #if defined(__SMARTPHONE__)
// TODO: if flags turns more buttons then make right menu from ID // TODO: create a right-click menu with all the other IDs available.
// to real menu with all the other IDs available. Perhaps that could be // Perhaps that could be embedded in CreateButtonSizer() directly.
// embedded in CreateButtonSizer() directly.
SetRightMenu(wxID_CANCEL); SetRightMenu(wxID_CANCEL);
SetLeftMenu(wxID_OK); SetLeftMenu(wxID_OK);
#elif !defined(__WXWINCE__) #elif defined(__POCKETPC__)
// Do nothing
#else
wxSizer* sizer = CreateButtonSizer(flags); wxSizer* sizer = CreateButtonSizer(flags);
m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5); m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
#endif #endif
@@ -112,7 +116,8 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
#if defined(__POCKETPC__) && wxUSE_NOTEBOOK #if defined(__POCKETPC__) && wxUSE_NOTEBOOK
// The book control has to be sized larger than the dialog because of a border bug // The book control has to be sized larger than the dialog because of a border bug
// in WinCE // in WinCE
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 ); int borderSize = -2;
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
#else #else
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
#endif #endif