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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 00c1f53a1ef865786799d3c6be6792b4dd8a425e..55d24885bb9697f8dba9076e088ee75f9494dc41 100644 (file)
--- 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);
     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));
     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 );
     wxBitmap bitmap( 100, 100 );
     wxMemoryDC dc;
     dc.SelectObject( bitmap );