X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..3f2711d5c119962a9fcb7198ebf351930d646e23:/src/generic/choicdgg.cpp

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index ee1280ca39..a0636f159b 100644
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -1,134 +1,129 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choicesg.cpp
+// Name:        choicdgg.cpp
 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "choicdgg.h"
+    #pragma implementation "choicdgg.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.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"
 #endif
 
 #include "wx/generic/choicdgg.h"
 
-extern void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer);
+#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);
-	if ( dialog.ShowModal() == wxID_OK )
-	{
-		return dialog.GetStringSelection();
-	}
-	else
-		return "";
+    wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+    if ( dialog.ShowModal() == wxID_OK )
+        return dialog.GetStringSelection();
+    else
+        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 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];
-	}
-	wxString ans(wxGetSingleChoice(message, caption, n, (const wxString *)strings, parent,
-		x, y, centre, width, height));
-	delete[] strings;
-	return ans;
+    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;
 }
 
-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(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);
-	if ( dialog.ShowModal() == wxID_OK )
-	{
-		return dialog.GetSelection();
-	}
-	else
-		return -1;
+    wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+    if ( dialog.ShowModal() == wxID_OK )
+        return dialog.GetSelection();
+    else
+        return -1;
 }
 
 // Overloaded for backward compatibility
-int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, 
-                            char *choices[], wxWindow *parent,
-			    int x, int y, bool centre, 
-			    int width, int height )
+int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n,
+                            wxChar *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];
-	}
-	int ans = wxGetSingleChoiceIndex(message, caption, n, (const wxString *)strings, parent,
-		x, y, centre, width, height);
-	delete[] strings;
-	return ans;
+    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;
 }
 
-char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
-                             const wxString *choices, char **client_data, wxWindow *parent,
-			     int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), 
-			     int WXUNUSED(width), int WXUNUSED(height) )
+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);
-	if ( dialog.ShowModal() == wxID_OK )
-	{
-		return dialog.GetSelectionClientData();
-	}
-	else
-		return NULL;
+    wxSingleChoiceDialog dialog(parent, message, caption, n, choices, (char **)client_data);
+    if ( dialog.ShowModal() == wxID_OK )
+        return dialog.GetSelectionClientData();
+    else
+        return NULL;
 }
 
 // Overloaded for backward compatibility
-char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, 
-                             char *choices[], char **client_data, wxWindow *parent,
-			     int x, int y, bool centre, 
-			     int width, int height )
+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];
-	int i;
-	for ( i = 0; i < n; i++)
-	{
-		strings[i] = choices[i];
-	}
-	char *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent,
-		x, y, centre, width, height);
-	delete[] strings;
-	return data;
+    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;
 }
 
 
@@ -150,12 +145,12 @@ selected.
 */
 /*
 int wxGetMultipleChoice(const wxString& message, const wxString& caption,
-			  int n, const wxString *choices,
-			  int nsel, int * selection,
-			  wxWindow *parent , int x , int y, bool centre,
-			  int width, int height)
+              int n, const wxString *choices,
+              int nsel, int * selection,
+              wxWindow *parent , int x , int y, bool centre,
+              int width, int height)
 {
-	return -1;
+    return -1;
 }
 */
 
@@ -163,167 +158,155 @@ int wxGetMultipleChoice(const wxString& message, const wxString& caption,
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
-	EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
-	EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
+    EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
+    EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
 #endif
 
-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, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+#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,
+                                           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, char **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, char **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;
-	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;
+    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;
 }
 
-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) )
+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 = "";
-	m_clientData = NULL;
-
-	wxBeginBusyCursor();
-
-	wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-	topSizer->SetBorder(10, 10);
-
-	wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-	messageSizer->SetName("messageSizer");
-
-//    bool centre = ((style & wxCENTRE) == wxCENTRE);
-
-	wxList messageList;
-	wxSplitMessage2(message, &messageList, this, messageSizer);
-
-	// Insert a spacer
-	wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
-
-	wxListBox *listBox = new wxListBox(this, wxID_LISTBOX, wxPoint(-1, -1), wxSize(240, 160),
-		n, choices);
-    listBox->SetSelection(m_selection);
-	if ( clientData )
-	{
-		int i;
-		for ( i = 0; i < n; i++)
-		{
-				listBox->SetClientData(i, clientData[i]);
-		}
-	}
-
-	wxRowColSizer *listBoxSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-	listBoxSizer->AddSizerChild(listBox);
-	listBoxSizer->SetName("listBoxSizer");
-
-	// Create constraints for the text sizer
-	wxLayoutConstraints *textC = new wxLayoutConstraints;
-	textC->left.SameAs		(messageSizer, wxLeft);
-	textC->top.Below		(spacingSizer);
-	listBoxSizer->SetConstraints(textC);
-
-	// Insert another spacer
-	wxSpacingSizer *spacingSizer2 = new wxSpacingSizer(topSizer, wxBelow, listBoxSizer, 10);
-	spacingSizer->SetName("spacingSizer2");
-
-	// Insert a sizer for the buttons
-	wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-	buttonSizer->SetName("buttonSizer");
-
-  	// Specify constraints for the button sizer
-  	wxLayoutConstraints *c = new wxLayoutConstraints;
-  	c->width.AsIs		();
-  	c->height.AsIs		();
-	c->top.Below		(spacingSizer2);
-	c->centreX.SameAs	(listBoxSizer, wxCentreX);
-  	buttonSizer->SetConstraints(c);
-
-    wxButton *ok = NULL;
-  	wxButton *cancel = NULL;
-
-  if (style & wxOK) {
-    ok = new wxButton(this, wxID_OK, _("OK"));
-	buttonSizer->AddSizerChild(ok);
-  }
-
-  if (style & wxCANCEL) {
-    cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
-	buttonSizer->AddSizerChild(cancel);
-  }
-
-  if (ok)
-  {
-    ok->SetDefault();
-    ok->SetFocus();
-  }
-
-  Layout();
-  Centre(wxBOTH);
-
-  wxEndBusyCursor();
-
-  return TRUE;
+    m_selection = 0;
+
+    m_dialogStyle = style;
+
+    wxBeginBusyCursor();
+    
+    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 );
+    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 );
+
+#if wxUSE_STATLINE
+    // 3) static line
+    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
+
+    // 4) buttons
+    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
+    
+    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 = listBox->GetClientData(m_selection);
-	}
-
-	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);
 }
 
 void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 {
-	wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-	if ( listBox )
-	{
-		m_selection = listBox->GetSelection();
-		m_stringSelection = listBox->GetStringSelection();
-		m_clientData = listBox->GetClientData(m_selection);
-	}
-
-	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);
+}