merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -18,6 +18,7 @@
#include "wx/button.h"
#include "wx/string.h"
#include "wx/fl/fldefs.h"
// defaults
#define NB_DEFAULT_MARGIN 2
@@ -31,8 +32,8 @@
// classes declared in this header file
class wxNewBitmapButton;
class wxBorderLessBitmapButton;
class WXFL_DECLSPEC wxNewBitmapButton;
class WXFL_DECLSPEC wxBorderLessBitmapButton;
/*
This is an alternative class to wxBitmapButton. It is used
@@ -194,11 +195,6 @@ public:
// Responds to a kill focus event.
void OnKillFocus( wxFocusEvent& event );
// Maps bitmap to current system colours on Windows
#ifdef __WXMSW__
WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
#endif
DECLARE_EVENT_TABLE()
};