Initial revision

[wxWidgets.git] / src / msw / bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index c7d8dd076fbceb5fc0f8b8ad6b90a28a13424504..2cee20c982d46c2aa4b7b2f8d6a4c7f8938395fd 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -39,7 +39,10 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 {
   m_buttonBitmap = bitmap;
   SetName(name);
 {
   m_buttonBitmap = bitmap;
   SetName(name);

+
+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   parent->AddChild(this);
 
 
   parent->AddChild(this);
 


@@ -172,6 +175,9 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     }
 
     BOOL ok;
     }
 
     BOOL ok;

+
+    // no MaskBlt() under Win16
+#ifdef __WIN32__

     wxMask *mask = bitmap->GetMask();
     if ( mask )
     {
     wxMask *mask = bitmap->GetMask();
     if ( mask )
     {


@@ -196,6 +202,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         ::DeleteObject(hbrBackground);
     }
     else
         ::DeleteObject(hbrBackground);
     }
     else

+#endif // Win32

     {
         ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp,  // dst
                       memDC, 0, 0,              // src
     {
         ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp,  // dst
                       memDC, 0, 0,              // src