X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abe2606b703f615dbe96d2d7a54345c0b27b9843..79f585d90388128f9d245f7c92d3013b98b9ed14:/src/generic/choicdgg.cpp diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index 25483ca765..ec8857fa4d 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -28,34 +28,33 @@ #include "wx/listbox.h" #include "wx/stattext.h" #include "wx/intl.h" - #include "wx/dcclient.h" - #include "wx/settings.h" + #include "wx/sizer.h" #endif #if wxUSE_STATLINE - #include "wx/statline.h" + #include "wx/statline.h" #endif #include "wx/generic/choicdgg.h" #define wxID_LISTBOX 3000 -wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n, +wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n, const wxString *choices, wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), + int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), int WXUNUSED(width), int WXUNUSED(height) ) { wxSingleChoiceDialog dialog(parent, message, caption, n, choices); if ( dialog.ShowModal() == wxID_OK ) return dialog.GetStringSelection(); else - return _T(""); + return wxT(""); } // Overloaded for backward compatibility -wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n, +wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n, char *choices[], wxWindow *parent, - int x, int y, bool centre, + int x, int y, bool centre, int width, int height ) { wxString *strings = new wxString[n]; @@ -70,9 +69,9 @@ wxString wxGetSingleChoice( const wxString& message, const wxString& caption, in return ans; } -int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, +int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, const wxString *choices, wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), + int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), int WXUNUSED(width), int WXUNUSED(height) ) { wxSingleChoiceDialog dialog(parent, message, caption, n, choices); @@ -83,9 +82,9 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, in } // Overloaded for backward compatibility -int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, +int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, wxChar *choices[], wxWindow *parent, - int x, int y, bool centre, + int x, int y, bool centre, int width, int height ) { wxString *strings = new wxString[n]; @@ -97,12 +96,12 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, in return ans; } -wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, - const wxString *choices, wxChar **client_data, wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), +void *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, + const wxString *choices, void **client_data, wxWindow *parent, + int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), int WXUNUSED(width), int WXUNUSED(height) ) { - wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data); + wxSingleChoiceDialog dialog(parent, message, caption, n, choices, (char **)client_data); if ( dialog.ShowModal() == wxID_OK ) return dialog.GetSelectionClientData(); else @@ -110,9 +109,9 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, } // Overloaded for backward compatibility -wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, - wxChar *choices[], wxChar **client_data, wxWindow *parent, - int x, int y, bool centre, +void *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, + wxChar *choices[], void **client_data, wxWindow *parent, + int x, int y, bool centre, int width, int height ) { wxString *strings = new wxString[n]; @@ -121,7 +120,7 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, { strings[i] = choices[i]; } - wxChar *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent, + void *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent, x, y, centre, width, height); delete[] strings; return data; @@ -157,23 +156,29 @@ int wxGetMultipleChoice(const wxString& message, const wxString& caption, // wxSingleChoiceDialog -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog) EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK) EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick) END_EVENT_TABLE() IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog) -#endif +#if defined(__WXMSW__) || defined(__WXMAC__) +#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \ + wxDIALOG_MODAL | \ + wxTAB_TRAVERSAL) +#else #define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \ wxDIALOG_MODAL | \ + wxRESIZE_BORDER | \ wxTAB_TRAVERSAL) +#endif + wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, - int n, + int n, const wxString *choices, char **clientData, long style, @@ -187,9 +192,9 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, - const wxStringList& choices, - wxChar **clientData, - long style, + const wxStringList& choices, + char **clientData, + long style, const wxPoint& pos) : wxDialog(parent, -1, caption, pos, wxDefaultSize, wxCHOICEDLG_DIALOG_STYLE) @@ -217,204 +222,55 @@ bool wxSingleChoiceDialog::Create(wxWindow *parent, } bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), - const wxString& message, + const wxString& message, const wxString& WXUNUSED(caption), - int n, + int n, const wxString *choices, char **clientData, long style, const wxPoint& WXUNUSED(pos) ) { - m_dialogStyle = style; m_selection = 0; - m_clientData = NULL; - - // dialog layout constants - static const int LAYOUT_X_MARGIN = 5; - static const int LAYOUT_Y_MARGIN = 5; - static const int MARGIN_BETWEEN_BUTTONS = 3*LAYOUT_X_MARGIN; - - // calc the message size - // --------------------- - - // TODO this should be factored out to a common function (also used in - // msgdlgg.cpp) - wxClientDC dc(this); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - - wxArrayString lines; - wxString curLine; - long height, width, heightTextMax = 0, widthTextMax = 0; - for ( const char *pc = message; ; pc++ ) { - if ( *pc == '\n' || *pc == '\0' ) { - dc.GetTextExtent(curLine, &width, &height); - if ( width > widthTextMax ) - widthTextMax = width; - if ( height > heightTextMax ) - heightTextMax = height; - - lines.Add(curLine); - - if ( *pc == '\n' ) { - curLine.Empty(); - } - else { - // the end of string - break; - } - } - else { - curLine += *pc; - } - } - - size_t nLineCount = lines.Count(); - long hTotalMsg = heightTextMax*nLineCount; - - // calc the button size - // -------------------- - - bool hasCancel = FALSE; - - // always create the OK button - the code below supposes we do have buttons - // and besides the user should have some way to close this dialog - wxASSERT_MSG( style & wxOK, _T("this dialog should have OK button") ); - - wxString labelOk(_("OK")); - long wButton = 0; - dc.GetTextExtent(labelOk, &width, NULL); - if ( width > wButton ) - wButton = width; - - wxString labelCancel; - if ( style & wxCANCEL ) - { - labelCancel = _("Cancel"); - dc.GetTextExtent(labelCancel, &width, NULL); - if ( width > wButton ) - wButton = width; - - hasCancel = TRUE; - } - - if ( wButton < 75 ) - wButton = 75; - else - wButton += 10; - - long hButton = wButton*23/75; - long wTotalButtons = wButton; - if ( hasCancel ) - { - wTotalButtons *= 2; // second button - wTotalButtons += MARGIN_BETWEEN_BUTTONS; // margin between the 2 - } - - // listbox and stat line - // --------------------- - // make the listbox at least as tall as the message - otherwise it looks - // ugly (the lower limit of 300 for the width is arbitrary OTOH) - // - // NB: we write "n + 2" because the horiz. scrollbar also takes some place - long hListbox = wxMax((n + 2) * heightTextMax, hTotalMsg), - wListbox = wxMax(300, wxMax(wTotalButtons, widthTextMax)); - -#if wxUSE_STATLINE - // arbitrary... - long hStatLine = 5; -#endif - - // now the complete dialog size - // ---------------------------- - - long hDialog = 2*LAYOUT_Y_MARGIN + // top margin - hTotalMsg + // message - 2*LAYOUT_Y_MARGIN + // margin between text and listbox - hListbox + // listbox -#if wxUSE_STATLINE - LAYOUT_Y_MARGIN + // margin - hStatLine + // separator line -#endif - 2*LAYOUT_Y_MARGIN + // margin between listbox and buttons - hButton + // button(s) - LAYOUT_Y_MARGIN; // bottom margin - - long wDialog = wxMax(wListbox, wxMax(wTotalButtons, widthTextMax)) + - 4*LAYOUT_X_MARGIN; // 2 from each side - - // create the controls - // ------------------- + m_dialogStyle = style; - // message - wxStaticText *text; - int y = 2*LAYOUT_Y_MARGIN; - for ( size_t nLine = 0; nLine < nLineCount; nLine++ ) - { - text = new wxStaticText(this, -1, lines[nLine], - wxPoint(2*LAYOUT_X_MARGIN, y), - wxSize(widthTextMax, heightTextMax)); - y += heightTextMax; - } + wxBeginBusyCursor(); - y += 2*LAYOUT_X_MARGIN; + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - // listbox - m_listbox = new wxListBox( this, wxID_LISTBOX, - wxPoint(2*LAYOUT_X_MARGIN, y), - wxSize(wListbox, hListbox), - n, choices, - wxLB_HSCROLL); - y += hListbox; + // 1) text message + topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); - if ( clientData ) + // 2) list box + m_listbox = new wxListBox( this, wxID_LISTBOX, wxDefaultPosition, wxSize(160,100) , + n, choices, wxLB_ALWAYS_SB ); + m_listbox->SetSelection( m_selection ); + if (clientData) { for (int i = 0; i < n; i++) m_listbox->SetClientData(i, clientData[i]); } + topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 ); - // separator line #if wxUSE_STATLINE - (void) new wxStaticLine( this, -1, - wxPoint(0, y + LAYOUT_Y_MARGIN), - wxSize(wDialog, hStatLine) ); - - y += LAYOUT_Y_MARGIN + hStatLine; + // 3) static line + topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); #endif - - // buttons - - y += 2*LAYOUT_X_MARGIN; - - // NB: create [Ok] first to get the right tab order - wxButton *ok = (wxButton *) NULL; - wxButton *cancel = (wxButton *) NULL; - - long x = wDialog / 2; - if ( hasCancel ) - x -= MARGIN_BETWEEN_BUTTONS / 2 + wButton; - else - x -= wButton / 2; + // 4) buttons + topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 ); - ok = new wxButton( this, wxID_OK, labelOk, - wxPoint(x, y), - wxSize(wButton, hButton) ); + SetAutoLayout( TRUE ); + SetSizer( topsizer ); - if ( hasCancel ) - { - x += MARGIN_BETWEEN_BUTTONS + wButton; - cancel = new wxButton( this, wxID_CANCEL, labelCancel, - wxPoint(x, y), - wxSize(wButton, hButton) ); - } + topsizer->SetSizeHints( this ); + topsizer->Fit( this ); - ok->SetDefault(); - ok->SetFocus(); + Centre( wxBOTH ); - SetClientSize( wDialog, hDialog ); + m_listbox->SetFocus(); - Centre( wxBOTH ); + wxEndBusyCursor(); return TRUE; } @@ -430,8 +286,11 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { m_selection = m_listbox->GetSelection(); m_stringSelection = m_listbox->GetStringSelection(); - m_clientData = m_listbox->GetClientData(m_selection); - + // TODO! +#ifndef __WXMOTIF__ + if ( m_listbox->HasClientUntypedData() ) + SetClientData(m_listbox->GetClientData(m_selection)); +#endif EndModal(wxID_OK); } @@ -439,7 +298,12 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) { m_selection = m_listbox->GetSelection(); m_stringSelection = m_listbox->GetStringSelection(); - m_clientData = m_listbox->GetClientData(m_selection); + + // TODO! +#ifndef __WXMOTIF__ + if ( m_listbox->HasClientUntypedData() ) + SetClientData(m_listbox->GetClientData(m_selection)); +#endif EndModal(wxID_OK); }