projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some code renaming to avoid confusion. Test editable column in sample.
[wxWidgets.git]
/
src
/
generic
/
fdrepdlg.cpp
diff --git
a/src/generic/fdrepdlg.cpp
b/src/generic/fdrepdlg.cpp
index 29e31d7b60d6c51dd5b083e0b60be626f49cbb28..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,6
+37,7
@@
#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"
@@
-90,9
+87,12
@@
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 | wxRESIZE_BORDER | style) )
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+ | style) )
{
return false;
}
{
return false;
}
@@
-102,6
+102,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
+128,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
+138,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,17
+151,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), 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);
@@
-174,8
+186,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();
@@
-279,4
+291,3
@@
void wxGenericFindReplaceDialog::OnCloseWindow(wxCloseEvent &)
}
#endif // wxUSE_FINDREPLDLG
}
#endif // wxUSE_FINDREPLDLG
-