Allow an extra flag to be given to Font::Create

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/scintilla/include/Platform.h b/contrib/src/stc/scintilla/include/Platform.h
index 876402416880395d56f9f0b42794400b364d3812..279a3df3ed5cfc6e7014634ad922da9a30fd7d05 100644 (file)
--- a/contrib/src/stc/scintilla/include/Platform.h
+++ b/contrib/src/stc/scintilla/include/Platform.h
@@ -284,7 +284,7 @@ public:
        Font();
        virtual ~Font();
 
        Font();
        virtual ~Font();
 

-       virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic);
+       virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag=false);

        virtual void Release();
 
        FontID GetID() { return id; }
        virtual void Release();
 
        FontID GetID() { return id; }

diff --git a/contrib/src/stc/scintilla/src/Style.cxx b/contrib/src/stc/scintilla/src/Style.cxx
index c37bcac90045a49e44b4cc0347f117239e3412d7..2aea5fef98b42c9dd5e4c4eb28a0cde878ee27cb 100644 (file)
--- a/contrib/src/stc/scintilla/src/Style.cxx
+++ b/contrib/src/stc/scintilla/src/Style.cxx
@@ -122,7 +122,7 @@ bool Style::EquivalentFontTo(const Style *other) const {
        return strcmp(fontName, other->fontName) == 0;
 }
 
        return strcmp(fontName, other->fontName) == 0;
 }
 

-void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle) {
+void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, bool extraFontFlag) {

        sizeZoomed = size + zoomLevel;
        if (sizeZoomed <= 2)    // Hangs if sizeZoomed <= 1
                sizeZoomed = 2;
        sizeZoomed = size + zoomLevel;
        if (sizeZoomed <= 2)    // Hangs if sizeZoomed <= 1
                sizeZoomed = 2;


@@ -137,7 +137,7 @@ void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle) {
        if (aliasOfDefaultFont) {
                font.SetID(defaultStyle->font.GetID());
        } else if (fontName) {
        if (aliasOfDefaultFont) {
                font.SetID(defaultStyle->font.GetID());
        } else if (fontName) {

-               font.Create(fontName, characterSet, deviceHeight, bold, italic);
+               font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);

        } else {
                font.SetID(0);
        }
        } else {
                font.SetID(0);
        }

diff --git a/contrib/src/stc/scintilla/src/Style.h b/contrib/src/stc/scintilla/src/Style.h
index 6ee930b6bbd1ec6e8090f191dd24e2f812f0e496..bb94c25ef5716889cfc704b3b496ce3ecc0861ac 100644 (file)
--- a/contrib/src/stc/scintilla/src/Style.h
+++ b/contrib/src/stc/scintilla/src/Style.h
@@ -49,7 +49,7 @@ public:
                   bool visible_, bool changeable_, bool hotspot_);
        void ClearTo(const Style &source);
        bool EquivalentFontTo(const Style *other) const;
                   bool visible_, bool changeable_, bool hotspot_);
        void ClearTo(const Style &source);
        bool EquivalentFontTo(const Style *other) const;

-       void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0);
+       void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, bool extraFontFlag = false);

        bool IsProtected() const { return !(changeable && visible);};
 };
 
        bool IsProtected() const { return !(changeable && visible);};
 };
 

diff --git a/contrib/src/stc/scintilla/src/ViewStyle.cxx b/contrib/src/stc/scintilla/src/ViewStyle.cxx
index e2a65e09e4c685d64770401cfaa90710275a5105..80e8fc8a0dcd7158430a1e9451efda40e6ced6a2 100644 (file)
--- a/contrib/src/stc/scintilla/src/ViewStyle.cxx
+++ b/contrib/src/stc/scintilla/src/ViewStyle.cxx
@@ -111,6 +111,7 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
        viewIndentationGuides = source.viewIndentationGuides;
        viewEOL = source.viewEOL;
        showMarkedLines = source.showMarkedLines;
        viewIndentationGuides = source.viewIndentationGuides;
        viewEOL = source.viewEOL;
        showMarkedLines = source.showMarkedLines;

+        extraFontFlag = source.extraFontFlag;

 }
 
 ViewStyle::~ViewStyle() {
 }
 
 ViewStyle::~ViewStyle() {


@@ -192,6 +193,7 @@ void ViewStyle::Init() {
        viewIndentationGuides = false;
        viewEOL = false;
        showMarkedLines = true;
        viewIndentationGuides = false;
        viewEOL = false;
        showMarkedLines = true;

+        extraFontFlag = false;

 }
 
 void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 }
 
 void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {


@@ -227,13 +229,13 @@ void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 void ViewStyle::Refresh(Surface &surface) {
        selbar.desired = Platform::Chrome();
        selbarlight.desired = Platform::ChromeHighlight();
 void ViewStyle::Refresh(Surface &surface) {
        selbar.desired = Platform::Chrome();
        selbarlight.desired = Platform::ChromeHighlight();

-       styles[STYLE_DEFAULT].Realise(surface, zoomLevel);
+       styles[STYLE_DEFAULT].Realise(surface, zoomLevel, NULL, extraFontFlag);

        maxAscent = styles[STYLE_DEFAULT].ascent;
        maxDescent = styles[STYLE_DEFAULT].descent;
        someStylesProtected = false;
        for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
                if (i != STYLE_DEFAULT) {
        maxAscent = styles[STYLE_DEFAULT].ascent;
        maxDescent = styles[STYLE_DEFAULT].descent;
        someStylesProtected = false;
        for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
                if (i != STYLE_DEFAULT) {

-                       styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT]);
+                       styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT], extraFontFlag);

                        if (maxAscent < styles[i].ascent)
                                maxAscent = styles[i].ascent;
                        if (maxDescent < styles[i].descent)
                        if (maxAscent < styles[i].ascent)
                                maxAscent = styles[i].ascent;
                        if (maxDescent < styles[i].descent)

diff --git a/contrib/src/stc/scintilla/src/ViewStyle.h b/contrib/src/stc/scintilla/src/ViewStyle.h
index 5f27cc08cb33fbf583336a1647c5ae91f7a45d95..79d885fd9f7f7decf94abe9d2583e5d478f94cbd 100644 (file)
--- a/contrib/src/stc/scintilla/src/ViewStyle.h
+++ b/contrib/src/stc/scintilla/src/ViewStyle.h
@@ -89,7 +89,8 @@ public:
        int edgeState;
        int caretWidth;
        bool someStylesProtected;
        int edgeState;
        int caretWidth;
        bool someStylesProtected;

-
+        bool extraFontFlag;
+    

        ViewStyle();
        ViewStyle(const ViewStyle &source);
        ~ViewStyle();
        ViewStyle();
        ViewStyle(const ViewStyle &source);
        ~ViewStyle();

diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index 876402416880395d56f9f0b42794400b364d3812..279a3df3ed5cfc6e7014634ad922da9a30fd7d05 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -284,7 +284,7 @@ public:
        Font();
        virtual ~Font();
 
        Font();
        virtual ~Font();
 

-       virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic);
+       virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag=false);

        virtual void Release();
 
        FontID GetID() { return id; }
        virtual void Release();
 
        FontID GetID() { return id; }

diff --git a/src/stc/scintilla/src/Style.cxx b/src/stc/scintilla/src/Style.cxx
index c37bcac90045a49e44b4cc0347f117239e3412d7..2aea5fef98b42c9dd5e4c4eb28a0cde878ee27cb 100644 (file)
--- a/src/stc/scintilla/src/Style.cxx
+++ b/src/stc/scintilla/src/Style.cxx
@@ -122,7 +122,7 @@ bool Style::EquivalentFontTo(const Style *other) const {
        return strcmp(fontName, other->fontName) == 0;
 }
 
        return strcmp(fontName, other->fontName) == 0;
 }
 

-void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle) {
+void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, bool extraFontFlag) {

        sizeZoomed = size + zoomLevel;
        if (sizeZoomed <= 2)    // Hangs if sizeZoomed <= 1
                sizeZoomed = 2;
        sizeZoomed = size + zoomLevel;
        if (sizeZoomed <= 2)    // Hangs if sizeZoomed <= 1
                sizeZoomed = 2;


@@ -137,7 +137,7 @@ void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle) {
        if (aliasOfDefaultFont) {
                font.SetID(defaultStyle->font.GetID());
        } else if (fontName) {
        if (aliasOfDefaultFont) {
                font.SetID(defaultStyle->font.GetID());
        } else if (fontName) {

-               font.Create(fontName, characterSet, deviceHeight, bold, italic);
+               font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);

        } else {
                font.SetID(0);
        }
        } else {
                font.SetID(0);
        }

diff --git a/src/stc/scintilla/src/Style.h b/src/stc/scintilla/src/Style.h
index 6ee930b6bbd1ec6e8090f191dd24e2f812f0e496..bb94c25ef5716889cfc704b3b496ce3ecc0861ac 100644 (file)
--- a/src/stc/scintilla/src/Style.h
+++ b/src/stc/scintilla/src/Style.h
@@ -49,7 +49,7 @@ public:
                   bool visible_, bool changeable_, bool hotspot_);
        void ClearTo(const Style &source);
        bool EquivalentFontTo(const Style *other) const;
                   bool visible_, bool changeable_, bool hotspot_);
        void ClearTo(const Style &source);
        bool EquivalentFontTo(const Style *other) const;

-       void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0);
+       void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, bool extraFontFlag = false);

        bool IsProtected() const { return !(changeable && visible);};
 };
 
        bool IsProtected() const { return !(changeable && visible);};
 };
 

diff --git a/src/stc/scintilla/src/ViewStyle.cxx b/src/stc/scintilla/src/ViewStyle.cxx
index e2a65e09e4c685d64770401cfaa90710275a5105..80e8fc8a0dcd7158430a1e9451efda40e6ced6a2 100644 (file)
--- a/src/stc/scintilla/src/ViewStyle.cxx
+++ b/src/stc/scintilla/src/ViewStyle.cxx
@@ -111,6 +111,7 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
        viewIndentationGuides = source.viewIndentationGuides;
        viewEOL = source.viewEOL;
        showMarkedLines = source.showMarkedLines;
        viewIndentationGuides = source.viewIndentationGuides;
        viewEOL = source.viewEOL;
        showMarkedLines = source.showMarkedLines;

+        extraFontFlag = source.extraFontFlag;

 }
 
 ViewStyle::~ViewStyle() {
 }
 
 ViewStyle::~ViewStyle() {


@@ -192,6 +193,7 @@ void ViewStyle::Init() {
        viewIndentationGuides = false;
        viewEOL = false;
        showMarkedLines = true;
        viewIndentationGuides = false;
        viewEOL = false;
        showMarkedLines = true;

+        extraFontFlag = false;

 }
 
 void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 }
 
 void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {


@@ -227,13 +229,13 @@ void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 void ViewStyle::Refresh(Surface &surface) {
        selbar.desired = Platform::Chrome();
        selbarlight.desired = Platform::ChromeHighlight();
 void ViewStyle::Refresh(Surface &surface) {
        selbar.desired = Platform::Chrome();
        selbarlight.desired = Platform::ChromeHighlight();

-       styles[STYLE_DEFAULT].Realise(surface, zoomLevel);
+       styles[STYLE_DEFAULT].Realise(surface, zoomLevel, NULL, extraFontFlag);

        maxAscent = styles[STYLE_DEFAULT].ascent;
        maxDescent = styles[STYLE_DEFAULT].descent;
        someStylesProtected = false;
        for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
                if (i != STYLE_DEFAULT) {
        maxAscent = styles[STYLE_DEFAULT].ascent;
        maxDescent = styles[STYLE_DEFAULT].descent;
        someStylesProtected = false;
        for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
                if (i != STYLE_DEFAULT) {

-                       styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT]);
+                       styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT], extraFontFlag);

                        if (maxAscent < styles[i].ascent)
                                maxAscent = styles[i].ascent;
                        if (maxDescent < styles[i].descent)
                        if (maxAscent < styles[i].ascent)
                                maxAscent = styles[i].ascent;
                        if (maxDescent < styles[i].descent)

diff --git a/src/stc/scintilla/src/ViewStyle.h b/src/stc/scintilla/src/ViewStyle.h
index 5f27cc08cb33fbf583336a1647c5ae91f7a45d95..79d885fd9f7f7decf94abe9d2583e5d478f94cbd 100644 (file)
--- a/src/stc/scintilla/src/ViewStyle.h
+++ b/src/stc/scintilla/src/ViewStyle.h
@@ -89,7 +89,8 @@ public:
        int edgeState;
        int caretWidth;
        bool someStylesProtected;
        int edgeState;
        int caretWidth;
        bool someStylesProtected;

-
+        bool extraFontFlag;
+    

        ViewStyle();
        ViewStyle(const ViewStyle &source);
        ~ViewStyle();
        ViewStyle();
        ViewStyle(const ViewStyle &source);
        ~ViewStyle();