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

mingw32 compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-26 09:53:35 +00:00
parent f048e32fcd
commit 10a0bdb193
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/control.h
View File

@@ -16,6 +16,8 @@
#pragma interface "control.h" #pragma interface "control.h"
#endif #endif
#include "wx/dynarray.h"
// General item class // General item class
class WXDLLEXPORT wxControl : public wxControlBase class WXDLLEXPORT wxControl : public wxControlBase
{ {

2
include/wx/msw/gdiimage.h
View File

@@ -21,6 +21,8 @@
#endif #endif
#include "wx/gdiobj.h" // base class #include "wx/gdiobj.h" // base class
#include "wx/gdicmn.h" // wxBITMAP_TYPE_INVALID
#include "wx/list.h"
class WXDLLEXPORT wxGDIImageRefData; class WXDLLEXPORT wxGDIImageRefData;
class WXDLLEXPORT wxGDIImageHandler; class WXDLLEXPORT wxGDIImageHandler;

24
src/msw/xpmhand.cpp
View File

@@ -21,8 +21,6 @@
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
#include "wx/list.h" #include "wx/list.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/app.h" #include "wx/app.h"
@@ -35,8 +33,6 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/log.h" #include "wx/log.h"
#include "assert.h"
#if wxUSE_XPM_IN_MSW #if wxUSE_XPM_IN_MSW
#define FOR_MSW 1 #define FOR_MSW 1
#include "../xpm/xpm34.h" #include "../xpm/xpm34.h"
@@ -45,6 +41,8 @@
#include "wx/xpmhand.h" #include "wx/xpmhand.h"
#include "wx/msw/dib.h" #include "wx/msw/dib.h"
#if wxUSE_XPM_IN_MSW
static void XpmToBitmap(wxBitmap *bitmap, static void XpmToBitmap(wxBitmap *bitmap,
const XImage *ximage, const XImage *ximage,
const XpmAttributes& xpmAttr) const XpmAttributes& xpmAttr)
@@ -64,9 +62,13 @@ static void XpmToBitmap(wxBitmap *bitmap,
refData->m_numColors = xpmAttr.npixels; refData->m_numColors = xpmAttr.npixels;
} }
#endif // wxUSE_XPM_IN_MSW
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
const wxString& name,
long flags,
int desiredWidth, int desiredHeight) int desiredWidth, int desiredHeight)
{ {
#if wxUSE_XPM_IN_MSW #if wxUSE_XPM_IN_MSW
@@ -99,7 +101,10 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
return FALSE; return FALSE;
} }
bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap,
const wxString& name,
int type,
const wxPalette *palette)
{ {
#if wxUSE_XPM_IN_MSW #if wxUSE_XPM_IN_MSW
HDC dc = NULL; HDC dc = NULL;
@@ -138,7 +143,12 @@ bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth) bool wxXPMDataHandler::Create(wxBitmap *bitmap,
void *data,
long flags,
int width,
int height,
int depth)
{ {
#if wxUSE_XPM_IN_MSW #if wxUSE_XPM_IN_MSW
XImage *ximage; XImage *ximage;