Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv12906/src/modules
Modified Files:
HtmlViewer.cpp LayoutViewer.cpp
Log Message:
compilation fixes for WXWIN_COMPATIBLITY_2_2 == 0
Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- HtmlViewer.cpp 14 Sep 2002 17:02:29 -0000 1.41
+++ HtmlViewer.cpp 6 Nov 2002 00:28:24 -0000 1.42
@@ -807,5 +807,5 @@
if ( m_bmpXFace.Ok() )
{
- wxString filename = CreateImageInMemoryFS(wxImage(m_bmpXFace));
+ wxString filename = CreateImageInMemoryFS(m_bmpXFace.ConvertToImage());
m_htmlText << "</td><td width="
<< wxString::Format("%d", m_bmpXFace.GetWidth()) << ">"
@@ -847,5 +847,5 @@
{
wxString url;
- url << "memory:" << CreateImageInMemoryFS(wxImage(icon));
+ url << "memory:" << CreateImageInMemoryFS(icon.ConvertToImage());
m_htmlText << "<a href=\"" << url << "\">"
Index: LayoutViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/LayoutViewer.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -2 -r1.26 -r1.27
--- LayoutViewer.cpp 8 Sep 2002 19:23:12 -0000 1.26
+++ LayoutViewer.cpp 6 Nov 2002 00:28:24 -0000 1.27
@@ -515,5 +515,5 @@
void LayoutViewer::InsertImage(const wxImage& image, ClickableInfo *ci)
{
- InsertAttachment(image.ConvertToBitmap(), ci);
+ InsertAttachment(wxBitmap(image), ci);
}
-------------------------------------------------------
This sf.net email is sponsored by: See the NEW Palm
Tungsten T handheld. Power & Color in a compact size!
http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0001en
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
