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
This commit is contained in:
@@ -26,6 +26,7 @@
|
|||||||
#include "forty.h"
|
#include "forty.h"
|
||||||
#include "card.h"
|
#include "card.h"
|
||||||
#include "scoredg.h"
|
#include "scoredg.h"
|
||||||
|
#include "forty.xpm"
|
||||||
|
|
||||||
#if wxUSE_HTML
|
#if wxUSE_HTML
|
||||||
#include "wx/textfile.h"
|
#include "wx/textfile.h"
|
||||||
@@ -141,9 +142,7 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
|
|||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
SetIcon(wxIcon(_T("CardsIcon")));
|
SetIcon(wxIcon(_T("CardsIcon")));
|
||||||
#else
|
#else
|
||||||
#ifdef GTK_TBD
|
SetIcon(wxIcon(forty_xpm));
|
||||||
SetIcon(wxIcon(Cards_bits, Cards_width, Cards_height));
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Make a menu bar
|
// Make a menu bar
|
||||||
|
@@ -44,7 +44,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
|
|||||||
|
|
||||||
wxListBox* list = new wxListBox(
|
wxListBox* list = new wxListBox(
|
||||||
this, ID_LISTBOX,
|
this, ID_LISTBOX,
|
||||||
wxDefaultPosition, wxDefaultSize,
|
wxDefaultPosition, wxSize(-1, 150),
|
||||||
0, 0,
|
0, 0,
|
||||||
wxLB_SINGLE
|
wxLB_SINGLE
|
||||||
);
|
);
|
||||||
@@ -76,6 +76,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
|
|||||||
topsizer->SetSizeHints( this );
|
topsizer->SetSizeHints( this );
|
||||||
|
|
||||||
CentreOnParent();
|
CentreOnParent();
|
||||||
|
|
||||||
|
m_OK->SetDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))
|
void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||||
|
Reference in New Issue
Block a user