updates from Adrián González Alba

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index f8b008b5f48f1ab18bc7883a445efdf05d9a99d8..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:
@@ -37,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"
 
@@ -218,10 +218,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;
@@ -319,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
 }
 
 // ----------------------------------------------------------------------------
@@ -348,4 +343,3 @@ bool wxShowTip(wxWindow *parent,
 }
 
 #endif // wxUSE_STARTUP_TIPS
-