X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59af5f19d077fa88fad9bf6a01040f5af390da79..7052b16dedae79bec878ce41e4607a39a969610c:/src/generic/choicdgg.cpp

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 7c2f597f56..1c270386e1 100644
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -53,17 +53,6 @@
 
 #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
 // ----------------------------------------------------------------------------
@@ -133,7 +122,7 @@ wxString wxGetSingleChoice( const wxString& message,
 // Overloaded for backward compatibility
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,
-                            int n, char *choices[],
+                            int n, wxChar *choices[],
                             wxWindow *parent,
                             int x, int y, bool centre,
                             int width, int height )
@@ -321,8 +310,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                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 );
@@ -454,10 +442,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
-    // TODO!
-#ifndef __WXMOTIF__
     if ( m_listbox->HasClientUntypedData() )
-#endif
         SetClientData(m_listbox->GetClientData(m_selection));
     EndModal(wxID_OK);
 }
@@ -467,10 +452,7 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
 
-    // TODO!
-#ifndef __WXMOTIF__
     if ( m_listbox->HasClientUntypedData() )
-#endif
         SetClientData(m_listbox->GetClientData(m_selection));
 
     EndModal(wxID_OK);
@@ -510,11 +492,6 @@ void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
 
 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++ )