X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94f5392355df17ef8cd4884637a1ce71a07dd685..f61ed7ee42d7647663e48ac55062be0935bb07aa:/src/generic/tipdlg.cpp diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 0bb63154a9..f8b008b5f4 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -17,10 +17,6 @@ // 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" @@ -200,6 +196,9 @@ wxString wxFileTipProvider::GetTip() tip = tip.BeforeLast(wxT('\"')); // ...and replace escaped quotes tip.Replace(wxT("\\\""), wxT("\"")); + + // and translate it as requested + tip = wxGetTranslation(tip); } return tip; @@ -219,7 +218,11 @@ 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); @@ -241,9 +244,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent, wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know...")); - // Currently this causes the bottom half to be chopped off, - // so disable the large font -#ifndef __WXMSW__ if (!isPda) { wxFont font = text->GetFont(); @@ -251,15 +251,15 @@ wxTipDialog::wxTipDialog(wxWindow *parent, font.SetWeight(wxFONTWEIGHT_BOLD); text->SetFont(font); } -#endif 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 @@ -319,10 +319,12 @@ wxTipDialog::wxTipDialog(wxWindow *parent, SetSizer( topsizer ); +#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) topsizer->SetSizeHints( this ); topsizer->Fit( this ); Centre(wxBOTH | wxCENTER_FRAME); +#endif } // ----------------------------------------------------------------------------