Program args fix for WinCE

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index ad3680b5fddc57a2a3a1e24fe9cac7c695e0614d..15e85bb44a6658ed750f381571ca5fe177c2663f 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -54,6 +54,20 @@
 
 #define wxID_LISTBOX 3000
 
 
 #define wxID_LISTBOX 3000
 

+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+   device we display on
+ */
+
+#if defined(__SMARTPHONE__)
+    #define wxLARGESMALL(large,small) small
+#else
+    #define wxLARGESMALL(large,small) large
+#endif
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -252,7 +266,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message

-    topsizer->Add( CreateTextSizer( message ), 0, wxEXPAND, wxLARGESMALL(10,0) );
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );

 
     // 2) list box
     m_listbox = new wxListBox( this, wxID_LISTBOX,
 
     // 2) list box
     m_listbox = new wxListBox( this, wxID_LISTBOX,


@@ -262,7 +276,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
     if ( n > 0 )
         m_listbox->SetSelection(0);
 
     if ( n > 0 )
         m_listbox->SetSelection(0);
 

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

 
 #ifdef __SMARTPHONE__
 
 
 #ifdef __SMARTPHONE__
 


@@ -286,7 +300,8 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 

-    Centre( wxBOTH );
+    if ( styleDlg & wxCENTRE )
+        Centre(wxBOTH);

 
     m_listbox->SetFocus();
 
 
     m_listbox->SetFocus();
 


@@ -442,8 +457,17 @@ bool wxMultiChoiceDialog::Create( wxWindow *parent,
 
 void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
 {
 
 void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
 {

-    size_t count = selections.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    // first clear all currently selected items
+    size_t n,
+           count = m_listbox->GetCount();
+    for ( n = 0; n < count; ++n )
+    {
+        m_listbox->Deselect(n);
+    }
+
+    // now select the ones which should be selected
+    count = selections.GetCount();
+    for ( n = 0; n < count; n++ )

     {
         m_listbox->Select(selections[n]);
     }
     {
         m_listbox->Select(selections[n]);
     }