m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
m_checkbox->SetValue(showAtStartup);
m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
m_checkbox->SetValue(showAtStartup);
- wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,25) );
+ wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
#if defined(__WXMSW__)
text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
#else
text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
#endif
//
#if defined(__WXMSW__)
text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
#else
text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
#endif
//
m_text = new wxTextCtrl(this, -1, wxT(""),
wxDefaultPosition, wxSize(200, 160),
m_text = new wxTextCtrl(this, -1, wxT(""),
wxDefaultPosition, wxSize(200, 160),
#if defined(__WXMSW__)
m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
#else
m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
#endif
#if defined(__WXMSW__)
m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
#else
m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
#endif
-#if defined(__WXMSW__) || defined(__WXPM__)
- wxIcon icon("wxICON_TIP");
-#else
- #include "wx/generic/tip.xpm"
- wxIcon icon(tipIcon);
-#endif
+ wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
// 2) put them in boxes
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
// 2) put them in boxes
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
icon_text->Add( bmp, 0, wxCENTER );
icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 );
topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
icon_text->Add( bmp, 0, wxCENTER );
icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 );
topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
SetTipText();
topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
SetTipText();