From 058eaf82853fbb289389921351610314ba782d89 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 9 Apr 2003 00:02:28 +0000
Subject: [PATCH] Fix VC6 compile errors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/src/stc/PlatWX.cpp   | 3 ++-
 contrib/src/stc/gen_iface.py | 6 ++++--
 contrib/src/stc/stc.cpp      | 8 ++++++--
 contrib/src/stc/stc.cpp.in   | 2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index b6d9323ae4..5297a9adf6 100644
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -10,7 +10,8 @@
 #include <wx/encconv.h>
 #include <wx/listctrl.h>
 #include <wx/mstream.h>
-
+#include <wx/image.h>
+#include <wx/imaglist.h>
 
 #include "Platform.h"
 #include "PlatWX.h"
diff --git a/contrib/src/stc/gen_iface.py b/contrib/src/stc/gen_iface.py
index e22ad2346e..d83f97aa27 100644
--- a/contrib/src/stc/gen_iface.py
+++ b/contrib/src/stc/gen_iface.py
@@ -186,7 +186,8 @@ methodOverrideMap = {
      '''void %s(int markerNumber, const wxBitmap& bmp) {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
-        wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM);
+        wxImage img = bmp.ConvertToImage();
+        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
@@ -279,7 +280,8 @@ methodOverrideMap = {
      '''void %s(int type, const wxBitmap& bmp) {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
-        wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM);
+        wxImage img = bmp.ConvertToImage();
+        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 84c2558a02..6349ed51da 100644
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -20,8 +20,10 @@
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 
+#include <wx/wx.h>
 #include <wx/tokenzr.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) {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
-        wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM);
+        wxImage img = bmp.ConvertToImage();
+        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
@@ -837,7 +840,8 @@ bool wxStyledTextCtrl::AutoCompGetDropRestOfWord() {
 void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
-        wxImage(bmp).SaveFile(strm, wxBITMAP_TYPE_XPM);
+        wxImage img = bmp.ConvertToImage();
+        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         strm.CopyTo(buff, len);
diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index c7895e1f41..0eba26c436 100644
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -20,8 +20,10 @@
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 
+#include <wx/wx.h>
 #include <wx/tokenzr.h>
 #include <wx/mstream.h>
+#include <wx/image.h>
 
 
 //----------------------------------------------------------------------