From 68ca12fef650ce4622e05ba4eb21a7aa23849107 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 3 Dec 2007 09:44:41 +0000
Subject: [PATCH] Fixed player dialog listbox size and app icon on wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 demos/forty/forty.cpp    | 5 ++---
 demos/forty/playerdg.cpp | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index 350889ce4a..dbd5ef0153 100644
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -26,6 +26,7 @@
 #include "forty.h"
 #include "card.h"
 #include "scoredg.h"
+#include "forty.xpm"
 
 #if wxUSE_HTML
 #include "wx/textfile.h"
@@ -141,9 +142,7 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
 #ifdef __WXMSW__
     SetIcon(wxIcon(_T("CardsIcon")));
 #else
-#ifdef GTK_TBD
-    SetIcon(wxIcon(Cards_bits, Cards_width, Cards_height));
-#endif
+    SetIcon(wxIcon(forty_xpm));
 #endif
 
     // Make a menu bar
diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index 33af2b8953..8a64623191 100644
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -44,7 +44,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 
     wxListBox* list = new wxListBox(
                         this, ID_LISTBOX,
-                        wxDefaultPosition, wxDefaultSize,
+                        wxDefaultPosition, wxSize(-1, 150),
                         0, 0,
                         wxLB_SINGLE
                         );
@@ -76,6 +76,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
     topsizer->SetSizeHints( this );
 
     CentreOnParent();
+
+    m_OK->SetDefault();
 }
 
 void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))
-- 
2.45.2