#endif
#ifndef WX_PRECOMP
- #include <stdio.h>
- #include "wx/utils.h"
- #include "wx/dialog.h"
- #include "wx/button.h"
- #include "wx/listbox.h"
- #include "wx/stattext.h"
- #include "wx/intl.h"
+ #include <stdio.h>
+ #include "wx/utils.h"
+ #include "wx/dialog.h"
+ #include "wx/button.h"
+ #include "wx/listbox.h"
+ #include "wx/stattext.h"
+ #include "wx/intl.h"
+ #include "wx/sizer.h"
#endif
#if wxUSE_STATLINE
- #include "wx/statline.h"
+ #include "wx/statline.h"
#endif
#include "wx/generic/choicdgg.h"
-/* Split message, using constraints to position controls */
-static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
-{
- int y = 10;
- int w = 50;
- wxString line( _T("") );
- for (size_t pos = 0; pos < message.Len(); pos++)
- {
- if (message[pos] == _T('\n'))
- {
- if (!line.IsEmpty())
- {
- wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
- wxSize size1( s1->GetSize() );
- if (size1.x > w) w = size1.x;
- line = _T("");
- }
- y += 18;
- }
- else
- {
- line += message[pos];
- }
- }
-
- if (!line.IsEmpty())
- {
- wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
- wxSize size2( s2->GetSize() );
- if (size2.x > w) w = size2.x;
- }
-
- y += 18;
-
- return wxSize(w+30,y);
-}
+#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(width), int WXUNUSED(height) )
+ int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
+ int WXUNUSED(width), int WXUNUSED(height) )
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+ wxString choice;
if ( dialog.ShowModal() == wxID_OK )
- return dialog.GetStringSelection();
- else
- return _T("");
+ choice = dialog.GetStringSelection();
+
+ return choice;
}
// 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 width, int height )
+ int x, int y, bool centre,
+ int width, int height )
{
wxString *strings = new wxString[n];
int i;
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);
+ int choice;
if ( dialog.ShowModal() == wxID_OK )
- return dialog.GetSelection();
+ choice = dialog.GetSelection();
else
- return -1;
+ choice = -1;
+
+ return choice;
}
// 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];
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);
+ void *data;
if ( dialog.ShowModal() == wxID_OK )
- return dialog.GetSelectionClientData();
+ data = dialog.GetSelectionClientData();
else
- return NULL;
+ data = NULL;
+
+ return data;
}
// 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];
{
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;
// 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)
+
+#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, const wxString *choices, wxChar **clientData, long style, const wxPoint& pos):
- wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
+
+wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ int n,
+ const wxString *choices,
+ char **clientData,
+ long style,
+ const wxPoint& pos)
+ : wxDialog(parent, -1, caption, pos, wxDefaultSize,
+ wxCHOICEDLG_DIALOG_STYLE)
{
- Create(parent, message, caption, n, choices, clientData, style);
+ Create(parent, message, caption, n, choices, clientData, style);
}
-wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
- const wxStringList& choices, wxChar **clientData, long style, const wxPoint& pos):
- wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ const wxStringList& choices,
+ char **clientData,
+ long style,
+ const wxPoint& pos)
+ : wxDialog(parent, -1, caption, pos, wxDefaultSize,
+ wxCHOICEDLG_DIALOG_STYLE)
{
- Create(parent, message, caption, choices, clientData, style);
+ Create(parent, message, caption, choices, clientData, style);
}
-bool wxSingleChoiceDialog::Create(wxWindow *parent, const wxString& message, const wxString& caption,
- const wxStringList& choices, wxChar **clientData, long style, const wxPoint& pos)
+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;
return ans;
}
-bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& message,
- const wxString& WXUNUSED(caption), int n,
- const wxString *choices, wxChar **clientData, long style,
+bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
+ const wxString& message,
+ const wxString& WXUNUSED(caption),
+ int n,
+ const wxString *choices,
+ char **clientData,
+ long style,
const wxPoint& WXUNUSED(pos) )
{
- m_dialogStyle = style;
m_selection = 0;
- m_stringSelection = _T("");
- m_clientData = NULL;
+
+ m_dialogStyle = style;
wxBeginBusyCursor();
-
- wxSize message_size( wxSplitMessage2( message, this ) );
-
- wxButton *ok = (wxButton *) NULL;
- wxButton *cancel = (wxButton *) NULL;
- wxList m_buttons;
-
- int y = message_size.y + 15;
-
- int listbox_height = wxMin( 160, n*20 );
-
- wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height),
+
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+ // 1) text message
+ topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+
+ // 2) list box
+ m_listbox = new wxListBox( this, wxID_LISTBOX, wxDefaultPosition, wxSize(160,100) ,
n, choices, wxLB_ALWAYS_SB );
- listBox->SetSelection( m_selection );
+ m_listbox->SetSelection( m_selection );
if (clientData)
{
for (int i = 0; i < n; i++)
- listBox->SetClientData(i, clientData[i]);
+ m_listbox->SetClientData(i, clientData[i]);
}
-
- y += listbox_height + 35;
+ topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
- if (style & wxOK)
- {
- ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
- m_buttons.Append( ok );
- }
+#if wxUSE_STATLINE
+ // 3) static line
+ topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
- if (style & wxCANCEL)
- {
- cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
- m_buttons.Append( cancel );
- }
+ // 4) buttons
+ topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
- if (ok)
- {
- ok->SetDefault();
- ok->SetFocus();
- }
+ SetAutoLayout( TRUE );
+ SetSizer( topsizer );
- int w = m_buttons.GetCount() * 100;
- if (message_size.x > w) w = message_size.x;
- int space = w / (m_buttons.GetCount()*2);
-
- listBox->SetSize( 20, -1, w-10, listbox_height );
-
- int m = 0;
- wxNode *node = m_buttons.First();
- while (node)
- {
- wxWindow *win = (wxWindow*)node->Data();
- int x = (m*2+1)*space - 40 + 15;
- win->Move( x, -1 );
- node = node->Next();
- m++;
- }
-
-#if wxUSE_STATLINE
- (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
-#endif
-
- SetSize( w+30, y+40 );
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
Centre( wxBOTH );
+ m_listbox->SetFocus();
+
wxEndBusyCursor();
return TRUE;
// Set the selection
void wxSingleChoiceDialog::SetSelection(int sel)
{
- wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
- if (listBox)
- {
- listBox->SetSelection(sel);
- }
+ m_listbox->SetSelection(sel);
m_selection = sel;
}
void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
- wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
- if ( listBox )
- {
- m_selection = listBox->GetSelection();
- m_stringSelection = listBox->GetStringSelection();
- m_clientData = (wxChar*)listBox->GetClientData(m_selection);
- }
-
+ 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);
}
void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
{
- wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
- if ( listBox )
- {
- m_selection = listBox->GetSelection();
- m_stringSelection = listBox->GetStringSelection();
- m_clientData = (wxChar*)listBox->GetClientData(m_selection);
- }
+ 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);
}
projects / wxWidgets.git / blobdiff