]> git.saurik.com Git - wxWidgets.git/commitdiff
Add status bar styles mapping to MSW styles broken by recent changes.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 22 Nov 2010 12:48:42 +0000 (12:48 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 22 Nov 2010 12:48:42 +0000 (12:48 +0000)
SBARS_SIZEGRIP and CCS_TOP should be added to the normal style, not the
extended one. This restores the behaviour broken by r66227.

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

src/msw/statusbar.cpp

index a6b42bac5a47f15e4b5655b6b3a6765b6a641695..9df8eb782a8bd11509769fb8fe5166eac790d46d 100644 (file)
@@ -103,14 +103,14 @@ WXDWORD wxStatusBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     // is not given
     if ( !(style & wxSTB_SIZEGRIP) )
     {
-        *exstyle |= CCS_TOP;
+        msStyle |= CCS_TOP;
     }
     else
     {
 #ifndef __WXWINCE__
         // may be some versions of comctl32.dll do need it - anyhow, it won't
         // do any harm
-        *exstyle |= SBARS_SIZEGRIP;
+       msStyle |= SBARS_SIZEGRIP;
 #endif
     }