X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e111012a42a1bcb74c1ac07ff565ff4d7d1f9edf..cbc9145c04bd3ea0a228906c8363fa8f47e3acf9:/src/generic/tipdlg.cpp diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index e4a6660bc0..e8fbb90d0c 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: tipdlg.cpp +// Name: src/generic/tipdlg.cpp // Purpose: implementation of wxTipDialog // Author: Vadim Zeitlin // Modified by: @@ -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" @@ -41,11 +37,11 @@ #include "wx/statbmp.h" #include "wx/stattext.h" #include "wx/sizer.h" + #include "wx/settings.h" #endif // WX_PRECOMP #include "wx/statline.h" #include "wx/artprov.h" -#include "wx/settings.h" #include "wx/tipdlg.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; @@ -211,7 +210,6 @@ wxString wxFileTipProvider::GetTip() 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, @@ -219,10 +217,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, bool showAtStartup) : wxDialog(parent, wxID_ANY, _("Tip of the Day"), wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE -#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) - | wxRESIZE_BORDER -#endif + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ) { m_tipProvider = tipProvider; @@ -233,6 +228,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, // smart phones does not support or do not waste space for wxButtons #ifndef __SMARTPHONE__ wxButton *btnClose = new wxButton(this, wxID_CLOSE); + SetAffirmativeId(wxID_CLOSE); #endif m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup")); @@ -320,12 +316,10 @@ wxTipDialog::wxTipDialog(wxWindow *parent, SetSizer( topsizer ); -#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) topsizer->SetSizeHints( this ); topsizer->Fit( this ); Centre(wxBOTH | wxCENTER_FRAME); -#endif } // ---------------------------------------------------------------------------- @@ -349,4 +343,3 @@ bool wxShowTip(wxWindow *parent, } #endif // wxUSE_STARTUP_TIPS -