// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "tipdlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/dialog.h"
#include "wx/icon.h"
#include "wx/intl.h"
- #include "wx/settings.h"
#include "wx/textctrl.h"
#include "wx/statbmp.h"
#include "wx/stattext.h"
#include "wx/statline.h"
#include "wx/artprov.h"
+#include "wx/settings.h"
#include "wx/tipdlg.h"
// ---------------------------------------------------------------------------
/* 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__)
BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
+ EVT_BUTTON(wxID_CLOSE, wxTipDialog::OnCancel)
END_EVENT_TABLE()
wxTipDialog::wxTipDialog(wxWindow *parent,
bool showAtStartup)
: wxDialog(parent, wxID_ANY, _("Tip of the Day"),
wxDefaultPosition, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+ wxDEFAULT_DIALOG_STYLE
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+ | wxRESIZE_BORDER
+#endif
+ )
{
m_tipProvider = tipProvider;
+ bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
// 1) create all controls in tab order
+ // smart phones does not support or do not waste space for wxButtons
#ifndef __SMARTPHONE__
- wxButton *btnClose = new wxButton(this, wxID_CANCEL, wxSTOCK_CLOSE);
+ wxButton *btnClose = new wxButton(this, wxID_CLOSE);
#endif
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
wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
-#ifndef __SMARTPHONE__
- wxFont font = text->GetFont();
- font.SetPointSize(int(1.6 * font.GetPointSize()));
- font.SetWeight(wxFONTWEIGHT_BOLD);
- text->SetFont(font);
-#endif
+ if (!isPda)
+ {
+ wxFont font = text->GetFont();
+ font.SetPointSize(int(1.6 * font.GetPointSize()));
+ font.SetWeight(wxFONTWEIGHT_BOLD);
+ text->SetFont(font);
+ }
m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxSize(200, 160),
wxTE_MULTILINE |
wxTE_READONLY |
wxTE_NO_VSCROLL |
- wxTE_RICH | // a hack to get rid of vert scrollbar
- wxSUNKEN_BORDER);
+ wxTE_RICH2 | // a hack to get rid of vert scrollbar
+ wxDEFAULT_CONTROL_BORDER
+ );
#if defined(__WXMSW__)
m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
#endif
topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(10,0) );
wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
- bottom->Add( m_checkbox, 0, wxCENTER );
+ if (isPda)
+ topsizer->Add( m_checkbox, 0, wxCENTER|wxTOP );
+ else
+ bottom->Add( m_checkbox, 0, wxCENTER );
-#ifndef __SMARTPHONE__
- bottom->Add( 10,10,1 );
+ // smart phones does not support or do not waste space for wxButtons
+#ifdef __SMARTPHONE__
+ SetRightMenu(wxID_NEXT_TIP, _("Next"));
+ SetLeftMenu(wxID_CLOSE);
+#else
+ if (!isPda)
+ bottom->Add( 10,10,1 );
bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
#endif
- topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
+ if (isPda)
+ topsizer->Add( bottom, 0, wxCENTER | wxALL, 5 );
+ else
+ topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
SetTipText();
SetSizer( topsizer );
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
topsizer->SetSizeHints( this );
topsizer->Fit( this );
Centre(wxBOTH | wxCENTER_FRAME);
-
-#ifdef __SMARTPHONE__
- SetRightMenu(wxID_NEXT_TIP, _("Next"));
- SetLeftMenu(wxID_CANCEL, _("Close"));
#endif
-
}
// ----------------------------------------------------------------------------