From cbf3565d62c8de1f813dcaea573ce3f1da8bb7d1 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Sat, 13 Dec 2003 09:55:50 +0000 Subject: [PATCH] Quick fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/controls/controls.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index d2f3693dfd..6db8d56732 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -8,10 +8,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "controls.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -1567,7 +1563,9 @@ MyFrame::MyFrame(const wxChar *title, int x, int y) // The wxICON() macros loads an icon from a resource under Windows // and uses an #included XPM image under GTK+ and Motif +#ifdef USE_XPM SetIcon( wxICON(mondrian) ); +#endif wxMenu *file_menu = new wxMenu; -- 2.45.2