/////////////////////////////////////////////////////////////////////////////
-// Name: univ/bmpbuttn.cpp
+// Name: src/univ/bmpbuttn.cpp
// Purpose: wxBitmapButton implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 25.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "bmpbuttn.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_BMPBUTTON
+#include "wx/bmpbuttn.h"
+
#ifndef WX_PRECOMP
#include "wx/dc.h"
- #include "wx/bmpbuttn.h"
#include "wx/validate.h"
#endif
const wxValidator& validator,
const wxString &name)
{
- if ( !wxButton::Create(parent, id, bitmap, _T(""),
- pos, size, style, validator, name) )
- return FALSE;
+ // we add wxBU_EXACTFIT because the bitmap buttons are not the standard
+ // ones and so shouldn't be forced to be of the standard size which is
+ // typically too big for them
+ if ( !wxButton::Create(parent, id, bitmap, wxEmptyString,
+ pos, size, style | wxBU_EXACTFIT, validator, name) )
+ return false;
m_bmpNormal = bitmap;
- return TRUE;
+ return true;
}
void wxBitmapButton::OnSetBitmap()
{
m_bitmap = bitmap;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxBitmapButton::Enable(bool enable)
{
if ( !wxButton::Enable(enable) )
- return FALSE;
+ return false;
if ( !enable && ChangeBitmap(m_bmpDisabled) )
Refresh();
- return TRUE;
+ return true;
}
bool wxBitmapButton::SetCurrent(bool doit)
}
#endif // wxUSE_BMPBUTTON
-