From 556921dc4e22f1a70f5bb179702c5dcb67a391b0 Mon Sep 17 00:00:00 2001 From: Michael Bedward Date: Tue, 21 Sep 1999 05:32:59 +0000 Subject: [PATCH] Ifdef'd out sample code for wxStaticBitmap. It's not working under wxMOTIF at the moment. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/controls/controls.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 00c1f53a1e..55d24885bb 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -477,12 +477,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); panel = new wxPanel(m_notebook); + +#ifndef __WXMOTIF__ // wxStaticBitmap not working under Motif yet. MB wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10)); bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10)); bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION)); - +#endif + wxBitmap bitmap( 100, 100 ); wxMemoryDC dc; dc.SelectObject( bitmap );