added wxSystemSettings::HasFrameDecorations (anybody knows a better name?)

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

diff --git a/include/wx/gtk/settings.h b/include/wx/gtk/settings.h
index 9e7db68bcdba446dfda824a381d0b301e29a2996..901678da4145a47823e72966749c5aa40a04b385 100644 (file)
--- a/include/wx/gtk/settings.h
+++ b/include/wx/gtk/settings.h
@@ -35,6 +35,9 @@ public:
 
     // Get a system metric, e.g. scrollbar size
     static int         GetSystemMetric(int index);
+
+    // Return true if the port can draw frame titlebar (i.e. doesn't need wxUniv for it)
+    static bool        HasFrameDecorations() { return TRUE; }
 };
 
 #endif

diff --git a/include/wx/gtk1/settings.h b/include/wx/gtk1/settings.h
index 9e7db68bcdba446dfda824a381d0b301e29a2996..901678da4145a47823e72966749c5aa40a04b385 100644 (file)
--- a/include/wx/gtk1/settings.h
+++ b/include/wx/gtk1/settings.h
@@ -35,6 +35,9 @@ public:
 
     // Get a system metric, e.g. scrollbar size
     static int         GetSystemMetric(int index);
+
+    // Return true if the port can draw frame titlebar (i.e. doesn't need wxUniv for it)
+    static bool        HasFrameDecorations() { return TRUE; }
 };
 
 #endif

diff --git a/include/wx/mac/settings.h b/include/wx/mac/settings.h
index 8ed994f1bab8120d636030b0c824401ce17ff36c..d274901abbbba607839f7fe54fb7c133f40b39e8 100644 (file)
--- a/include/wx/mac/settings.h
+++ b/include/wx/mac/settings.h
@@ -127,6 +127,9 @@ public:
 
     // Get a system metric, e.g. scrollbar size
     static int         GetSystemMetric(int index);
+
+    // Return true if the port can draw frame titlebar (i.e. doesn't need wxUniv for it)
+    static bool        HasFrameDecorations() { return TRUE; }
 };
 
 #endif

diff --git a/include/wx/motif/settings.h b/include/wx/motif/settings.h
index 92a61461af2219d87bb0ad10ce5e223641d582ba..2dd0d459534967ca8db8c7fbe2ac65585bb52e7b 100644 (file)
--- a/include/wx/motif/settings.h
+++ b/include/wx/motif/settings.h
@@ -36,6 +36,9 @@ public:
 
     // Get a system metric, e.g. scrollbar size
     static int         GetSystemMetric(int index);
+
+    // Return true if the port can draw frame titlebar (i.e. doesn't need wxUniv for it)
+    static bool        HasFrameDecorations() { return TRUE; }
 };
 
 #endif

diff --git a/include/wx/msw/settings.h b/include/wx/msw/settings.h
index 6402bc29e50147544183638930ab2fcd18290532..4c7c1c3561cd4c251f4f9c66f84628dec383faf5 100644 (file)
--- a/include/wx/msw/settings.h
+++ b/include/wx/msw/settings.h
@@ -33,6 +33,9 @@ public:
     // Get a system metric, e.g. scrollbar size
     static int GetSystemMetric(int index);
 
+    // Return true if the port can draw frame titlebar (i.e. doesn't need wxUniv for it)
+    static bool HasFrameDecorations() { return TRUE; }
+
 };
 
 #endif

diff --git a/include/wx/os2/settings.h b/include/wx/os2/settings.h
index 03b343faad11b7ab17171c5bf6a007b8dfb2a885..d3f75e040408b42ae138bb3d0e947f97eb2e1aa3 100644 (file)
--- a/include/wx/os2/settings.h
+++ b/include/wx/os2/settings.h
@@ -24,6 +24,7 @@ public:
     static wxColour    GetSystemColour(int index);
     static wxFont      GetSystemFont(int index);
     static int         GetSystemMetric(int index);
+    static bool        HasFrameDecorations() { return TRUE; }
 }; // end of CLASS wxSystemSettings
 
 #endif

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index 959e5f278aafb75d8dc5f655304a4116a4e1ed8c..aa67c1fafe18e273097f2f4257576c2b00d6601c 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -26,9 +26,14 @@
 #endif
 
 #include "wx/defs.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+#endif
+
 #include "wx/toplevel.h"
 #include "wx/univ/renderer.h"
-#include "wx/dcclient.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"
 #include "wx/cshelp.h"
@@ -71,9 +76,8 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
          exstyleOrig = 0;
 
     if ( ms_drawDecorations == -1 )
-        ms_drawDecorations = TRUE;
-        // FIXME_MGL -- this is temporary; we assume for now that native TLW
-        //              can't do decorations, which is not true
+        ms_drawDecorations = !wxSystemSettings::HasFrameDecorations();
+        // FIXME -- wxUniv should provide a way to force non-native decorations!
 
     if ( ms_drawDecorations )
     {