Only use wxFORCE_LINK_MODULE() in mediaplayer sample in static build.

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

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index d4918e3c0c969543f6691f9f26e1b21720275a35..87a9ee5380da36bd66fa887f8fa1ca7fb1352840 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     05/25/01
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,10 +37,10 @@
     #include "wx/radiobox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fdrepdlg.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -87,12 +87,11 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
                                         const wxString& title,
                                         int style)
 {
+    parent = GetParentForModalDialog(parent, style);
+
     if ( !wxDialog::Create(parent, wxID_ANY, title,
                            wxDefaultPosition, wxDefaultSize,
-                           wxDEFAULT_DIALOG_STYLE
-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
-                           | wxRESIZE_BORDER
-#endif                           
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
                            | style) )
     {
         return false;
@@ -101,10 +100,10 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     SetData(data);
 
     wxCHECK_MSG( m_FindReplaceData, false,
-                 _T("can't create dialog without data") );
+                 wxT("can't create dialog without data") );
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-    
+
     wxBoxSizer *leftsizer = new wxBoxSizer( wxVERTICAL );
 
     // 3 columns because there is a spacer in the middle
@@ -158,7 +157,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
         rbStyle = wxRA_SPECIFY_ROWS;
     else
         rbStyle = wxRA_SPECIFY_COLS;
-    
+
     m_radioDir = new wxRadioBox(this, wxID_ANY, _("Search direction"),
                                 wxDefaultPosition, wxDefaultSize,
                                 WXSIZEOF(searchDirections), searchDirections,
@@ -212,12 +211,10 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     SetAutoLayout( true );
     SetSizer( topsizer );
 
-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
-#endif
 
     m_textFind->SetFocus();
 
@@ -294,4 +291,3 @@ void wxGenericFindReplaceDialog::OnCloseWindow(wxCloseEvent &)
 }
 
 #endif // wxUSE_FINDREPLDLG
-