support for sys-opted window variant

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 3a0b1e7d523e79255b4c597a50f9c3daad245989..825294129642d8cfa7df1b3314cf471ed89d68da 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -102,6 +102,10 @@ enum wxWindowVariant
     wxWINDOW_VARIANT_MAX
 };
 
     wxWINDOW_VARIANT_MAX
 };
 

+#if wxUSE_SYSTEM_OPTIONS
+    #define wxWINDOW_DEFAULT_VARIANT wxT("window-default-variant")
+#endif
+

 // ----------------------------------------------------------------------------
 // (pseudo)template list classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // (pseudo)template list classes
 // ----------------------------------------------------------------------------

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index c4fba2a8abe3bbbe6450409ba0c38725c2c4c53e..f2b0a67a0bf9c2dd6446035842904b4a48b4ed92 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -77,6 +77,10 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

+#if wxUSE_SYSTEM_OPTIONS
+       #include "wx/sysopt.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------


@@ -193,6 +197,12 @@ wxWindowBase::wxWindowBase()
     m_maxVirtualHeight = wxDefaultCoord;
 
     m_windowVariant = wxWINDOW_VARIANT_NORMAL;
     m_maxVirtualHeight = wxDefaultCoord;
 
     m_windowVariant = wxWINDOW_VARIANT_NORMAL;

+#if wxUSE_SYSTEM_OPTIONS
+    if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) )
+    {
+       m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ;
+    }
+#endif

 
     // Whether we're using the current theme for this window (wxGTK only for now)
     m_themeEnabled = false;
 
     // Whether we're using the current theme for this window (wxGTK only for now)
     m_themeEnabled = false;