revert r59246; the window parameter was there by purpose (i.e. for consistency with...

[wxWidgets.git] / demos / forty / forty.cpp

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index 350889ce4a047e0835ebc1d690b74192bbc5cfb3..24902505bb0ad9d3b105a5cc884a7377a9042050 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


@@ -196,11 +195,12 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( m_canvas, 1, wxEXPAND | wxALL, 0);
     SetSizer( topsizer );
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( m_canvas, 1, wxEXPAND | wxALL, 0);
     SetSizer( topsizer );

-    topsizer->SetSizeHints( this );

 
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR

+
+    topsizer->SetSizeHints( this );

 }
 
 void FortyFrame::OnCloseWindow(wxCloseEvent& event)
 }
 
 void FortyFrame::OnCloseWindow(wxCloseEvent& event)