Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index 3c2b2a0465cd2ab0cb2bb3d52f97fbd97c642856..1d14141be10b5cde9d8008bcd517d91fe61fc9f3 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -44,6 +44,7 @@
 #endif
 
 #include "wx/fdrepdlg.h"
 #endif
 
 #include "wx/fdrepdlg.h"

+#include "wx/settings.h"

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


@@ -102,6 +103,8 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     wxCHECK_MSG( m_FindReplaceData, false,
                  _T("can't create dialog without data") );
 
     wxCHECK_MSG( m_FindReplaceData, false,
                  _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


@@ -126,7 +129,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
                                         wxALIGN_CENTRE_VERTICAL |
                                         wxALIGN_RIGHT | wxTOP, 5);
 
                                         wxALIGN_CENTRE_VERTICAL |
                                         wxALIGN_RIGHT | wxTOP, 5);
 

-        sizer2Col->Add(10, 0);
+        sizer2Col->Add(isPda ? 2 : 10, 0);

 
         m_textRepl = new wxTextCtrl(this, wxID_ANY,
                                     m_FindReplaceData->GetReplaceString());
 
         m_textRepl = new wxTextCtrl(this, wxID_ANY,
                                     m_FindReplaceData->GetReplaceString());


@@ -136,7 +139,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
 
     leftsizer->Add(sizer2Col, 0, wxEXPAND | wxALL, 5);
 
 
     leftsizer->Add(sizer2Col, 0, wxEXPAND | wxALL, 5);
 

-    wxBoxSizer *optsizer = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *optsizer = new wxBoxSizer( isPda ? wxVERTICAL : wxHORIZONTAL );

 
     wxBoxSizer *chksizer = new wxBoxSizer( wxVERTICAL);
 
 
     wxBoxSizer *chksizer = new wxBoxSizer( wxVERTICAL);
 


@@ -149,19 +152,27 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     optsizer->Add(chksizer, 0, wxALL, 10);
 
     static const wxString searchDirections[] = {_("Up"), _("Down")};
     optsizer->Add(chksizer, 0, wxALL, 10);
 
     static const wxString searchDirections[] = {_("Up"), _("Down")};

+    int majorDimension = 0;
+    int rbStyle ;
+    if (isPda)
+        rbStyle = wxRA_SPECIFY_ROWS;
+    else
+        rbStyle = wxRA_SPECIFY_COLS;
+    

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

-                                WXSIZEOF(searchDirections), searchDirections);
+                                WXSIZEOF(searchDirections), searchDirections,
+                                majorDimension, rbStyle);

 
 

-    optsizer->Add(m_radioDir, 0, wxALL, 10);
+    optsizer->Add(m_radioDir, 0, wxALL, isPda ? 5 : 10);

 
     leftsizer->Add(optsizer);
 
     wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL);
 
 
     leftsizer->Add(optsizer);
 
     wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL);
 

-    bttnsizer->Add(new wxButton(this, wxID_FIND, _("&Find")), 0, wxALL, 3);
+    bttnsizer->Add(new wxButton(this, wxID_FIND), 0, wxALL, 3);

 
 

-    bttnsizer->Add(new wxButton(this, wxID_CANCEL, _("&Cancel")), 0, wxALL, 3);
+    bttnsizer->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 3);

 
     if ( style & wxFR_REPLACEDIALOG )
     {
 
     if ( style & wxFR_REPLACEDIALOG )
     {


@@ -174,8 +185,8 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
 

-    topsizer->Add(leftsizer, 1, wxALL, 5);
-    topsizer->Add(bttnsizer, 0, wxALL, 5);
+    topsizer->Add(leftsizer, 1, wxALL, isPda ? 0 : 5);
+    topsizer->Add(bttnsizer, 0, wxALL, isPda ? 0 : 5);

 
     int flags = m_FindReplaceData->GetFlags();
 
 
     int flags = m_FindReplaceData->GetFlags();