layout adaptions for mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 7c6766967ffe0ef581af35d8d048b278d84b2410..d54c97ba64b1718eb1e66d2339ca9e81aaec88e3 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -263,15 +263,23 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
     styleDlg &= ~wxRESIZE_BORDER;
     styleDlg &= ~wxCAPTION;
 #endif
     styleDlg &= ~wxRESIZE_BORDER;
     styleDlg &= ~wxCAPTION;
 #endif

-
+#ifdef __WXMAC__
+    if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg & (~wxCANCEL) ) )
+        return false;
+#else

     if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
         return false;
     if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
         return false;

+#endif

 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message

+#ifdef __WXMAC__
+    // align text and list at least on mac
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(15,0) );
+#else

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

-
+#endif

     // 2) list box
     m_listbox = CreateList(n,choices,styleLbox);
 
     // 2) list box
     m_listbox = CreateList(n,choices,styleLbox);
 


@@ -287,11 +295,14 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
 #else // __SMARTPHONE__/!__SMARTPHONE__
 
 
 #else // __SMARTPHONE__/!__SMARTPHONE__
 

+    // Mac Human Interface Guidelines recommend not to use static lines as grouping elements
+#ifndef __WXMAC__

 #if wxUSE_STATLINE
     // 3) static line
     topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
 #endif
 #if wxUSE_STATLINE
     // 3) static line
     topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
 #endif

-
+#endif
+    

     // 4) buttons
     topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxEXPAND | wxALL, 10 );
 
     // 4) buttons
     topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxEXPAND | wxALL, 10 );