// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "tipdlg.h"
#endif
// an implementation which takes the tips from the text file - each line
// represents a tip
-class WXDLLEXPORT wxFileTipProvider : public wxTipProvider
+class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
{
public:
wxFileTipProvider(const wxString& filename, size_t currentTip);
#ifdef __WIN32__
// TODO an implementation which takes the tips from the given registry key
-class WXDLLEXPORT wxRegTipProvider : public wxTipProvider
+class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider
{
public:
wxRegTipProvider(const wxString& keyname);
#endif // __WIN32__
// the dialog we show in wxShowTip()
-class WXDLLEXPORT wxTipDialog : public wxDialog
+class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog
{
public:
wxTipDialog(wxWindow *parent,
wxTipProvider *tipProvider,
bool showAtStartup);
- // the tip dialog has "Show tips on startup" checkbox - return TRUE if it
+ // the tip dialog has "Show tips on startup" checkbox - return true if it
// was checked (or wasn't unchecked)
bool ShowTipsOnStartup() const { return m_checkbox->GetValue(); }
{
return _("Tips not available, sorry!");
}
-
+
wxString tip;
// Comments start with a # symbol.
// Loop reading lines until get the first one that isn't a comment.
- // The max number of loop executions is the number of lines in the
- // textfile so that can't go into an eternal loop in the [oddball]
- // case of a comment-only tips file, or the developer has vetoed
+ // The max number of loop executions is the number of lines in the
+ // textfile so that can't go into an eternal loop in the [oddball]
+ // case of a comment-only tips file, or the developer has vetoed
// them all via PreprecessTip().
for ( size_t i=0; i < count; i++ )
- {
- // The current tip may be at the last line of the textfile, (or
- // past it, if the number of lines in the textfile changed, such
+ {
+ // The current tip may be at the last line of the textfile, (or
+ // past it, if the number of lines in the textfile changed, such
// as changing to a different textfile, with less tips). So check
// to see at last line of text file, (or past it)...
if ( m_currentTip >= count )
{
// .. and if so, wrap back to line 0.
m_currentTip = 0;
- }
-
+ }
+
// Read the tip, and increment the current tip counter.
tip = m_textfile.GetLine(m_currentTip++);
-
- // Allow a derived class's overrided virtual to modify the tip
+
+ // Allow a derived class's overrided virtual to modify the tip
// now if so desired.
- tip = PreprocessTip(tip);
-
+ tip = PreprocessTip(tip);
+
// Break if tip isn't a comment, and isn't an empty string
// (or only stray space characters).
if ( !tip.StartsWith(wxT("#")) && (tip.Trim() != wxEmptyString) )
break;
}
}
-
+
// If tip starts with '_(', then it is a gettext string of format
// _("My \"global\" tip text") so first strip off the leading '_("'...
if ( tip.StartsWith(wxT("_(\"" ), &tip))
{
//...and strip off the trailing '")'...
tip = tip.BeforeLast(wxT('\"'));
- // ...and replace escaped quotes
- tip.Replace(wxT("\\\""), wxT("\""));
- }
-
- return tip;
+ // ...and replace escaped quotes
+ tip.Replace(wxT("\\\""), wxT("\""));
+ }
+
+ return tip;
}
// ----------------------------------------------------------------------------
wxTipDialog::wxTipDialog(wxWindow *parent,
wxTipProvider *tipProvider,
bool showAtStartup)
- : wxDialog(parent, -1, _("Tip of the Day"),
+ : wxDialog(parent, wxID_ANY, _("Tip of the Day"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
- m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
+ m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
m_checkbox->SetValue(showAtStartup);
wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
- wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
-#if defined(__WXMSW__) || defined(__WXPM__)
- text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
-#else
- text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
-#endif
-//
-// text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+ wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
+
+ wxFont font = text->GetFont();
+ font.SetPointSize(int(1.6 * font.GetPointSize()));
+ font.SetWeight(wxFONTWEIGHT_BOLD);
+
+ text->SetFont(font);
- m_text = new wxTextCtrl(this, -1, wxT(""),
+ m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxSize(200, 160),
wxTE_MULTILINE |
wxTE_READONLY |
wxSUNKEN_BORDER);
#if defined(__WXMSW__)
m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
-#else
- m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));
#endif
//#if defined(__WXPM__)
// vBitmap.SetId(wxICON_TIP); // OS/2 specific bitmap method--OS/2 wxBitmaps all have an ID.
// // and for StatBmp's under OS/2 it MUST be a valid resource ID.
//
-// wxStaticBitmap* bmp = new wxStaticBitmap(this, -1, vBitmap);
+// wxStaticBitmap* bmp = new wxStaticBitmap(this, wxID_ANY, vBitmap);
//
//#else
wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
- wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
+ wxStaticBitmap *bmp = new wxStaticBitmap(this, wxID_ANY, icon);
//#endif
SetTipText();
- SetAutoLayout(TRUE);
SetSizer( topsizer );
topsizer->SetSizeHints( this );
projects / wxWidgets.git / blobdiff