implemented wxSS::GetMetric on wxGTK2 (patch 950618)

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 7c4c0ce62c6c2917c6ef8718c6819f27efe16a7d..5c24fd2e89fcbc31ed97af79de4ffb75768b3e3c 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -145,6 +145,9 @@ wxWindowBase::wxWindowBase()
     m_hasBgCol =
     m_hasFgCol =
     m_hasFont = false;
     m_hasBgCol =
     m_hasFgCol =
     m_hasFont = false;

+    m_inheritBgCol =
+    m_inheritFgCol =
+    m_inheritFont = false;

 
     // no style bits
     m_exStyle =
 
     // no style bits
     m_exStyle =


@@ -942,17 +945,17 @@ void wxWindowBase::InheritAttributes()
     // which ensures that this only happens if the user really wants it and
     // not by default which wouldn't make any sense in modern GUIs where the
     // controls don't all use the same fonts (nor colours)
     // which ensures that this only happens if the user really wants it and
     // not by default which wouldn't make any sense in modern GUIs where the
     // controls don't all use the same fonts (nor colours)

-    if ( parent->m_hasFont && !m_hasFont )
+    if ( parent->m_inheritFont && !m_hasFont )

         SetFont(parent->GetFont());
 
     // in addition, there is a possibility to explicitly forbid inheriting
     // colours at each class level by overriding ShouldInheritColours()
     if ( ShouldInheritColours() )
     {
         SetFont(parent->GetFont());
 
     // in addition, there is a possibility to explicitly forbid inheriting
     // colours at each class level by overriding ShouldInheritColours()
     if ( ShouldInheritColours() )
     {

-        if ( parent->m_hasFgCol && !m_hasFgCol )
+        if ( parent->m_inheritFgCol && !m_hasFgCol )

             SetForegroundColour(parent->GetForegroundColour());
 
             SetForegroundColour(parent->GetForegroundColour());
 

-        if ( parent->m_hasBgCol && !m_hasBgCol )
+        if ( parent->m_inheritBgCol && !m_hasBgCol )

             SetBackgroundColour(parent->GetBackgroundColour());
     }
 }
             SetBackgroundColour(parent->GetBackgroundColour());
     }
 }


@@ -1017,6 +1020,7 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
         return false;
 
     m_hasBgCol = colour.Ok();
         return false;
 
     m_hasBgCol = colour.Ok();

+    m_inheritBgCol = m_hasBgCol;

     m_backgroundColour = colour;
     SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() );
     return true;
     m_backgroundColour = colour;
     SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() );
     return true;


@@ -1028,6 +1032,7 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour )
         return false;
 
     m_hasFgCol = colour.Ok();
         return false;
 
     m_hasFgCol = colour.Ok();

+    m_inheritFgCol = m_hasFgCol;

     m_foregroundColour = colour;
     SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
     return true;
     m_foregroundColour = colour;
     SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
     return true;


@@ -1075,6 +1080,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
 
     m_font = font;
     m_hasFont = font.Ok();
 
     m_font = font;
     m_hasFont = font.Ok();

+    m_inheritFont = m_hasFont;

 
     return true;
 }
 
     return true;
 }