X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c49245f8baabd69afd7302c43474d3bdd247fb89..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/generic/textdlgg.cpp diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index 723216cf9a..276e745fb6 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "textdlgg.h" #endif @@ -28,15 +28,16 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include +#if wxUSE_TEXTDLG +#ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" #include "wx/button.h" #include "wx/stattext.h" #include "wx/textctrl.h" #include "wx/intl.h" + #include "wx/sizer.h" #endif #if wxUSE_STATLINE @@ -46,39 +47,24 @@ #include "wx/generic/textdlgg.h" // ---------------------------------------------------------------------------- -// private classes +// constants // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNumberEntryDialog : public wxDialog -{ -public: - wxNumberEntryDialog(wxWindow *parent, - const wxString& message, - const wxString& prompt, - const wxString& caption, - long value, long min, long max, - const wxPoint& pos); - - long GetValue() const { return m_value; } - - // implementation only - void OnOK(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - -protected: - wxTextCtrl *m_spinctrl; // TODO replace it with wxSpinCtrl once it's done - - long m_value, m_min, m_max; +static const int wxID_TEXT = 3000; -private: - DECLARE_EVENT_TABLE() -}; +// --------------------------------------------------------------------------- +// macros +// --------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- +/* Macro for avoiding #ifdefs when value have to be different depending on size of + device we display on - take it from something like wxDesktopPolicy in the future + */ -static const int wxID_TEXT = 3000; +#if defined(__SMARTPHONE__) + #define wxLARGESMALL(large,small) small +#else + #define wxLARGESMALL(large,small) large +#endif // ============================================================================ // implementation @@ -88,18 +74,11 @@ static const int wxID_TEXT = 3000; // wxTextEntryDialog // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -BEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog) - EVT_BUTTON(wxID_OK, wxNumberEntryDialog::OnOK) - EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel) -END_EVENT_TABLE() - BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog) EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK) END_EVENT_TABLE() IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog) -#endif wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message, @@ -107,190 +86,99 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& value, long style, const wxPoint& pos) - : wxDialog(parent, -1, caption, pos, wxDefaultSize, + : wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL), m_value(value) { - // calculate the sizes - // ------------------- - - wxArrayString lines; - wxSize sizeText = SplitTextMessage(message, &lines); + m_dialogStyle = style; + m_value = value; - wxSize sizeBtn = GetStandardButtonSize(); + wxBeginBusyCursor(); - long wText = wxMax(4*sizeBtn.GetWidth(), sizeText.GetWidth()); - long hText = GetStandardTextHeight(); + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - long wDialog = 4*LAYOUT_X_MARGIN + wText; - long hDialog = 2*LAYOUT_Y_MARGIN + - sizeText.GetHeight() * lines.GetCount() + - 2*LAYOUT_Y_MARGIN + - hText + - 2*LAYOUT_Y_MARGIN + - sizeBtn.GetHeight() + - 2*LAYOUT_Y_MARGIN; + // 1) text message + topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) ); - // create the controls - // ------------------- + // 2) text ctrl + m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, + wxDefaultPosition, wxSize(300, wxDefaultCoord), + style & ~wxTextEntryDialogStyle); + topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) ); - // message - long x = 2*LAYOUT_X_MARGIN; - long y = CreateTextMessage(lines, - wxPoint(x, 2*LAYOUT_Y_MARGIN), - sizeText); +#if wxUSE_VALIDATORS + wxTextValidator validator( wxFILTER_NONE, &m_value ); + m_textctrl->SetValidator( validator ); +#endif + // wxUSE_VALIDATORS - y += 2*LAYOUT_X_MARGIN; + // smart phones does not support or do not waste space for wxButtons +#ifdef __SMARTPHONE__ - // text ctrl - m_textctrl = new wxTextCtrl(this, wxID_TEXT, m_value, - wxPoint(x, y), - wxSize(wText, hText)); - y += hText + 2*LAYOUT_X_MARGIN; + SetRightMenu(wxID_CANCEL, _("Cancel")); - // and buttons - CreateStandardButtons(wDialog, y, sizeBtn.GetWidth(), sizeBtn.GetHeight()); +#else // __SMARTPHONE__/!__SMARTPHONE__ - // set the dialog size and position - SetClientSize(wDialog, hDialog); - if ( pos == wxDefaultPosition ) - { - // centre the dialog if no explicit position given - Centre(wxBOTH | wxCENTER_FRAME); - } +#if wxUSE_STATLINE + // 3) static line + topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); +#endif - m_textctrl->SetFocus(); -} + // 4) buttons + topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 ); -void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) -{ - m_value = m_textctrl->GetValue(); +#endif // !__SMARTPHONE__ - EndModal(wxID_OK); -} + SetAutoLayout( true ); + SetSizer( topsizer ); -// ---------------------------------------------------------------------------- -// wxNumberEntryDialog -// ---------------------------------------------------------------------------- + topsizer->SetSizeHints( this ); + topsizer->Fit( this ); -wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, - const wxString& message, - const wxString& prompt, - const wxString& caption, - long value, - long min, - long max, - const wxPoint& pos) - : wxDialog(parent, -1, caption, - pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) -{ - // init members - // ------------ + if ( ( style & wxCENTRE ) == wxCENTRE ) + Centre( wxBOTH ); - m_value = value; - m_max = max; - m_min = min; - - // calculate the sizes - // ------------------- - - wxArrayString lines; - wxSize sizeText = SplitTextMessage(message, &lines); - - wxSize sizeBtn = GetStandardButtonSize(); - - int wPrompt, hPrompt; - GetTextExtent(prompt, &wPrompt, &hPrompt); - - long wText = wxMax(2*sizeBtn.GetWidth(), - wxMax(wPrompt, sizeText.GetWidth())); - long hText = GetStandardTextHeight(); - - long wDialog = 5*LAYOUT_X_MARGIN + wText + wPrompt; - long hDialog = 2*LAYOUT_Y_MARGIN + - sizeText.GetHeight() * lines.GetCount() + - 2*LAYOUT_Y_MARGIN + - hText + - 2*LAYOUT_Y_MARGIN + - sizeBtn.GetHeight() + - 2*LAYOUT_Y_MARGIN; - - // create the controls - // ------------------- - - // message - long x = 2*LAYOUT_X_MARGIN; - long y = CreateTextMessage(lines, - wxPoint(x, 2*LAYOUT_Y_MARGIN), - sizeText); - - y += 2*LAYOUT_X_MARGIN; - - // prompt - (void)new wxStaticText(this, -1, prompt, - wxPoint(x, y), - wxSize(wPrompt, hPrompt)); - - // spin ctrl - wxString valStr; - valStr.Printf("%lu", m_value); - m_spinctrl = new wxTextCtrl(this, -1, valStr, - wxPoint(x + wPrompt + LAYOUT_X_MARGIN, y), - wxSize(wText, hText)); - y += hText + 2*LAYOUT_X_MARGIN; - - // and buttons - CreateStandardButtons(wDialog, y, sizeBtn.GetWidth(), sizeBtn.GetHeight()); - - // set the dialog size and position - SetClientSize(wDialog, hDialog); - if ( pos == wxDefaultPosition ) - { - // centre the dialog if no explicit position given - Centre(wxBOTH | wxCENTER_FRAME); - } + m_textctrl->SetSelection(-1, -1); + m_textctrl->SetFocus(); - m_spinctrl->SetFocus(); + wxEndBusyCursor(); } -void wxNumberEntryDialog::OnOK(wxCommandEvent& event) +void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) { - if ( (sscanf(m_spinctrl->GetValue(), "%lu", &m_value) != 1) || - (m_value < m_min) || (m_value > m_max) ) +#if wxUSE_VALIDATORS + if( Validate() && TransferDataFromWindow() ) { - // not a number or out of range - m_value = -1; + EndModal( wxID_OK ); } +#else + m_value = m_textctrl->GetValue(); EndModal(wxID_OK); +#endif + // wxUSE_VALIDATORS } -void wxNumberEntryDialog::OnCancel(wxCommandEvent& event) +void wxTextEntryDialog::SetValue(const wxString& val) { - m_value = -1; + m_value = val; - EndModal(wxID_CANCEL); + m_textctrl->SetValue(val); } -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- - -// wxGetTextFromUser is in utilscmn.cpp - -long wxGetNumberFromUser(const wxString& msg, - const wxString& prompt, - const wxString& title, - long value, - long min, - long max, - wxWindow *parent, - const wxPoint& pos) +#if wxUSE_VALIDATORS +void wxTextEntryDialog::SetTextValidator( long style ) { - wxNumberEntryDialog dialog(parent, msg, prompt, title, - value, min, max, pos); - (void)dialog.ShowModal(); + wxTextValidator validator( style, &m_value ); + m_textctrl->SetValidator( validator ); +} - return dialog.GetValue(); +void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator ) +{ + m_textctrl->SetValidator( validator ); } + +#endif + // wxUSE_VALIDATORS + +#endif // wxUSE_TEXTDLG