Applied toolbar patch for wxTB_RIGHT support (patch #1595081).

[wxWidgets.git] / src / msw / statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index df9cec55e2292ce64017570ceff2208afded3095..010c6d822c0543364580078fcb4d112c1b88ce63 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -29,7 +29,6 @@
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h"

     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"


@@ -41,6 +40,7 @@
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -455,7 +455,8 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
         // now draw the text
         if ( !rtl )
         {
         // now draw the text
         if ( !rtl )
         {

-            ::DrawText(hdc, label, label.length(), &dimensions,
+            RECT rc2 = { x, 0, x + width, y };
+            ::DrawText(hdc, label, label.length(), &rc2,

                        DT_SINGLELINE | DT_VCENTER);
         }
         else // RTL
                        DT_SINGLELINE | DT_VCENTER);
         }
         else // RTL