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

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index 350889ce4a047e0835ebc1d690b74192bbc5cfb3..dbd5ef01535d5223e1aba6ef539e111823fc2774 100644 (file)
--- 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.h"
 #include "card.h"
 #include "scoredg.h"

+#include "forty.xpm"

 
 #if wxUSE_HTML
 #include "wx/textfile.h"
 
 #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 __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
 #endif
 
     // Make a menu bar

diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index 33af2b8953336da349da34abc3e011ed2df04125..8a6462319132ba9483111d6e4faee1f83539e2a5 100644 (file)
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -44,7 +44,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 
     wxListBox* list = new wxListBox(
                         this, ID_LISTBOX,
 
     wxListBox* list = new wxListBox(
                         this, ID_LISTBOX,

-                        wxDefaultPosition, wxDefaultSize,
+                        wxDefaultPosition, wxSize(-1, 150),

                         0, 0,
                         wxLB_SINGLE
                         );
                         0, 0,
                         wxLB_SINGLE
                         );


@@ -76,6 +76,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
     topsizer->SetSizeHints( this );
 
     CentreOnParent();
     topsizer->SetSizeHints( this );
 
     CentreOnParent();

+
+    m_OK->SetDefault();

 }
 
 void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))
 }
 
 void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))