Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-15 13:49:22 +00:00
parent d896a793a0
commit 6463b9f539
119 changed files with 267 additions and 1088 deletions

View File

@@ -362,47 +362,6 @@ wxBitmap::~wxBitmap()
{
}
wxBitmap::wxBitmap()
{
Init();
}
wxBitmap::wxBitmap(const wxBitmap& bitmap)
{
Init();
Ref(bitmap);
}
wxBitmap::wxBitmap(const char **data)
{
CreateFromXpm(data);
}
wxBitmap::wxBitmap(char **data)
{
CreateFromXpm((const char **)data);
}
#if wxUSE_IMAGE
wxBitmap::wxBitmap(const wxImage& image, int depth)
{
(void)CreateFromImage(image, depth);
}
wxBitmap::wxBitmap(const wxImage& image, const wxDC& dc)
{
(void)CreateFromImage(image, dc);
}
#endif // wxUSE_IMAGE
wxBitmap::wxBitmap(const wxIcon& icon)
{
Init();
CopyFromIcon(icon);
}
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
Init();