From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 19 Dec 2004 14:40:46 +0000 (+0000)
Subject: use standard icon; minor layout fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/84ff9d5f9878d4b182591d2acdf56e620118cf5e

use standard icon; minor layout fixes


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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index b89dfa7a3b..6f67f5c1ce 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -935,7 +935,7 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
 
 {
     // frame icon and status bar
-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));
 
 #if wxUSE_STATUSBAR
     CreateStatusBar();
@@ -1011,19 +1011,20 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
 #endif // wxUSE_LOG
 #endif // wxUSE_DRAG_AND_DROP
 
-    wxBoxSizer *m_sizer_top = new wxBoxSizer( wxHORIZONTAL );
-    m_sizer_top->Add(m_ctrlFile, 1, wxEXPAND );
-    m_sizer_top->Add(m_ctrlText, 1, wxEXPAND );
+    wxBoxSizer *sizer_top = new wxBoxSizer( wxHORIZONTAL );
+    sizer_top->Add(m_ctrlFile, 1, wxEXPAND );
+    sizer_top->Add(m_ctrlText, 1, wxEXPAND );
 
-    wxBoxSizer *m_sizer = new wxBoxSizer( wxVERTICAL );
-    m_sizer->Add(m_sizer_top, 1, wxEXPAND );
+    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
+    sizer->Add(sizer_top, 1, wxEXPAND );
 #if wxUSE_LOG
-    m_sizer->Add(m_ctrlLog, 1, wxEXPAND);
+    sizer->Add(m_ctrlLog, 2, wxEXPAND);
+    sizer->SetItemMinSize(m_ctrlLog, 450, 0);
 #endif // wxUSE_LOG
-    m_sizer->Add(0,50);
+    sizer->AddSpacer(50);
 
-    SetSizer( m_sizer );
-    m_sizer->SetSizeHints( this );
+    SetSizer(sizer);
+    sizer->SetSizeHints( this );
 
     // copy data by default but allow moving it as well
     m_moveByDefault = false;