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

Fix VC6 compile errors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-09 00:02:28 +00:00
parent 09aceb98d9
commit 058eaf8285
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/src/stc/PlatWX.cpp
View File

@@ -10,7 +10,8 @@
#include <wx/encconv.h> #include <wx/encconv.h>
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include <wx/mstream.h> #include <wx/mstream.h>
#include <wx/image.h>
#include <wx/imaglist.h>
#include "Platform.h" #include "Platform.h"
#include "PlatWX.h" #include "PlatWX.h"

6
contrib/src/stc/gen_iface.py
View File

@@ -186,7 +186,8 @@ methodOverrideMap = {
'''void %s(int markerNumber, const wxBitmap& bmp) { '''void %s(int markerNumber, const wxBitmap& bmp) {
// convert bmp to a xpm in a string // convert bmp to a xpm in a string
wxMemoryOutputStream strm; wxMemoryOutputStream strm;
wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM); wxImage img = bmp.ConvertToImage();
img.SaveFile(strm, wxBITMAP_TYPE_XPM);
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);
@@ -279,7 +280,8 @@ methodOverrideMap = {
'''void %s(int type, const wxBitmap& bmp) { '''void %s(int type, const wxBitmap& bmp) {
// convert bmp to a xpm in a string // convert bmp to a xpm in a string
wxMemoryOutputStream strm; wxMemoryOutputStream strm;
wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM); wxImage img = bmp.ConvertToImage();
img.SaveFile(strm, wxBITMAP_TYPE_XPM);
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);

8
contrib/src/stc/stc.cpp
View File

@@ -20,8 +20,10 @@
#include "wx/stc/stc.h" #include "wx/stc/stc.h"
#include "ScintillaWX.h" #include "ScintillaWX.h"
#include <wx/wx.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/mstream.h> #include <wx/mstream.h>
#include <wx/image.h>
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -460,7 +462,8 @@ int wxStyledTextCtrl::MarkerPrevious(int lineStart, int markerMask) {
void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp) { void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp) {
// convert bmp to a xpm in a string // convert bmp to a xpm in a string
wxMemoryOutputStream strm; wxMemoryOutputStream strm;
wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM); wxImage img = bmp.ConvertToImage();
img.SaveFile(strm, wxBITMAP_TYPE_XPM);
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);
@@ -837,7 +840,8 @@ bool wxStyledTextCtrl::AutoCompGetDropRestOfWord() {
void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) { void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
// convert bmp to a xpm in a string // convert bmp to a xpm in a string
wxMemoryOutputStream strm; wxMemoryOutputStream strm;
wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM); wxImage img = bmp.ConvertToImage();
img.SaveFile(strm, wxBITMAP_TYPE_XPM);
size_t len = strm.GetSize(); size_t len = strm.GetSize();
char* buff = new char[len+1]; char* buff = new char[len+1];
strm.CopyTo(buff, len); strm.CopyTo(buff, len);

2
contrib/src/stc/stc.cpp.in
View File

@@ -20,8 +20,10 @@
#include "wx/stc/stc.h" #include "wx/stc/stc.h"
#include "ScintillaWX.h" #include "ScintillaWX.h"
#include <wx/wx.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/mstream.h> #include <wx/mstream.h>
#include <wx/image.h>
//---------------------------------------------------------------------- //----------------------------------------------------------------------