X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c49245f8baabd69afd7302c43474d3bdd247fb89..6703082ef036da3e3043e25f3f439bbc6208c65f:/src/generic/textdlgg.cpp diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index 723216cf9a..5eadd8e018 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -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 @@ -45,35 +46,6 @@ #include "wx/generic/textdlgg.h" -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -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; - -private: - DECLARE_EVENT_TABLE() -}; - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -88,18 +60,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, @@ -111,186 +76,55 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL), m_value(value) { - // calculate the sizes - // ------------------- - - wxArrayString lines; - wxSize sizeText = SplitTextMessage(message, &lines); - - wxSize sizeBtn = GetStandardButtonSize(); - - long wText = wxMax(4*sizeBtn.GetWidth(), sizeText.GetWidth()); - long hText = GetStandardTextHeight(); - - 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; - - // 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; - - // text ctrl - m_textctrl = new wxTextCtrl(this, wxID_TEXT, m_value, - wxPoint(x, 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_dialogStyle = style; + m_value = value; - m_textctrl->SetFocus(); -} + wxBeginBusyCursor(); -void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) -{ - m_value = m_textctrl->GetValue(); + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - EndModal(wxID_OK); -} + // 1) text message + topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); -// ---------------------------------------------------------------------------- -// wxNumberEntryDialog -// ---------------------------------------------------------------------------- + // 2) text ctrl + m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, + wxDefaultPosition, wxSize(300, -1), + style & ~wxTextEntryDialogStyle); + topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 ); -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 wxUSE_STATLINE + // 3) static line + topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); +#endif - 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_spinctrl->SetFocus(); -} + // 4) buttons + topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 ); -void wxNumberEntryDialog::OnOK(wxCommandEvent& event) -{ - if ( (sscanf(m_spinctrl->GetValue(), "%lu", &m_value) != 1) || - (m_value < m_min) || (m_value > m_max) ) - { - // not a number or out of range - m_value = -1; - } + SetAutoLayout( TRUE ); + SetSizer( topsizer ); - EndModal(wxID_OK); -} + topsizer->SetSizeHints( this ); + topsizer->Fit( this ); -void wxNumberEntryDialog::OnCancel(wxCommandEvent& event) -{ - m_value = -1; + Centre( wxBOTH ); + + m_textctrl->SetFocus(); - EndModal(wxID_CANCEL); + wxEndBusyCursor(); } -// ---------------------------------------------------------------------------- -// global functions -// ---------------------------------------------------------------------------- +void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) +{ + m_value = m_textctrl->GetValue(); -// wxGetTextFromUser is in utilscmn.cpp + EndModal(wxID_OK); +} -long wxGetNumberFromUser(const wxString& msg, - const wxString& prompt, - const wxString& title, - long value, - long min, - long max, - wxWindow *parent, - const wxPoint& pos) +void wxTextEntryDialog::SetValue(const wxString& val) { - wxNumberEntryDialog dialog(parent, msg, prompt, title, - value, min, max, pos); - (void)dialog.ShowModal(); + m_value = val; - return dialog.GetValue(); + m_textctrl->SetValue(val); } + +#endif // wxUSE_TEXTDLG