compilation fix after wxFont changes (closes #10152)

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

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index 716aaf5aefbf82c264cc7000a655b22296993692..976ade0dec51b119d592e102c02b69b538938d16 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "genericfdrepdlg.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -41,10 +37,10 @@
     #include "wx/radiobox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/radiobox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"

+    #include "wx/settings.h"

 #endif
 
 #include "wx/fdrepdlg.h"
 #endif
 
 #include "wx/fdrepdlg.h"

-#include "wx/settings.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -91,12 +87,11 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
                                         const wxString& title,
                                         int style)
 {
                                         const wxString& title,
                                         int style)
 {

+    parent = GetParentForModalDialog(parent);
+

     if ( !wxDialog::Create(parent, wxID_ANY, title,
                            wxDefaultPosition, wxDefaultSize,
     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;
                            | style) )
     {
         return false;


@@ -108,7 +103,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
                  _T("can't create dialog without data") );
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
                  _T("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
     wxBoxSizer *leftsizer = new wxBoxSizer( wxVERTICAL );
 
     // 3 columns because there is a spacer in the middle


@@ -162,7 +157,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
         rbStyle = wxRA_SPECIFY_ROWS;
     else
         rbStyle = wxRA_SPECIFY_COLS;
         rbStyle = wxRA_SPECIFY_ROWS;
     else
         rbStyle = wxRA_SPECIFY_COLS;

-    
+

     m_radioDir = new wxRadioBox(this, wxID_ANY, _("Search direction"),
                                 wxDefaultPosition, wxDefaultSize,
                                 WXSIZEOF(searchDirections), searchDirections,
     m_radioDir = new wxRadioBox(this, wxID_ANY, _("Search direction"),
                                 wxDefaultPosition, wxDefaultSize,
                                 WXSIZEOF(searchDirections), searchDirections,


@@ -174,7 +169,9 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
 
     wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL);
 
 
     wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL);
 

-    bttnsizer->Add(new wxButton(this, wxID_FIND), 0, wxALL, 3);
+    wxButton* btn = new wxButton(this, wxID_FIND);
+    btn->SetDefault();
+    bttnsizer->Add(btn, 0, wxALL, 3);

 
     bttnsizer->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 3);
 
 
     bttnsizer->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 3);
 


@@ -214,12 +211,10 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     SetAutoLayout( true );
     SetSizer( topsizer );
 

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

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

-#endif

 
     m_textFind->SetFocus();
 
 
     m_textFind->SetFocus();
 


@@ -296,4 +291,3 @@ void wxGenericFindReplaceDialog::OnCloseWindow(wxCloseEvent &)
 }
 
 #endif // wxUSE_FINDREPLDLG
 }
 
 #endif // wxUSE_FINDREPLDLG

-