Reverting back to 1.35 as 1.36 does not work with all data sources

[wxWidgets.git] / src / generic / choicdgg.cpp

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index efe516c05d93b093c1b79044d56aa118fe0010e1..ec8857fa4dcca430e8f1a03f73805f8a655f25d8 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -20,73 +20,42 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_CONSTRAINTS
-

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"

-    #include "wx/listbox.h"

     #include "wx/button.h"
     #include "wx/button.h"

+    #include "wx/listbox.h"

     #include "wx/stattext.h"
     #include "wx/stattext.h"

-    #include "wx/layout.h"

     #include "wx/intl.h"
     #include "wx/intl.h"

+    #include "wx/sizer.h"

 #endif
 
 #endif
 

-#include "wx/generic/choicdgg.h"
-
-// Split message, using constraints to position controls
-static void wxSplitMessage2(const wxChar *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
-{
-  wxChar *copyMessage = copystring(message);
-  size_t i = 0;
-  size_t len = wxStrlen(copyMessage);
-  wxChar *currentMessage = copyMessage;
-
-//  wxWindow *lastWindow = parent;
-
-  while (i < len) {
-    while ((i < len) && (copyMessage[i] != _T('\n'))) i++;
-    if (i < len) copyMessage[i] = 0;
-    wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
-
-/*
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->left.SameAs           (parent, wxLeft, 10);
-    c->top.SameAs            (lastWindow, wxBottom, 5);
-    c->right.AsIs              ();
-    c->height.AsIs            ();
+#if wxUSE_STATLINE
+    #include "wx/statline.h"
+#endif

 
 

-    mess->SetConstraints(c);
-*/
-    sizer->AddSizerChild(mess);
+#include "wx/generic/choicdgg.h"

 
 

-    messageList->Append(mess);
+#define wxID_LISTBOX 3000

 
 

-    currentMessage = copyMessage + i + 1;
-  }
-  delete[] copyMessage;
-}
-
-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,
                             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 )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
     if ( dialog.ShowModal() == wxID_OK )

-    {

         return dialog.GetStringSelection();
         return dialog.GetStringSelection();

-    }

     else
     else

-        return "";
+        return wxT("");

 }
 
 // Overloaded for backward compatibility
 }
 
 // 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,
                             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;
 {
     wxString *strings = new wxString[n];
     int i;


@@ -100,56 +69,49 @@ wxString wxGetSingleChoice( const wxString& message, const wxString& caption, in
     return ans;
 }
 
     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,
                             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 )
                 int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
     if ( dialog.ShowModal() == wxID_OK )

-    {

         return dialog.GetSelection();
         return dialog.GetSelection();

-    }

     else
         return -1;
 }
 
 // Overloaded for backward compatibility
     else
         return -1;
 }
 
 // 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,
                             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];
                 int width, int height )
 {
     wxString *strings = new wxString[n];

-    int i;
-    for ( i = 0; i < n; i++)
-    {
+    for ( int i = 0; i < n; i++)

         strings[i] = choices[i];
         strings[i] = choices[i];

-    }

     int ans = wxGetSingleChoiceIndex(message, caption, n, (const wxString *)strings, parent,
         x, y, centre, width, height);
     delete[] strings;
     return ans;
 }
 
     int ans = wxGetSingleChoiceIndex(message, caption, n, (const wxString *)strings, parent,
         x, y, centre, width, height);
     delete[] strings;
     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) )
 {
                    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 )
     if ( dialog.ShowModal() == wxID_OK )

-    {

         return dialog.GetSelectionClientData();
         return dialog.GetSelectionClientData();

-    }

     else
         return NULL;
 }
 
 // Overloaded for backward compatibility
     else
         return NULL;
 }
 
 // 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];
                    int width, int height )
 {
     wxString *strings = new wxString[n];


@@ -158,7 +120,7 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption,
     {
         strings[i] = choices[i];
     }
     {
         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;
         x, y, centre, width, height);
     delete[] strings;
     return data;


@@ -194,31 +156,59 @@ int wxGetMultipleChoice(const wxString& message, const wxString& caption,
 
 // wxSingleChoiceDialog
 
 
 // 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)
 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
 
 #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;
 {
     wxString *strings = new wxString[choices.Number()];
     int i;


@@ -231,92 +221,54 @@ bool wxSingleChoiceDialog::Create(wxWindow *parent, const wxString& message, con
     return ans;
 }
 
     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) )
 {
                                    const wxPoint& WXUNUSED(pos) )
 {

-    m_dialogStyle = style;

     m_selection = 0;
     m_selection = 0;

-    m_stringSelection = _T("");
-    m_clientData = NULL;

 
 

-    wxBeginBusyCursor();
-
-    wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-    topSizer->SetBorder(10, 10);
-
-    wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-    messageSizer->SetName(_T("messageSizer"));
+    m_dialogStyle = style;

 
 

-    //    bool centre = ((style & wxCENTRE) == wxCENTRE);
+    wxBeginBusyCursor();

 
 

-    wxList messageList;
-    wxSplitMessage2(message, &messageList, this, messageSizer);
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

-    // Insert a spacer
-    wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
+    // 1) text message
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );

 
 

-    wxListBox *listBox = new wxListBox(this, wxID_LISTBOX, wxPoint(-1, -1), wxSize(240, 160),
-            n, choices);
-    listBox->SetSelection(m_selection);
-    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)

     {
     {

-        int i;
-        for ( i = 0; i < n; i++)
-        {
-            listBox->SetClientData(i, clientData[i]);
-        }
+        for (int i = 0; i < n; i++)
+            m_listbox->SetClientData(i, clientData[i]);

     }
     }

+    topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );

 
 

-    wxRowColSizer *listBoxSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-    listBoxSizer->AddSizerChild(listBox);
-    listBoxSizer->SetName(_T("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(_T("spacingSizer2"));
-
-    // Insert a sizer for the buttons
-    wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-    buttonSizer->SetName(_T("buttonSizer"));
-    buttonSizer->SetSpacing(12,0);
-
-    // 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"), wxDefaultPosition, wxSize(75,-1) );
-        buttonSizer->AddSizerChild(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"), wxDefaultPosition, wxSize(75,-1));
-        buttonSizer->AddSizerChild(cancel);
-    }
+    // 4) buttons
+    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );

 
 

-    if (ok)
-    {
-        ok->SetDefault();
-        ok->SetFocus();
-    }
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );

 
 

-    Layout();
-    Centre(wxBOTH);
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+
+    Centre( wxBOTH );
+
+    m_listbox->SetFocus();

 
     wxEndBusyCursor();
 
 
     wxEndBusyCursor();
 


@@ -326,39 +278,33 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m
 // Set the selection
 void wxSingleChoiceDialog::SetSelection(int sel)
 {
 // 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))
 {
     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))
 {
     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);
 }
 
 
     EndModal(wxID_OK);
 }
 

-#endif // wxUSE_CONSTRAINTS
-