]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/choicdgg.cpp
A few compile things.
[wxWidgets.git] / src / generic / choicdgg.cpp
index efe516c05d93b093c1b79044d56aa118fe0010e1..0ff03ba0b005f262e934298343eb518bebb54033 100644 (file)
     #pragma hdrstop
 #endif
 
-#if wxUSE_CONSTRAINTS
-
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"
-    #include "wx/listbox.h"
     #include "wx/button.h"
+    #include "wx/listbox.h"
     #include "wx/stattext.h"
-    #include "wx/layout.h"
     #include "wx/intl.h"
 #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            ();
-
-    mess->SetConstraints(c);
-*/
-    sizer->AddSizerChild(mess);
+#if wxUSE_STATLINE
+    #include "wx/statline.h"
+#endif
 
-    messageList->Append(mess);
+#include "wx/generic/choicdgg.h"
 
-    currentMessage = copyMessage + i + 1;
-  }
-  delete[] copyMessage;
-}
+#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 "";
+        return _T("");
 }
 
 // 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;
@@ -100,32 +68,27 @@ 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);
     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, 
+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];
-    int i;
-    for ( i = 0; i < n; i++)
-    {
+    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;
@@ -134,22 +97,20 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, in
 
 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), 
+                   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;
 }
 
 // Overloaded for backward compatibility
-wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, 
+wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
                    wxChar *choices[], wxChar **client_data, wxWindow *parent,
-                   int x, int y, bool centre, 
+                   int x, int y, bool centre,
                    int width, int height )
 {
     wxString *strings = new wxString[n];
@@ -203,22 +164,44 @@ END_EVENT_TABLE()
 IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
 #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)
+#define wxCHOICEDLG_DIALOG_STYLE (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,
+                                           wxChar **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;
@@ -231,94 +214,129 @@ bool wxSingleChoiceDialog::Create(wxWindow *parent, const wxString& message, con
     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;
 
-    wxBeginBusyCursor();
+    // calc the message size
+    // ---------------------
 
-    wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-    topSizer->SetBorder(10, 10);
+    wxArrayString lines;
+    wxSize sizeText = SplitTextMessage(message, &lines);
+    long heightTextMax = sizeText.GetHeight(),
+         widthTextMax = sizeText.GetWidth();
+    size_t nLineCount = lines.Count();
+    long hTotalMsg = heightTextMax*nLineCount;
 
-    wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-    messageSizer->SetName(_T("messageSizer"));
+    // calc the button size
+    // --------------------
 
-    //    bool centre = ((style & wxCENTRE) == wxCENTRE);
+    // 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") );
 
-    wxList messageList;
-    wxSplitMessage2(message, &messageList, this, messageSizer);
+    bool hasCancel = (style & wxCANCEL) != 0;
 
-    // Insert a spacer
-    wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
+    wxSize sizeButtons = GetStandardButtonSize(hasCancel);
 
-    wxListBox *listBox = new wxListBox(this, wxID_LISTBOX, wxPoint(-1, -1), wxSize(240, 160),
-            n, choices);
-    listBox->SetSelection(m_selection);
-    if ( clientData )
+    long wButton = sizeButtons.GetWidth(),
+         hButton = sizeButtons.GetHeight();
+
+    long wTotalButtons = wButton;
+    if ( hasCancel )
     {
-        int i;
-        for ( i = 0; i < n; i++)
-        {
-            listBox->SetClientData(i, clientData[i]);
-        }
+        wTotalButtons *= 2;                         // second button
+        wTotalButtons += MARGIN_BETWEEN_BUTTONS;    // margin between the 2
     }
 
-    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);
-    }
+    // 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
+    long hStatLine = wxStaticLine::GetDefaultSize();
+#endif
+
+    // now the complete dialog size
+    // ----------------------------
 
-    if (style & wxCANCEL) {
-        cancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1));
-        buttonSizer->AddSizerChild(cancel);
+    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
+    // -------------------
+
+    // 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;
     }
 
-    if (ok)
+    y += 2*LAYOUT_X_MARGIN;
+
+    // listbox
+    m_listbox = new wxListBox( this, wxID_LISTBOX,
+                               wxPoint(2*LAYOUT_X_MARGIN, y),
+                               wxSize(wListbox, hListbox),
+                               n, choices,
+                               wxLB_HSCROLL);
+    y += hListbox;
+
+    if ( clientData )
     {
-        ok->SetDefault();
-        ok->SetFocus();
+        for (int i = 0; i < n; i++)
+            m_listbox->SetClientData(i, clientData[i]);
     }
 
-    Layout();
-    Centre(wxBOTH);
+    // separator line
+#if wxUSE_STATLINE
+    (void) new wxStaticLine( this, -1,
+                             wxPoint(2*LAYOUT_X_MARGIN, y + LAYOUT_Y_MARGIN),
+                             wxSize(wDialog - 4*LAYOUT_X_MARGIN, hStatLine) );
+
+    y += LAYOUT_Y_MARGIN + hStatLine;
+#endif
+
+    // buttons
+
+    y += 2*LAYOUT_X_MARGIN;
+
+    CreateStandardButtons(wDialog, y, wButton, hButton, hasCancel);
+
+    SetClientSize( wDialog, hDialog );
 
-    wxEndBusyCursor();
+    Centre( wxBOTH );
 
     return TRUE;
 }
@@ -326,39 +344,25 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m
 // 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();
+    m_clientData = m_listbox->GetClientData(m_selection);
 
     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();
+    m_clientData = m_listbox->GetClientData(m_selection);
 
     EndModal(wxID_OK);
 }
 
-#endif // wxUSE_CONSTRAINTS
-