Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you

Browse Source 
must recompile everything after upgrading!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-25 13:28:52 +00:00
parent d069d02e1e
commit 47d67540a0
166 changed files with 1374 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/bitmap.cpp
View File

@@ -36,7 +36,7 @@
#include "assert.h"
#if USE_XPM_IN_MSW
#if wxUSE_XPM_IN_MSW
#define FOR_MSW 1
#include "../../contrib/wxxpm/libxpm.34b/lib/xpm34.h"
#endif
@@ -168,7 +168,7 @@ wxBitmap::wxBitmap(const wxString& filename, long type)
wxTheBitmapList->AddBitmap(this);
}
#if USE_XPM_IN_MSW
#if wxUSE_XPM_IN_MSW
// Create from data
wxBitmap::wxBitmap(const char **data, wxItem *WXUNUSED(anItem))
{
@@ -642,7 +642,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
#if USE_IMAGE_LOADING_IN_MSW
#if wxUSE_IMAGE_LOADING_IN_MSW
wxPalette *palette = NULL;
bool success = FALSE;
/*
@@ -666,7 +666,7 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
{
#if USE_IMAGE_LOADING_IN_MSW
#if wxUSE_IMAGE_LOADING_IN_MSW
wxPalette *actualPalette = (wxPalette *)pal;
if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull()))
actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette);
@@ -696,7 +696,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
#if USE_XPM_IN_MSW
#if wxUSE_XPM_IN_MSW
XImage *ximage;
XpmAttributes xpmAttr;
HDC dc;
@@ -738,7 +738,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
{
#if USE_XPM_IN_MSW
#if wxUSE_XPM_IN_MSW
HDC dc = NULL;
Visual *visual = NULL;
@@ -788,7 +788,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
{
#if USE_XPM_IN_MSW
#if wxUSE_XPM_IN_MSW
XImage *ximage;
int ErrorStatus;
XpmAttributes xpmAttr;