initialize GdkColor so code which incorrectly accesses it will work as well as it...

[wxWidgets.git] / src / generic / tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index e4a6660bc0c4316c09923966cc078eb1a3429b53..599d310fe967fd55b3d20176cf8d4fa3122082a9 100644 (file)
--- 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:
 // Purpose:     implementation of wxTipDialog
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // 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/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"
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"
 #include "wx/artprov.h"

-#include "wx/settings.h"

 
 #include "wx/tipdlg.h"
 
 
 #include "wx/tipdlg.h"
 


@@ -200,6 +196,9 @@ wxString wxFileTipProvider::GetTip()
         tip = tip.BeforeLast(wxT('\"'));
         // ...and replace escaped quotes
         tip.Replace(wxT("\\\""), wxT("\""));
         tip = tip.BeforeLast(wxT('\"'));
         // ...and replace escaped quotes
         tip.Replace(wxT("\\\""), wxT("\""));

+
+        // and translate it as requested
+        tip = wxGetTranslation(tip);

     }
 
     return tip;
     }
 
     return tip;


@@ -219,10 +218,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                          bool showAtStartup)
            : wxDialog(parent, wxID_ANY, _("Tip of the Day"),
                       wxDefaultPosition, wxDefaultSize,
                          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;
                       )
 {
     m_tipProvider = tipProvider;


@@ -320,12 +316,10 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     SetSizer( topsizer );
 
 
     SetSizer( topsizer );
 

-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);

-#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -349,4 +343,3 @@ bool wxShowTip(wxWindow *parent,
 }
 
 #endif // wxUSE_STARTUP_TIPS
 }
 
 #endif // wxUSE_STARTUP_TIPS

-