X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..90f3fe56ee58fec86d7f938f9c630c0745f0a2dc:/src/generic/tipdlg.cpp?ds=sidebyside diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 7b06f357a1..33a019fc11 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -84,7 +84,7 @@ public: // Empty implementation for now to keep the linker happy wxString wxRegTipProvider::GetTip() { - return ""; + return wxEmptyString; } #endif // __WIN32__ @@ -166,32 +166,45 @@ wxTipDialog::wxTipDialog(wxWindow *parent, m_tipProvider = tipProvider; // 1) create all controls in tab order - + wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close")); - + m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup")); m_checkbox->SetValue(showAtStartup); - - wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next")); - wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,25) ); + 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__) text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD)); #else text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD)); #endif // -// text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)); +// text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - m_text = new wxTextCtrl(this, -1, T(""), + m_text = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(200, 160), - wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER); + wxTE_MULTILINE | + wxTE_READONLY | + wxTE_RICH | // a hack to get rid of vert scrollbar + wxSUNKEN_BORDER); +#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 + // XPM hack: make the arrays const + #define static static const + #include "wx/generic/tip.xpm" + + #undef static + wxIcon icon(tipIcon); #endif wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon); @@ -199,12 +212,12 @@ wxTipDialog::wxTipDialog(wxWindow *parent, // 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 ); - + topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL ); @@ -215,10 +228,10 @@ wxTipDialog::wxTipDialog(wxWindow *parent, topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 ); SetTipText(); - + SetAutoLayout(TRUE); SetSizer( topsizer ); - + topsizer->SetSizeHints( this ); topsizer->Fit( this );