// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "choicdgg.h"
#endif
#pragma hdrstop
#endif
+#if wxUSE_CHOICEDLG
+
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/utils.h"
#include "wx/stattext.h"
#include "wx/intl.h"
#include "wx/sizer.h"
+ #include "wx/arrstr.h"
#endif
#if wxUSE_STATLINE
#define wxID_LISTBOX 3000
-#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
-
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
{
int n = aChoices.GetCount();
*choices = new wxString[n];
+
for ( int i = 0; i < n; i++ )
{
- *choices[i] = aChoices[i];
+ (*choices)[i] = aChoices[i];
}
return n;
return res;
}
-#ifdef WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility
-wxString wxGetSingleChoice( const wxString& message,
- const wxString& caption,
- int n, char *choices[],
- wxWindow *parent,
- int x, int y, bool centre,
- int width, int height )
-{
- wxString *strings = new wxString[n];
- int i;
- for ( i = 0; i < n; i++)
- {
- strings[i] = choices[i];
- }
- wxString ans(wxGetSingleChoice(message, caption, n, (const wxString *)strings, parent,
- x, y, centre, width, height));
- delete[] strings;
- return ans;
-}
-#endif // WXWIN_COMPATIBILITY_2
-
int wxGetSingleChoiceIndex( const wxString& message,
const wxString& caption,
int n, const wxString *choices,
return choice;
}
-#ifdef WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility
int wxGetSingleChoiceIndex( const wxString& message,
const wxString& caption,
- int n, wxChar *choices[],
+ const wxArrayString& aChoices,
wxWindow *parent,
- int x, int y, bool centre,
- int width, int height )
+ int x, int y,
+ bool centre,
+ int width, int height)
{
- wxString *strings = new wxString[n];
- for ( int i = 0; i < n; i++)
- strings[i] = choices[i];
- int ans = wxGetSingleChoiceIndex(message, caption, n, (const wxString *)strings, parent,
- x, y, centre, width, height);
- delete[] strings;
- return ans;
+ wxString *choices;
+ int n = ConvertWXArrayToC(aChoices, &choices);
+ int res = wxGetSingleChoiceIndex(message, caption, n, choices, parent,
+ x, y, centre, width, height);
+ delete [] choices;
+
+ return res;
}
-#endif // WXWIN_COMPATIBILITY_2
void *wxGetSingleChoiceData( const wxString& message,
const wxString& caption,
bool WXUNUSED(centre),
int WXUNUSED(width), int WXUNUSED(height) )
{
- wxSingleChoiceDialog dialog(parent, message, caption, n, choices, (char **)client_data);
+ wxSingleChoiceDialog dialog(parent, message, caption, n, choices,
+ (char **)client_data);
void *data;
if ( dialog.ShowModal() == wxID_OK )
data = dialog.GetSelectionClientData();
return data;
}
-#ifdef WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility
void *wxGetSingleChoiceData( const wxString& message,
const wxString& caption,
- int n, wxChar *choices[],
+ const wxArrayString& aChoices,
void **client_data,
wxWindow *parent,
- int x, int y, bool centre, int width, int height )
+ int x, int y,
+ bool centre,
+ int width, int height)
{
- wxString *strings = new wxString[n];
- int i;
- for ( i = 0; i < n; i++)
- {
- strings[i] = choices[i];
- }
- void *data = wxGetSingleChoiceData(message, caption,
- n, (const wxString *)strings,
- client_data, parent,
- x, y, centre, width, height);
- delete[] strings;
- return data;
+ wxString *choices;
+ int n = ConvertWXArrayToC(aChoices, &choices);
+ void *res = wxGetSingleChoiceData(message, caption, n, choices,
+ client_data, parent,
+ x, y, centre, width, height);
+ delete [] choices;
+
+ return res;
}
-#endif // WXWIN_COMPATIBILITY_2
size_t wxGetMultipleChoices(wxArrayInt& selections,
const wxString& message,
int WXUNUSED(width), int WXUNUSED(height))
{
wxMultiChoiceDialog dialog(parent, message, caption, n, choices);
+
+ if ( !selections.IsEmpty() )
+ dialog.SetSelections(selections);
+
if ( dialog.ShowModal() == wxID_OK )
selections = dialog.GetSelections();
else
const wxString& message,
const wxString& caption,
int n, const wxString *choices,
- long WXUNUSED(styleDlg), // FIXME: why unused?
+ long styleDlg,
const wxPoint& pos,
long styleLbox)
{
- if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize,
- wxCHOICEDLG_DIALOG_STYLE) )
+ if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize, styleDlg) )
return FALSE;
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
#endif
// 4) buttons
- topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+ topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxCENTRE | wxALL, 10 );
SetAutoLayout( TRUE );
SetSizer( topsizer );
return TRUE;
}
+bool wxAnyChoiceDialog::Create(wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ long styleDlg,
+ const wxPoint& pos,
+ long styleLbox)
+{
+ wxCArrayString chs(choices);
+ return Create(parent, message, caption, chs.GetCount(), chs.GetStrings(),
+ styleDlg, pos, styleLbox);
+}
+
// ----------------------------------------------------------------------------
// wxSingleChoiceDialog
// ----------------------------------------------------------------------------
Create(parent, message, caption, n, choices, clientData, style);
}
-#ifdef WXWIN_COMPATIBILITY_2
-
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
const wxString& message,
const wxString& caption,
- const wxStringList& choices,
+ const wxArrayString& choices,
char **clientData,
long style,
const wxPoint& WXUNUSED(pos))
Create(parent, message, caption, choices, clientData, style);
}
-bool wxSingleChoiceDialog::Create(wxWindow *parent,
- const wxString& message,
- const wxString& caption,
- const wxStringList& choices,
- char **clientData,
- long style,
- const wxPoint& pos)
-{
- wxString *strings = new wxString[choices.Number()];
- int i;
- for ( i = 0; i < choices.Number(); i++)
- {
- strings[i] = (char *)choices.Nth(i)->Data();
- }
- bool ans = Create(parent, message, caption, choices.Number(), strings, clientData, style, pos);
- delete[] strings;
- return ans;
-}
-
-#endif // WXWIN_COMPATIBILITY_2
-
bool wxSingleChoiceDialog::Create( wxWindow *parent,
const wxString& message,
const wxString& caption,
return TRUE;
}
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ char **clientData,
+ long style,
+ const wxPoint& pos )
+{
+ wxCArrayString chs(choices);
+ return Create( parent, message, caption, chs.GetCount(), chs.GetStrings(),
+ clientData, style, pos );
+}
+
// Set the selection
void wxSingleChoiceDialog::SetSelection(int sel)
{
{
m_selection = m_listbox->GetSelection();
m_stringSelection = m_listbox->GetStringSelection();
- // TODO!
-#ifndef __WXMOTIF__
if ( m_listbox->HasClientUntypedData() )
SetClientData(m_listbox->GetClientData(m_selection));
-#endif
EndModal(wxID_OK);
}
m_selection = m_listbox->GetSelection();
m_stringSelection = m_listbox->GetStringSelection();
- // TODO!
-#ifndef __WXMOTIF__
if ( m_listbox->HasClientUntypedData() )
SetClientData(m_listbox->GetClientData(m_selection));
-#endif
EndModal(wxID_OK);
}
return TRUE;
}
+bool wxMultiChoiceDialog::Create( wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ long style,
+ const wxPoint& pos )
+{
+ wxCArrayString chs(choices);
+ return Create( parent, message, caption, chs.GetCount(),
+ chs.GetStrings(), style, pos );
+}
+
void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
{
size_t count = selections.GetCount();
bool wxMultiChoiceDialog::TransferDataFromWindow()
{
- // VZ: I hate to do it but I can't fix wxMotif right now (FIXME)
-#ifdef __WXMOTIF__
- #define IsSelected Selected
-#endif
-
m_selections.Empty();
size_t count = m_listbox->GetCount();
for ( size_t n = 0; n < count; n++ )
return TRUE;
}
+
+#endif // wxUSE_CHOICEDLG
projects / wxWidgets.git / blobdiff