X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d965bcda31851460b34d491706e1d6b589eb1dd1..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/graphics.cpp

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 98134fb42f..8f1844b093 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -89,23 +89,15 @@ inline StringFormat* GetDrawTextStringFormat()
 {
     if ( !gs_drawTextStringFormat )
     {
-        // We create this string format with exactly the same flags as
-        // StringFormat::GenericTypographic() is documented to use in MSDN
-        // except for the last one which doesn't make any difference for
-        // DrawText() but that we do want to use when measuring text.
-        //
-        // The reason for not just using GenericTypographic itself is that it
-        // does something else (what exactly is unfortunately not documented),
-        // which results in string being displayed quite differently from the
-        // default rendering, see #14537.
-        gs_drawTextStringFormat
-            = new StringFormat
-                  (
-                    StringFormatFlagsLineLimit |
-                    StringFormatFlagsNoClip |
-                    StringFormatFlagsNoFitBlackBox |
-                    StringFormatFlagsMeasureTrailingSpaces
-                  );
+        gs_drawTextStringFormat = new StringFormat(StringFormat::GenericTypographic());
+
+        // This doesn't make any difference for DrawText() actually but we want
+        // this behaviour when measuring text.
+        gs_drawTextStringFormat->SetFormatFlags
+        (
+            gs_drawTextStringFormat->GetFormatFlags()
+                | StringFormatFlagsMeasureTrailingSpaces
+        );
     }
 
     return gs_drawTextStringFormat;
@@ -2291,6 +2283,12 @@ wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bit
 class wxGDIPlusRendererModule : public wxModule
 {
 public:
+    wxGDIPlusRendererModule()
+    {
+        // We must be uninitialized before GDI+ DLL itself is unloaded.
+        AddDependency("wxGdiPlusModule");
+    }
+
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {