Acutally use the m_maxChars parameter value instead of ignoring it

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 1da351142c9f5579df63cff931be33fe5a7c25be..d670308a9f3e017e7980a299f86ea4c493911e96 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1032,7 +1032,8 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     // Windows XP. Instead we get the appropriate style for the theme.
 
     if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && 
-        GetParent() && GetParent()->IsKindOf(CLASSINFO(wxPanel)) &&
+        GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) ||
+                        GetParent()->IsKindOf(CLASSINFO(wxDialog))) &&
         ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
     {
         border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN);
@@ -1066,7 +1067,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 break;
 
             case wxBORDER_RAISED:
-                *exstyle |= WS_EX_WINDOWEDGE;
+                *exstyle |= WS_EX_DLGMODALFRAME;
                 break;
 
             case wxBORDER_SUNKEN: