don't set virtual size of the window to (0, 0) if scrollbars are removed from it

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

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index 5fa8865f6ea115272789805c47607fe9d0f8839a..1d14141be10b5cde9d8008bcd517d91fe61fc9f3 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -6,7 +6,7 @@
 // Created:     05/25/01
 // RCS-ID:
 // Copyright:   (c) wxWidgets team
 // Created:     05/25/01
 // RCS-ID:
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -44,6 +44,7 @@
 #endif
 
 #include "wx/fdrepdlg.h"
 #endif
 
 #include "wx/fdrepdlg.h"

+#include "wx/settings.h"

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


@@ -90,45 +91,47 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
                                         const wxString& title,
                                         int style)
 {
                                         const wxString& title,
                                         int style)
 {

-    if ( !wxDialog::Create(parent, -1, title,
+    if ( !wxDialog::Create(parent, wxID_ANY, title,

                            wxDefaultPosition, wxDefaultSize,
                            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style) )
     {
                            wxDefaultPosition, wxDefaultSize,
                            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style) )
     {

-        return FALSE;
+        return false;

     }
 
     SetData(data);
 
     }
 
     SetData(data);
 

-    wxCHECK_MSG( m_FindReplaceData, FALSE,
+    wxCHECK_MSG( m_FindReplaceData, false,

                  _T("can't create dialog without data") );
 
                  _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
     wxFlexGridSizer *sizer2Col = new wxFlexGridSizer(3);
     sizer2Col->AddGrowableCol(2);
 
     wxBoxSizer *leftsizer = new wxBoxSizer( wxVERTICAL );
 
     // 3 columns because there is a spacer in the middle
     wxFlexGridSizer *sizer2Col = new wxFlexGridSizer(3);
     sizer2Col->AddGrowableCol(2);
 

-    sizer2Col->Add(new wxStaticText(this, -1, _("Search for:"),
-                                    wxDefaultPosition, wxSize(80, -1)),
+    sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Search for:"),
+                                    wxDefaultPosition, wxSize(80, wxDefaultCoord)),

                                     0,
                                     wxALIGN_CENTRE_VERTICAL | wxALIGN_RIGHT);
 
     sizer2Col->Add(10, 0);
 
                                     0,
                                     wxALIGN_CENTRE_VERTICAL | wxALIGN_RIGHT);
 
     sizer2Col->Add(10, 0);
 

-    m_textFind = new wxTextCtrl(this, -1, m_FindReplaceData->GetFindString());
+    m_textFind = new wxTextCtrl(this, wxID_ANY, m_FindReplaceData->GetFindString());

     sizer2Col->Add(m_textFind, 1, wxALIGN_CENTRE_VERTICAL | wxEXPAND);
 
     if ( style & wxFR_REPLACEDIALOG )
     {
     sizer2Col->Add(m_textFind, 1, wxALIGN_CENTRE_VERTICAL | wxEXPAND);
 
     if ( style & wxFR_REPLACEDIALOG )
     {

-        sizer2Col->Add(new wxStaticText(this, -1, _("Replace with:"),
-                                        wxDefaultPosition, wxSize(80, -1)),
+        sizer2Col->Add(new wxStaticText(this, wxID_ANY, _("Replace with:"),
+                                        wxDefaultPosition, wxSize(80, wxDefaultCoord)),

                                         0,
                                         wxALIGN_CENTRE_VERTICAL |
                                         wxALIGN_RIGHT | wxTOP, 5);
 
                                         0,
                                         wxALIGN_CENTRE_VERTICAL |
                                         wxALIGN_RIGHT | wxTOP, 5);
 

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

 
 

-        m_textRepl = new wxTextCtrl(this, -1,
+        m_textRepl = new wxTextCtrl(this, wxID_ANY,

                                     m_FindReplaceData->GetReplaceString());
         sizer2Col->Add(m_textRepl, 1,
                        wxALIGN_CENTRE_VERTICAL | wxEXPAND | wxTOP, 5);
                                     m_FindReplaceData->GetReplaceString());
         sizer2Col->Add(m_textRepl, 1,
                        wxALIGN_CENTRE_VERTICAL | wxEXPAND | wxTOP, 5);


@@ -136,32 +139,40 @@ 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);
 

-    m_chkWord = new wxCheckBox(this, -1, _("Whole word"));
+    m_chkWord = new wxCheckBox(this, wxID_ANY, _("Whole word"));

     chksizer->Add(m_chkWord, 0, wxALL, 3);
 
     chksizer->Add(m_chkWord, 0, wxALL, 3);
 

-    m_chkCase = new wxCheckBox(this, -1, _("Match case"));
+    m_chkCase = new wxCheckBox(this, wxID_ANY, _("Match case"));

     chksizer->Add(m_chkCase, 0, wxALL, 3);
 
     optsizer->Add(chksizer, 0, wxALL, 10);
 
     static const wxString searchDirections[] = {_("Up"), _("Down")};
     chksizer->Add(m_chkCase, 0, wxALL, 3);
 
     optsizer->Add(chksizer, 0, wxALL, 10);
 
     static const wxString searchDirections[] = {_("Up"), _("Down")};

-    m_radioDir = new wxRadioBox(this, -1, _("Search direction"),
+    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,
                                 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,29 +185,29 @@ 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();
 
     if ( flags & wxFR_MATCHCASE )
 
     int flags = m_FindReplaceData->GetFlags();
 
     if ( flags & wxFR_MATCHCASE )

-        m_chkCase->SetValue(TRUE);
+        m_chkCase->SetValue(true);

 
     if ( flags & wxFR_WHOLEWORD )
 
     if ( flags & wxFR_WHOLEWORD )

-        m_chkWord->SetValue(TRUE);
+        m_chkWord->SetValue(true);

 
     m_radioDir->SetSelection( flags & wxFR_DOWN );
 
     if ( style & wxFR_NOMATCHCASE )
 
     m_radioDir->SetSelection( flags & wxFR_DOWN );
 
     if ( style & wxFR_NOMATCHCASE )

-        m_chkCase->Enable(FALSE);
+        m_chkCase->Enable(false);

 
     if ( style & wxFR_NOWHOLEWORD )
 
     if ( style & wxFR_NOWHOLEWORD )

-        m_chkWord->Enable(FALSE);
+        m_chkWord->Enable(false);

 
     if ( style & wxFR_NOUPDOWN)
 
     if ( style & wxFR_NOUPDOWN)

-        m_radioDir->Enable(FALSE);
+        m_radioDir->Enable(false);

 
 

-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );

     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );


@@ -206,7 +217,7 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
 
     m_textFind->SetFocus();
 
 
     m_textFind->SetFocus();
 

-    return TRUE;
+    return true;

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


@@ -264,7 +275,7 @@ void wxGenericFindReplaceDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     SendEvent(wxEVT_COMMAND_FIND_CLOSE);
 
 {
     SendEvent(wxEVT_COMMAND_FIND_CLOSE);
 

-    Show(FALSE);
+    Show(false);

 }
 
 void wxGenericFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent &event)
 }
 
 void wxGenericFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent &event)