cleanup - reformatting

[wxWidgets.git] / contrib / src / stc / stc.cpp

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index b003480d48b570c671cb09d6ca3f5508854fb17c..ccf561d44cc63944bb3a8ace4ef82a049392e48a 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -17,11 +17,11 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#include <wx/wx.h>
-#include <wx/tokenzr.h>
-#include <wx/mstream.h>
-#include <wx/image.h>
-#include <wx/file.h>
+#include "wx/wx.h"
+#include "wx/tokenzr.h"
+#include "wx/mstream.h"
+#include "wx/image.h"
+#include "wx/file.h"

 
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"


@@ -517,6 +517,8 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();

+        if (img.HasAlpha())
+            img.ConvertAlphaToMask();

         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];


@@ -896,6 +898,8 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();

+        if (img.HasAlpha())
+            img.ConvertAlphaToMask();

         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];


@@ -2529,7 +2533,7 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     bool           bold     = font.GetWeight() == wxBOLD;
     bool           italic   = font.GetStyle() != wxNORMAL;
     bool           under    = font.GetUnderlined();
     bool           bold     = font.GetWeight() == wxBOLD;
     bool           italic   = font.GetStyle() != wxNORMAL;
     bool           under    = font.GetUnderlined();

-    wxFontEncoding encoding = font.GetDefaultEncoding();
+    wxFontEncoding encoding = font.GetEncoding();

     
     StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
     
     StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }