Fix for VA 4.0

[wxWidgets.git] / samples / controls / controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 922b59d2e61e3836cb5428cf1142b08e79cef675..8fc5a7ca9f914790a01cd93a80f53132c5e74078 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -105,7 +105,7 @@ public:
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
-    void OnSpinCtrl(wxCommandEvent& event);
+    void OnSpinCtrl(wxSpinEvent& event);
 #endif // wxUSE_SPINCTRL
 
     void OnEnableAll(wxCommandEvent& event);
@@ -632,11 +632,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));
 
-#if 1
+#ifdef __WXMSW__
     // test for masked bitmap display
     bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP);
-    bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
-    (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
+    if (bitmap.Ok())
+    {
+       bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+       (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
+    }
 #endif
 
     wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
@@ -1066,7 +1069,7 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 
 #if wxUSE_SPINCTRL
 
-void MyPanel::OnSpinCtrl(wxCommandEvent& event)
+void MyPanel::OnSpinCtrl(wxSpinEvent& event)
 {
     wxString s;
     s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),